diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 6d6ba86..3ecaefd 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -35,7 +35,7 @@ jobs: - name: Install deptry run: | - make install + make python-install - name: Run Dependency Check run: | diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 498dff2..148d9bc 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -35,7 +35,7 @@ jobs: - name: Install Formatting Tools run: | - make install + make python-install - name: Black Format Check run: | diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index d6cf359..b6c5357 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -53,13 +53,16 @@ jobs: python-version: "3.11" - name: Install Python Tools run: | - make install + make python-install - name: Setup Ruby uses: ruby/setup-ruby@v1 with: ruby-version: '3.3' # Recommended for Jekyll 4.4 in 2026 bundler-cache: true # Runs 'bundle install' and caches gems automatically working-directory: ./docs/jekyll + - name: Install Ruby Packages + run: | + make ruby-install - name: Setup Pages uses: actions/configure-pages@v5 - name: Build with Jekyll site in /docs/jekyll diff --git a/.github/workflows/lint-check.yml b/.github/workflows/lint-check.yml index b0db524..09468d5 100644 --- a/.github/workflows/lint-check.yml +++ b/.github/workflows/lint-check.yml @@ -35,7 +35,7 @@ jobs: - name: Install Linting Tools run: | - make install + make python-install - name: Render Cookiecutter Template run: | diff --git a/.github/workflows/security-audit.yml b/.github/workflows/security-audit.yml index 534dc39..c00ed38 100644 --- a/.github/workflows/security-audit.yml +++ b/.github/workflows/security-audit.yml @@ -35,7 +35,7 @@ jobs: - name: Install pip-audit run: | - make install + make python-install - name: Run Security Check run: | diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml index b20f3ef..97435cb 100644 --- a/.github/workflows/spellcheck.yml +++ b/.github/workflows/spellcheck.yml @@ -35,7 +35,7 @@ jobs: - name: Install codespell run: | - make install + make python-install - name: Run Spellcheck run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aca7587..5ef2e43 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -35,7 +35,7 @@ jobs: - name: Install pytest run: | - make install + make python-install - name: Run tests run: | diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index 39a3786..ba49c27 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -35,7 +35,7 @@ jobs: - name: Install mypy run: | - make install + make python-install - name: Run typecheck run: | diff --git a/Makefile b/Makefile index ae43038..56c8504 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ TOML_FILE_LIST := ( \ ) # -------------------------------------------------- .PHONY: \ - all list-folders venv install \ + all list-folders venv python-install \ pre-commit-init security dependency-check black-formatter-check \ black-formatter-fix render-cookiecutter jinja2-lint-check ruff-lint-check \ ruff-lint-fix toml-lint-check yaml-lint-check format-check \ @@ -243,7 +243,7 @@ TOML_FILE_LIST := ( \ # -------------------------------------------------- # Default: run lint, typecheck, spellcheck, tests, & docs # -------------------------------------------------- -all: install lint-check typecheck spellcheck test build-docs +all: python-install lint-check typecheck spellcheck test build-docs # -------------------------------------------------- # Make Internal Utilities # -------------------------------------------------- @@ -269,7 +269,7 @@ venv: $(AT)$(CREATE_VENV) $(AT)echo "โœ… Virtual environment created." -install: venv +python-install: venv $(AT)echo "๐Ÿ“ฆ Installing project dependencies..." $(AT)$(PIP) install --upgrade pip setuptools wheel # $(AT)$(PIP) install -e $(DEPS) @@ -333,7 +333,8 @@ render-cookiecutter: $(AT)rm -rf $(RENDERED_COOKIE_DIR) $(AT)$(COOKIECUTTER) . --no-input \ --output-dir $(RENDERED_COOKIE_DIR) \ - --overwrite-if-exists + --overwrite-if-exists \ + --keep-project-on-failure djlint-lint-check: $(AT)echo "๐Ÿ” djlint lint..." @@ -414,6 +415,9 @@ test: # -------------------------------------------------- # ๐Ÿ“š Documentation (Jekyll + nutrimatic) # -------------------------------------------------- +ruby-install: + $(MAKE) -C $(JEKYLL_DIR) ruby-install; + jekyll: $(MAKE) -C $(JEKYLL_DIR) all; @@ -479,7 +483,7 @@ git-release: # ๐Ÿ“ข Release # -------------------------------------------------- pre-commit: test security dependency-check format-fix lint-check spellcheck typecheck -pre-release: clean install pre-commit build-docs changelog build +pre-release: clean python-install pre-commit build-docs changelog build release: git-release bump-version-patch # -------------------------------------------------- # ๐Ÿงน Clean artifacts diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index 97a3269..c328d22 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -99,10 +99,20 @@ Feat 010 (#33) - Merge pull request #36 from jcook3701/develop Feat 011 cla fix (#35) +- Update template +- Update template +- Update template +- Update template +- Update template +- Merge branch 'cookiecutter-template' into feat-012 +- Update template +- Merge branch 'cookiecutter-template' into feat-012 ### ๐Ÿ› Fixed - *(template)* Updates to template cookiecutter.json file. +- *(cla)* Fix for CLA fix for master branch. +- *(makefile)* Minor fix for documentation emoji. ### ๐Ÿš€ Added diff --git a/changelogs/releases/v0.1.1.md b/changelogs/releases/v0.1.1.md index a30b554..4ba65c6 100644 --- a/changelogs/releases/v0.1.1.md +++ b/changelogs/releases/v0.1.1.md @@ -99,10 +99,20 @@ Feat 010 (#33) - Merge pull request #36 from jcook3701/develop Feat 011 cla fix (#35) +- Update template +- Update template +- Update template +- Update template +- Update template +- Merge branch 'cookiecutter-template' into feat-012 +- Update template +- Merge branch 'cookiecutter-template' into feat-012 ### ๐Ÿ› Fixed - *(template)* Updates to template cookiecutter.json file. +- *(cla)* Fix for CLA fix for master branch. +- *(makefile)* Minor fix for documentation emoji. ### ๐Ÿš€ Added diff --git a/docs/cookiecutter_input.json b/docs/cookiecutter_input.json index 1f5900c..7cee12b 100644 --- a/docs/cookiecutter_input.json +++ b/docs/cookiecutter_input.json @@ -24,8 +24,8 @@ "build-docs": false, "changelog": false, "git-init": false, - "install": false, - "pre-commit-init": false + "pre-commit-init": false, + "python-install": false } }, "_is_sub_template": false, diff --git a/docs/jekyll/Makefile b/docs/jekyll/Makefile index a0a9954..dd4d162 100644 --- a/docs/jekyll/Makefile +++ b/docs/jekyll/Makefile @@ -39,19 +39,25 @@ AUTHOR = "Jared Cook" VERSION = "0.1.1" PUBLISHDIR ?= # -------------------------------------------------- -# ๐Ÿ“˜ Documentation (Sphinx + Jekyll) +# ๐Ÿ“š Documentation (Sphinx + Jekyll) # -------------------------------------------------- +RUBY_INSTALL := bundle install JEKYLL_BUILD := bundle exec jekyll build --quiet JEKYLL_CLEAN := bundle exec jekyll clean JEKYLL_SERVE := bundle exec jekyll serve # -------------------------------------------------- -.PHONY: all jekyll jekyll-serve build run clean help +.PHONY: all ruby-install jekyll jekyll-serve build run clean help # -------------------------------------------------- # Default: # -------------------------------------------------- all: build # -------------------------------------------------- -# ๐Ÿ“˜ Documentation (Jekyll) +# โ™ฆ๏ธ Ruby +# -------------------------------------------------- +ruby-install: + $(AT)$(RUBY_INSTALL) +# -------------------------------------------------- +# ๐Ÿ“š Documentation (Jekyll) # -------------------------------------------------- jekyll: $(AT)echo "๐Ÿ”จ Building Jekyll site ๐Ÿ“˜..." @@ -80,6 +86,12 @@ help: $(AT)echo " version: $(PACKAGE_VERSION)" $(AT)echo "" $(AT)echo "Usage:" + $(AT)echo " make ruby-inst\ + + + + fddjfsal;dsjfklas;jdklf;JINJA_FILE_LIST + sall Installs Gemfile packages." $(AT)echo " make build Generate Jekyll documentation" $(AT)echo " make run Serve Jekyll site locally" $(AT)echo " make clean Clean Jekyll build artifacts"