Skip to content

Commit 8ea029b

Browse files
committed
[MISC] Additional dependencies updated
1 parent ec6d48d commit 8ea029b

5 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎.make/conf.d/django-esi.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ get-compatibility-dates:
5959

6060
# Generate ESI stubs using the selected compatibility date
6161
.PHONY: generate-esi-stubs
62-
generate-esi-stubs: check-python-venv get-compatibility-dates
62+
generate-esi-stubs: check-python-venv get-compatibility-dates check-myauth-path
6363
@echo "Generating ESI stubs …"
6464
@echo ""
6565
@esi_date=$$(cat .esi-compatibility-date 2>/dev/null || exit 0); \

‎.make/conf.d/django.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ compile-translations: check-python-venv
8484

8585
# Migrate all database changes
8686
.PHONY: migrate
87-
migrate: check-python-venv
87+
migrate: check-python-venv check-myauth-path
8888
@echo "Migrating the database"
8989
@python $(myauth_path)/manage.py migrate $(package)
9090

9191
# Make migrations for the app
9292
.PHONY: migrations
93-
migrations: check-python-venv
93+
migrations: check-python-venv check-myauth-path
9494
@echo "Creating or updating migrations"
9595
@python $(myauth_path)/manage.py makemigrations $(package)
9696

‎.make/conf.d/tests.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Coverage
44
.PHONY: coverage
5-
coverage: check-python-venv
5+
coverage: check-python-venv check-myauth-path
66
@echo "Running tests and creating a coverage report …"
77
@coverage run $(myauth_path)/manage.py \
88
test \

‎.pre-commit-config.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ repos:
129129
language: node
130130
additional_dependencies:
131131
# eslint itself needs to be here when using additional_dependencies.
132-
- eslint@9.34.0 # https://github.com/eslint/eslint/releases/latest
133-
- globals@16.3.0 # https://github.com/sindresorhus/globals/releases/latest
132+
- eslint@9.37.0 # https://github.com/eslint/eslint/releases/latest
133+
- globals@16.4.0 # https://github.com/sindresorhus/globals/releases/latest
134134

135135
- repo: https://github.com/thibaudcolas/pre-commit-stylelint
136136
rev: 9b7d7bf350be72b9ba00c5577475f721b4adfa58 # frozen: v16.25.0
@@ -143,8 +143,8 @@ repos:
143143
- --formatter=compact
144144
additional_dependencies:
145145
# stylelint itself needs to be here when using additional_dependencies.
146-
- stylelint@16.23.1 # https://github.com/stylelint/stylelint/releases/latest
147-
- stylelint-config-standard@39.0.0 # https://github.com/stylelint/stylelint-config-standard/releases/latest
146+
- stylelint@16.25.0 # https://github.com/stylelint/stylelint/releases/latest
147+
- stylelint-config-standard@39.0.1 # https://github.com/stylelint/stylelint-config-standard/releases/latest
148148

149149
- repo: https://github.com/pre-commit/pygrep-hooks
150150
rev: 3a6eb0fadf60b3cccfd80bad9dbb6fae7e47b316 # frozen: v1.10.0
@@ -242,7 +242,7 @@ repos:
242242
name: Blacken docs
243243
description: Format Python code in documentation files.
244244
additional_dependencies:
245-
- black==25.1.0 # https://github.com/psf/black/releases/latest
245+
- black==25.9.0 # https://github.com/psf/black/releases/latest
246246
args:
247247
- --target-version=py310 # Minimum required Python version for AA. Update as needed.
248248

@@ -274,7 +274,7 @@ repos:
274274
args:
275275
- --indent=4
276276
additional_dependencies:
277-
- tox==4.29.0 # https://github.com/tox-dev/tox/releases/latest
277+
- tox==4.30.3 # https://github.com/tox-dev/tox/releases/latest
278278

279279
- repo: https://github.com/abravalheri/validate-pyproject
280280
rev: 78f5e0f104cfa803d0597eaa924b4de3becd3e3e # frozen: v0.24.1

‎Makefile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ git_repository = https://github.com/ppfeufer/$(appname)
1515
git_repository_issues = $(git_repository)/issues
1616

1717
# Set myauth path or default to ../myauth if config file (.make/myauth-path) does not exist
18-
myauth_path = $(shell cat .make/myauth-path 2>/dev/null || echo "../myauth")
18+
myauth_path = $(shell path=$$(cat .make/myauth-path 2>/dev/null | grep . || echo "../myauth"); echo "$${path%/}")
1919

2020
# Default goal
2121
.DEFAULT_GOAL := help
@@ -28,6 +28,15 @@ check-python-venv:
2828
exit 1; \
2929
fi
3030

31+
# Check if the 'myauth' path exists
32+
.PHONY: check-myauth-path
33+
check-myauth-path:
34+
@if [ ! -d "$(myauth_path)" ]; then \
35+
echo "$(TEXT_COLOR_RED)$(TEXT_BOLD)Error: '$(myauth_path)' does not exist!$(TEXT_RESET)"; \
36+
echo "Please set the absolute path to your 'myauth' directory in the '.make/myauth-path' file."; \
37+
exit 1; \
38+
fi
39+
3140
# Confirm action
3241
.PHONY: confirm-action
3342
confirm-action:
@@ -50,7 +59,7 @@ confirm:
5059

5160
# Graph models
5261
.PHONY: graph-models
53-
graph-models: check-python-venv
62+
graph-models: check-python-venv check-myauth-path
5463
@echo "Creating a graph of the models …"
5564
@python $(myauth_path)/manage.py \
5665
graph_models \
@@ -96,6 +105,7 @@ prepare-release: pot graph-models
96105
help::
97106
@echo ""
98107
@echo "$(TEXT_BOLD)$(appname_verbose)$(TEXT_BOLD_END) Makefile"
108+
@echo "('myauth_path' is set to '$(myauth_path)')"
99109
@echo ""
100110
@echo "$(TEXT_BOLD)Usage:$(TEXT_BOLD_END)"
101111
@echo " make [command]"

0 commit comments

Comments
 (0)