From 35c455dbc54c25c24fe182a95e91703fe24be89a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 4 Apr 2025 09:15:40 +0100 Subject: [PATCH 1/7] Upgrade to Django 5.2 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index ea1e183ba..646c13738 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn-worker==0.3.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==5.1.11 # pyup: < 5.2 # https://www.djangoproject.com/ +django==5.2.4 # pyup: < 6.0 # https://www.djangoproject.com/ django-environ==0.12.0 # https://github.com/joke2k/django-environ django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==65.10.0 # https://github.com/pennersr/django-allauth From 20120973acfa45132c95edcd6b872bb4804d75dc Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 4 Apr 2025 09:18:33 +0100 Subject: [PATCH 2/7] Upgrade CI to PostgreSQL 14 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1025eb232..8ab2ce3d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: ports: - 6379:6379 postgres: - image: postgres:13 + image: postgres:14 ports: - 5432:5432 env: From e1c1fc939d5384b5092ff44465b735db9a1795db Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 5 Aug 2025 22:46:28 +0100 Subject: [PATCH 3/7] Drop support for PostgreSQL 13 Django 5.2 needs 14 or higher --- README.md | 3 +-- cookiecutter.json | 2 +- docs/1-getting-started/project-generation-options.rst | 1 - tests/test_cookiecutter_generation.py | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 903b34570..a4b1c60d3 100644 --- a/README.md +++ b/README.md @@ -133,8 +133,7 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re 2 - 16 3 - 15 4 - 14 - 5 - 13 - Choose from 1, 2, 3, 4, 5 [1]: 1 + Choose from 1, 2, 3, 4 [1]: 1 Select cloud_provider: 1 - AWS 2 - GCP diff --git a/cookiecutter.json b/cookiecutter.json index 4771f496c..d4dbc126a 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -18,7 +18,7 @@ "windows": "n", "editor": ["None", "PyCharm", "VS Code"], "use_docker": "n", - "postgresql_version": ["17", "16", "15", "14", "13"], + "postgresql_version": ["17", "16", "15", "14"], "cloud_provider": ["AWS", "GCP", "Azure", "None"], "mail_service": [ "Mailgun", diff --git a/docs/1-getting-started/project-generation-options.rst b/docs/1-getting-started/project-generation-options.rst index 8ae041580..fe6fa29cc 100644 --- a/docs/1-getting-started/project-generation-options.rst +++ b/docs/1-getting-started/project-generation-options.rst @@ -70,7 +70,6 @@ postgresql_version: 2. 16 3. 15 4. 14 - 5. 13 cloud_provider: Select a cloud provider for static & media files. The choices are: diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 76d2f4b98..e89d7d85a 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -63,7 +63,6 @@ SUPPORTED_COMBINATIONS = [ {"postgresql_version": "16"}, {"postgresql_version": "15"}, {"postgresql_version": "14"}, - {"postgresql_version": "13"}, {"cloud_provider": "AWS", "use_whitenoise": "y"}, {"cloud_provider": "AWS", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "use_whitenoise": "y"}, From 997dcb172e9dbe08d7321fa40653c360c0a62ec9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 5 Aug 2025 22:47:06 +0100 Subject: [PATCH 4/7] Update Django Trove classifier --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e40a4f6e8..60d4f29d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ requires-python = ">=3.12,<3.13" classifiers = [ "Development Status :: 4 - Beta", "Environment :: Console", - "Framework :: Django :: 5.0", + "Framework :: Django :: 5.2", "Intended Audience :: Developers", "License :: OSI Approved :: BSD License", "Natural Language :: English", From 23310e8425f1d452377e6ef25858162cd18353d8 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 5 Aug 2025 22:48:08 +0100 Subject: [PATCH 5/7] Update target version for django-upgrade --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 0d689a949..3e73de8c5 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -32,7 +32,7 @@ repos: rev: '1.25.0' hooks: - id: django-upgrade - args: ['--target-version', '5.0'] + args: ['--target-version', '5.2'] # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit From 5f5e76b8168b386b2212b1c21309252a0cc5b19f Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 5 Aug 2025 22:52:34 +0100 Subject: [PATCH 6/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a4b1c60d3..b5177c469 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ production-ready Django projects quickly. ## Features -- For Django 5.1 +- For Django 5.2 - Works with Python 3.12 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 @@ -51,7 +51,7 @@ _These features can be enabled during initial project setup._ ## Constraints - Only maintained 3rd party libraries are used. -- Uses PostgreSQL everywhere: 13 - 17 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available). +- Uses PostgreSQL everywhere: 14 - 17 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available). - Environment variables for configuration (This won't work with Apache/mod_wsgi). ## Support this Project! From 447fcdbacb33bb6f42d65908a98e7ed514b811d5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 7 Aug 2025 10:34:59 +0100 Subject: [PATCH 7/7] Bump to latest 5.2.x --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 646c13738..94723ea6a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn-worker==0.3.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==5.2.4 # pyup: < 6.0 # https://www.djangoproject.com/ +django==5.2.5 # pyup: < 6.0 # https://www.djangoproject.com/ django-environ==0.12.0 # https://github.com/joke2k/django-environ django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==65.10.0 # https://github.com/pennersr/django-allauth