Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dependency-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install deptry
run: |
make install
make python-install

- name: Run Dependency Check
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install Formatting Tools
run: |
make install
make python-install

- name: Black Format Check
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,16 @@
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

Check warning on line 60 in .github/workflows/jekyll-gh-pages.yml

View workflow job for this annotation

GitHub Actions / jinja2-lint

60:25 [quoted-strings] string value is not quoted with double quotes

Check warning on line 60 in .github/workflows/jekyll-gh-pages.yml

View workflow job for this annotation

GitHub Actions / jinja2-lint

60:25 [quoted-strings] string value is not quoted with double quotes
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install Linting Tools
run: |
make install
make python-install

- name: Render Cookiecutter Template
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install pip-audit
run: |
make install
make python-install

- name: Run Security Check
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install codespell
run: |
make install
make python-install

- name: Run Spellcheck
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install pytest
run: |
make install
make python-install

- name: Run tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Install mypy
run: |
make install
make python-install

- name: Run typecheck
run: |
Expand Down
14 changes: 9 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
# --------------------------------------------------
Expand All @@ -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)
Expand Down Expand Up @@ -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..."
Expand Down Expand Up @@ -414,6 +415,9 @@ test:
# --------------------------------------------------
# 📚 Documentation (Jekyll + nutrimatic)
# --------------------------------------------------
ruby-install:
$(MAKE) -C $(JEKYLL_DIR) ruby-install;

jekyll:
$(MAKE) -C $(JEKYLL_DIR) all;

Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 10 additions & 0 deletions changelogs/releases/v0.1.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docs/cookiecutter_input.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
18 changes: 15 additions & 3 deletions docs/jekyll/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 📘..."
Expand Down Expand Up @@ -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"
Expand Down
Loading