From 460abc429ef657df180fa0ad5cbdc64c445fb008 Mon Sep 17 00:00:00 2001 From: Alex Tomkins Date: Sat, 12 Jul 2025 12:36:52 +0100 Subject: [PATCH 1/3] Python package upgrades --- requirements/local.txt | 4 +- requirements/testing.txt | 2 +- .../project/settings/base.py | 1 - .../requirements/base.txt | 48 +++++++++---------- .../requirements/local.txt | 8 ++-- .../requirements/testing.txt | 14 +++--- 6 files changed, 37 insertions(+), 40 deletions(-) diff --git a/requirements/local.txt b/requirements/local.txt index 479d5c7..1c3ff9b 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -1,4 +1,4 @@ -r testing.txt -tox==4.14.2 -tox-uv==1.7.0 +tox==4.27.0 +tox-uv==1.26.1 diff --git a/requirements/testing.txt b/requirements/testing.txt index b9a1858..f5cfbb1 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -1 +1 @@ -cookiecutter==2.1.1 +cookiecutter==2.6.0 diff --git a/{{cookiecutter.project_slug}}/project/settings/base.py b/{{cookiecutter.project_slug}}/project/settings/base.py index f8f5fea..8c7298d 100644 --- a/{{cookiecutter.project_slug}}/project/settings/base.py +++ b/{{cookiecutter.project_slug}}/project/settings/base.py @@ -173,7 +173,6 @@ "OPTIONS": { "context_processors": [ "django.contrib.auth.context_processors.auth", - "django.template.context_processors.debug", "django.template.context_processors.i18n", "django.template.context_processors.media", "django.template.context_processors.static", diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 0918382..9793f90 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,45 +1,45 @@ -Django==5.0.11 -asgiref==3.8.1 -psycopg==3.1.18 -Pillow==10.3.0 +Django==5.2.4 +asgiref==3.9.1 +psycopg==3.2.9 +Pillow==11.3.0 olefile==0.47 -dj-database-url==2.1.0 -sqlparse==0.5.0 -typing-extensions==4.11.0 +dj-database-url==3.0.1 +sqlparse==0.5.3 +typing-extensions==4.14.1 # Caching -django-redis==5.4.0 -redis==5.0.4 +django-redis==6.0.0 +redis==6.2.0 # Masked database backups django-maskpostgresdata==0.2.1 # Storage -devsoc-contentfiles==0.3 -django-storages==1.14.2 -boto3==1.34.91 -botocore==1.34.91 +devsoc-contentfiles==0.5 +django-storages==1.14.6 +boto3==1.39.4 +botocore==1.39.4 jmespath==1.0.1 python-dateutil==2.9.0.post0 -s3transfer==0.10.1 -six==1.16.0 -urllib3==2.2.1 +s3transfer==0.13.0 +six==1.17.0 +urllib3==2.5.0 # Reporting (Errors, APM) -elastic-apm==6.22.0 -sentry-sdk==1.45.0 -certifi==2024.2.2 -ecs-logging==2.1.0 -wrapt==1.14.1 +elastic-apm==6.23.0 +sentry-sdk==2.32.0 +certifi==2025.7.9 +ecs-logging==2.2.0 +wrapt==1.17.2 # Axes -django-axes==6.4.0 +django-axes==8.0.0 # Form styling django-crispy-forms==1.14.0 {%- if cookiecutter.multilingual == 'y' %} # Translations -translate-toolkit==2.3.1 -diff-match-patch==20121119 +translate-toolkit==3.15.6 +diff-match-patch==20241021 {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 78cd54b..9da46a2 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ -r testing.txt -django-debug-toolbar==4.3.0 +django-debug-toolbar==5.2.0 ipdb==0.13.13 -pywatchman==2.0.0 -tox==4.14.2 -tox-uv==1.7.0 +pywatchman==3.0.0 +tox==4.27.0 +tox-uv==1.26.1 diff --git a/{{cookiecutter.project_slug}}/requirements/testing.txt b/{{cookiecutter.project_slug}}/requirements/testing.txt index c65fd0c..6285b7a 100644 --- a/{{cookiecutter.project_slug}}/requirements/testing.txt +++ b/{{cookiecutter.project_slug}}/requirements/testing.txt @@ -1,15 +1,13 @@ -r base.txt black==24.4.1 -coverage==7.5.0 -django-extensions==3.2.3 -factory-boy==3.3.0 +coverage==7.9.2 +django-extensions==4.1 +djlint==1.36.4 +factory-boy==3.3.3 flake8==7.0.0 isort==5.13.2 -pipdeptree==2.18.1 +pipdeptree==2.27.0 ruff==0.4.1 -tblib==3.0.0 +tblib==3.1.0 unittest-xml-reporting==3.2.0 - -# DJ lint -djlint==1.34.1 From 9a6c533e7cdafb197a80754e3e886b784d294a86 Mon Sep 17 00:00:00 2001 From: Alex Tomkins Date: Sat, 12 Jul 2025 12:38:38 +0100 Subject: [PATCH 2/3] CI upgrades --- .../.github/workflows/ci_geodjango.yml | 6 +++--- .../.github/workflows/ci_standard.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci_geodjango.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci_geodjango.yml index 2b8ae4c..be5261f 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci_geodjango.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci_geodjango.yml @@ -6,7 +6,7 @@ concurrency: jobs: test: name: Test -- tox - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 10 steps: - name: Checkout @@ -18,7 +18,7 @@ jobs: run: | sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - libgdal30 + libgdal34t64 - name: Setup Python uses: actions/setup-python@v5 with: @@ -56,7 +56,7 @@ jobs: tox services: postgres: - image: postgis/postgis:15-3.4 + image: postgis/postgis:17-3.5-alpine env: POSTGRES_PASSWORD: password ports: diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci_standard.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci_standard.yml index d48a599..2dd78d6 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci_standard.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci_standard.yml @@ -6,7 +6,7 @@ concurrency: jobs: test: name: Test -- tox - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 10 steps: - name: Checkout @@ -51,7 +51,7 @@ jobs: tox services: postgres: - image: postgres:15-alpine + image: postgres:17-alpine env: POSTGRES_PASSWORD: password ports: From c871c8819b7037406c41e10d8b12b6c503cf9498 Mon Sep 17 00:00:00 2001 From: Alex Tomkins Date: Sat, 12 Jul 2025 12:39:51 +0100 Subject: [PATCH 3/3] Remove unused rm --- hooks/post_gen_project.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/hooks/post_gen_project.sh b/hooks/post_gen_project.sh index c6340da..dea5da4 100755 --- a/hooks/post_gen_project.sh +++ b/hooks/post_gen_project.sh @@ -17,6 +17,5 @@ if [ "$MULTILINGUAL" == "y" ]; then mkdir -p locale else # Remove multilingual features - rm -f apps/pages/views.py rm -rf apps/core/tests fi