Skip to content

Commit a5a690f

Browse files
authored
Merge pull request #40 from jcook3701/develop
Feat 012 (#39)
2 parents bbe5153 + 1825e0b commit a5a690f

13 files changed

Lines changed: 57 additions & 18 deletions

File tree

.github/workflows/dependency-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Install deptry
3737
run: |
38-
make install
38+
make python-install
3939
4040
- name: Run Dependency Check
4141
run: |

.github/workflows/format-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Install Formatting Tools
3737
run: |
38-
make install
38+
make python-install
3939
4040
- name: Black Format Check
4141
run: |

.github/workflows/jekyll-gh-pages.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,16 @@ jobs:
5353
python-version: "3.11"
5454
- name: Install Python Tools
5555
run: |
56-
make install
56+
make python-install
5757
- name: Setup Ruby
5858
uses: ruby/setup-ruby@v1
5959
with:
6060
ruby-version: '3.3' # Recommended for Jekyll 4.4 in 2026
6161
bundler-cache: true # Runs 'bundle install' and caches gems automatically
6262
working-directory: ./docs/jekyll
63+
- name: Install Ruby Packages
64+
run: |
65+
make ruby-install
6366
- name: Setup Pages
6467
uses: actions/configure-pages@v5
6568
- name: Build with Jekyll site in /docs/jekyll

.github/workflows/lint-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Install Linting Tools
3737
run: |
38-
make install
38+
make python-install
3939
4040
- name: Render Cookiecutter Template
4141
run: |

.github/workflows/security-audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Install pip-audit
3737
run: |
38-
make install
38+
make python-install
3939
4040
- name: Run Security Check
4141
run: |

.github/workflows/spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Install codespell
3737
run: |
38-
make install
38+
make python-install
3939
4040
- name: Run Spellcheck
4141
run: |

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Install pytest
3737
run: |
38-
make install
38+
make python-install
3939
4040
- name: Run tests
4141
run: |

.github/workflows/typecheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Install mypy
3737
run: |
38-
make install
38+
make python-install
3939
4040
- name: Run typecheck
4141
run: |

Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ TOML_FILE_LIST := ( \
230230
)
231231
# --------------------------------------------------
232232
.PHONY: \
233-
all list-folders venv install \
233+
all list-folders venv python-install \
234234
pre-commit-init security dependency-check black-formatter-check \
235235
black-formatter-fix render-cookiecutter jinja2-lint-check ruff-lint-check \
236236
ruff-lint-fix toml-lint-check yaml-lint-check format-check \
@@ -243,7 +243,7 @@ TOML_FILE_LIST := ( \
243243
# --------------------------------------------------
244244
# Default: run lint, typecheck, spellcheck, tests, & docs
245245
# --------------------------------------------------
246-
all: install lint-check typecheck spellcheck test build-docs
246+
all: python-install lint-check typecheck spellcheck test build-docs
247247
# --------------------------------------------------
248248
# Make Internal Utilities
249249
# --------------------------------------------------
@@ -269,7 +269,7 @@ venv:
269269
$(AT)$(CREATE_VENV)
270270
$(AT)echo "✅ Virtual environment created."
271271

272-
install: venv
272+
python-install: venv
273273
$(AT)echo "📦 Installing project dependencies..."
274274
$(AT)$(PIP) install --upgrade pip setuptools wheel
275275
# $(AT)$(PIP) install -e $(DEPS)
@@ -333,7 +333,8 @@ render-cookiecutter:
333333
$(AT)rm -rf $(RENDERED_COOKIE_DIR)
334334
$(AT)$(COOKIECUTTER) . --no-input \
335335
--output-dir $(RENDERED_COOKIE_DIR) \
336-
--overwrite-if-exists
336+
--overwrite-if-exists \
337+
--keep-project-on-failure
337338

338339
djlint-lint-check:
339340
$(AT)echo "🔍 djlint lint..."
@@ -414,6 +415,9 @@ test:
414415
# --------------------------------------------------
415416
# 📚 Documentation (Jekyll + nutrimatic)
416417
# --------------------------------------------------
418+
ruby-install:
419+
$(MAKE) -C $(JEKYLL_DIR) ruby-install;
420+
417421
jekyll:
418422
$(MAKE) -C $(JEKYLL_DIR) all;
419423

@@ -479,7 +483,7 @@ git-release:
479483
# 📢 Release
480484
# --------------------------------------------------
481485
pre-commit: test security dependency-check format-fix lint-check spellcheck typecheck
482-
pre-release: clean install pre-commit build-docs changelog build
486+
pre-release: clean python-install pre-commit build-docs changelog build
483487
release: git-release bump-version-patch
484488
# --------------------------------------------------
485489
# 🧹 Clean artifacts

changelogs/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,20 @@ Feat 010 (#33)
9999
- Merge pull request #36 from jcook3701/develop
100100

101101
Feat 011 cla fix (#35)
102+
- Update template
103+
- Update template
104+
- Update template
105+
- Update template
106+
- Update template
107+
- Merge branch 'cookiecutter-template' into feat-012
108+
- Update template
109+
- Merge branch 'cookiecutter-template' into feat-012
102110

103111
### 🐛 Fixed
104112

105113
- *(template)* Updates to template cookiecutter.json file.
114+
- *(cla)* Fix for CLA fix for master branch.
115+
- *(makefile)* Minor fix for documentation emoji.
106116

107117
### 🚀 Added
108118

0 commit comments

Comments
 (0)