From e6bd8d1a2a42832a4212a58e07a3dd23ffe00b53 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 21 Jul 2024 02:20:10 +0000 Subject: [PATCH 01/70] Release 2024.07.20 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fa376e15..0d0506b29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.20 + + +### Updated + +- Update hiredis to 3.0.0 ([#5228](https://github.com/cookiecutter/cookiecutter-django/pull/5228)) + +- Update uvicorn to 0.30.3 ([#5234](https://github.com/cookiecutter/cookiecutter-django/pull/5234)) + +- Update django-crispy-forms to 2.3 ([#5229](https://github.com/cookiecutter/cookiecutter-django/pull/5229)) + +- Auto-update pre-commit hooks ([#5232](https://github.com/cookiecutter/cookiecutter-django/pull/5232)) + ## 2024.07.19 diff --git a/setup.py b/setup.py index 1cf1166e7..ee2c2cd76 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.19" +version = "2024.07.20" with open("README.md") as readme_file: long_description = readme_file.read() From 22e2715c82d6048b306c265591f79f8f3f68fd18 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 21 Jul 2024 02:46:30 -0700 Subject: [PATCH 02/70] Update sphinx to 7.4.7 (#5235) * Update sphinx from 7.4.6 to 7.4.7 * Update sphinx from 7.4.6 to 7.4.7 --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index e1bc625ff..f2b16c26f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.4.6 +sphinx==7.4.7 sphinx-rtd-theme==2.0.0 myst-parser==3.0.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4fb93fb4b..4d6e86776 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.4.6 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.7 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 75123bd4ec5f289340033f816cf6b74f9ce3e063 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 21 Jul 2024 02:48:14 -0700 Subject: [PATCH 03/70] Update pytest to 8.3.1 (#5236) * Update pytest from 8.2.2 to 8.3.1 * Update pytest from 8.2.2 to 8.3.1 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ca98dce69..8e1415e46 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.7.1 # Testing # ------------------------------------------------------------------------------ tox==4.16.0 -pytest==8.2.2 +pytest==8.3.1 pytest-xdist==3.6.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4d6e86776..fa8d7d2b0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.22.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs -pytest==8.2.2 # https://github.com/pytest-dev/pytest +pytest==8.3.1 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs From a6fc34eeeaeb459dcf99135bc075288d9b7e5a4f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 21 Jul 2024 02:59:59 -0700 Subject: [PATCH 04/70] Update ruff to 0.5.4 (#5237) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8e1415e46..afdb1a3b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.3 +ruff==0.5.4 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 07577c0b2..244eec314 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.3 + rev: v0.5.4 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index fa8d7d2b0..765adf286 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.3 # https://github.com/astral-sh/ruff +ruff==0.5.4 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 41b50bcb7d8a50ef71dd19adc4759d99ad7b75a9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 22 Jul 2024 02:20:42 +0000 Subject: [PATCH 05/70] Release 2024.07.21 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d0506b29..abb0e09de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.21 + + +### Updated + +- Update ruff to 0.5.4 ([#5237](https://github.com/cookiecutter/cookiecutter-django/pull/5237)) + +- Update pytest to 8.3.1 ([#5236](https://github.com/cookiecutter/cookiecutter-django/pull/5236)) + +- Update sphinx to 7.4.7 ([#5235](https://github.com/cookiecutter/cookiecutter-django/pull/5235)) + ## 2024.07.20 diff --git a/setup.py b/setup.py index ee2c2cd76..c8959595f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.20" +version = "2024.07.21" with open("README.md") as readme_file: long_description = readme_file.read() From 34803624ebb26ccf4e46743665f2fa81135cddff Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 22 Jul 2024 12:40:19 +0100 Subject: [PATCH 06/70] Update django-compressor from 4.5 to 4.5.1 --- {{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 0717745a7..5df095df9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -36,7 +36,7 @@ django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth django-crispy-forms==2.3 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} -django-compressor==4.5 # https://github.com/django-compressor/django-compressor +django-compressor==4.5.1 # https://github.com/django-compressor/django-compressor {%- endif %} django-redis==5.4.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} From 3858e90528ba507f9f34f6749555b8023124ecbe Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 23 Jul 2024 02:19:07 +0000 Subject: [PATCH 07/70] Release 2024.07.22 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abb0e09de..99132d26f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.22 + + +### Updated + +- Update django-compressor to 4.5.1 ([#5240](https://github.com/cookiecutter/cookiecutter-django/pull/5240)) + ## 2024.07.21 diff --git a/setup.py b/setup.py index c8959595f..adfbea156 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.21" +version = "2024.07.22" with open("README.md") as readme_file: long_description = readme_file.read() From 12c5eacb0c3c43564358cb28d4f616af853e1372 Mon Sep 17 00:00:00 2001 From: Filipe Nascimento <50376848+FilipeNas@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:53:52 +0200 Subject: [PATCH 08/70] Downgrade watchfiles from 0.22 to 0.21 (#5243) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 765adf286..acb1a09b3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg psycopg[binary]==3.2.1 # https://github.com/psycopg/psycopg {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.22.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From bee2e414b75669a0930efdd192e525bdcf222586 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 23 Jul 2024 06:54:27 +0000 Subject: [PATCH 09/70] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index ad6f162d2..62b93da92 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1603,5 +1603,10 @@ "name": "Ali Shamakhi", "github_login": "ali-shamakhi", "twitter_username": "" + }, + { + "name": "Filipe Nascimento", + "github_login": "FilipeNas", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index fac85d9e4..03f86e76c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -852,6 +852,13 @@ Listed in alphabetical order. + + Filipe Nascimento + + FilipeNas + + + Florian Idelberger From 12e9dc753c9376168f801f2983216c39241c396e Mon Sep 17 00:00:00 2001 From: hleroy Date: Mon, 22 Jul 2024 19:45:12 +0200 Subject: [PATCH 10/70] Added back CMD command Clearning the ENTRYPOINT also clears the CMD. We need to set explicitly CMD again. --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index 9c7b8a69a..80c9a5cc9 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -2,6 +2,7 @@ FROM docker.io/amazon/aws-cli:2.17.0 # Clear entrypoint from the base image, otherwise it's always calling the aws CLI ENTRYPOINT [] +CMD ["/bin/bash"] COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From b0e6b5ef76133c95fee34adba355a4cc4833fc7b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 Jul 2024 02:18:58 +0000 Subject: [PATCH 11/70] Release 2024.07.23 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99132d26f..2c8afa665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.23 + + +### Changed + +- Ensure that awscli service has a CMD to fix #5241 ([#5245](https://github.com/cookiecutter/cookiecutter-django/pull/5245)) + +### Fixed + +- Downgrade watchfiles ([#5243](https://github.com/cookiecutter/cookiecutter-django/pull/5243)) + ## 2024.07.22 diff --git a/setup.py b/setup.py index adfbea156..f47a03532 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.22" +version = "2024.07.23" with open("README.md") as readme_file: long_description = readme_file.read() From 69c3b4c0cb7dd76ab076a6e7afcd05f7ae7aa7a6 Mon Sep 17 00:00:00 2001 From: Hoai-Thu Vuong Date: Thu, 25 Jul 2024 02:12:39 +0700 Subject: [PATCH 12/70] fix non existent of two scoops of django image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b73ecef9e..4ceb4f6d8 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Projects that provide financial support to the maintainers: ### Two Scoops of Django -[![Cover of the book "Two Scoops of Django 3.x"](https://www.feldroy.com/static/book-TSD3-800.jpg)](https://www.feldroy.com/two-scoops-press#two-scoops-of-django) +[![Cover of the book "Two Scoops of Django 3.x"](https://f004.backblazeb2.com/file/feldroycom/images/book-TSD3-800.jpg)](https://www.feldroy.com/two-scoops-press#two-scoops-of-django) Two Scoops of Django 3.x is the best ice cream-themed Django reference in the universe! From 4540098afc62474975b44035bf97786386e80a9b Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 25 Jul 2024 02:18:59 +0000 Subject: [PATCH 13/70] Release 2024.07.24 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c8afa665..db700a788 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.24 + + +### Changed + +- fix non existent of two scoops of django image ([#5248](https://github.com/cookiecutter/cookiecutter-django/pull/5248)) + ## 2024.07.23 diff --git a/setup.py b/setup.py index f47a03532..9095af9be 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.23" +version = "2024.07.24" with open("README.md") as readme_file: long_description = readme_file.read() From a6fcb62e1909665a718cb1ca2db3b6a8feb1b306 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 25 Jul 2024 05:17:09 -0700 Subject: [PATCH 14/70] Update sentry-sdk to 2.11.0 (#5247) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 3cda1be50..47f1d4690 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.10.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.11.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py From 5caa9c0160011c2f2289fa43e8575c0c694b9516 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 25 Jul 2024 13:18:03 +0100 Subject: [PATCH 15/70] Upgrade to Django 5.0 (#5199) --- README.md | 2 +- setup.py | 2 +- tests/test_cookiecutter_generation.py | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4ceb4f6d8..6e3c0a74c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ production-ready Django projects quickly. ## Features -- For Django 4.2 +- For Django 5.0 - Works with Python 3.12 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 diff --git a/setup.py b/setup.py index 9095af9be..7778caff9 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup( classifiers=[ "Development Status :: 4 - Beta", "Environment :: Console", - "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", "Intended Audience :: Developers", "Natural Language :: English", "License :: OSI Approved :: BSD License", diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 5a0bca383..9669d78ba 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -230,7 +230,7 @@ def test_django_upgrade_passes(cookies, context_override): try: sh.django_upgrade( "--target-version", - "4.2", + "5.0", *python_files, _cwd=str(result.project_path), ) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 244eec314..b70addfdd 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: rev: '1.20.0' hooks: - id: django-upgrade - args: ['--target-version', '4.2'] + args: ['--target-version', '5.0'] # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 5df095df9..c947883bb 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==4.2.14 # pyup: < 5.0 # https://www.djangoproject.com/ +django==5.0.7 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth From 55cf48c4f35ca464cfe73036a5ade67f80b10961 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 25 Jul 2024 05:23:43 -0700 Subject: [PATCH 16/70] Update pytest to 8.3.2 (#5249) * Update pytest from 8.3.1 to 8.3.2 * Update pytest from 8.3.1 to 8.3.2 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index afdb1a3b4..23b7ab500 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.7.1 # Testing # ------------------------------------------------------------------------------ tox==4.16.0 -pytest==8.3.1 +pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index acb1a09b3..236976d33 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs -pytest==8.3.1 # https://github.com/pytest-dev/pytest +pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs From 2b1c6e9f5033a42aa8be9f3daad900a91fd6c180 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 26 Jul 2024 02:19:01 +0000 Subject: [PATCH 17/70] Release 2024.07.25 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db700a788..1d739f007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.25 + + +### Changed + +- Upgrade to Django 5.0 ([#5199](https://github.com/cookiecutter/cookiecutter-django/pull/5199)) + +### Updated + +- Update pytest to 8.3.2 ([#5249](https://github.com/cookiecutter/cookiecutter-django/pull/5249)) + +- Update sentry-sdk to 2.11.0 ([#5247](https://github.com/cookiecutter/cookiecutter-django/pull/5247)) + ## 2024.07.24 diff --git a/setup.py b/setup.py index 7778caff9..fbafc02b0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.24" +version = "2024.07.25" with open("README.md") as readme_file: long_description = readme_file.read() From 1af0757340e479b3c2c875bd0d5a9a4ecb2b02cf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 26 Jul 2024 00:20:02 -0700 Subject: [PATCH 18/70] Update ruff to 0.5.5 (#5250) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 23b7ab500..6bfad1d6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.4 +ruff==0.5.5 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index b70addfdd..d15e46270 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.4 + rev: v0.5.5 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 236976d33..8261ef56a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.4 # https://github.com/astral-sh/ruff +ruff==0.5.5 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 207a9e576c5cef9e1c757279d67bb0a752fcdf6e Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 27 Jul 2024 02:18:07 +0000 Subject: [PATCH 19/70] Release 2024.07.26 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d739f007..2c03b41cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.26 + + +### Updated + +- Update ruff to 0.5.5 ([#5250](https://github.com/cookiecutter/cookiecutter-django/pull/5250)) + ## 2024.07.25 diff --git a/setup.py b/setup.py index fbafc02b0..9166d8ce8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.25" +version = "2024.07.26" with open("README.md") as readme_file: long_description = readme_file.read() From 4c24e7fb189737765cb9495a5902829bf07ed669 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 28 Jul 2024 08:40:30 +0100 Subject: [PATCH 20/70] Update django-stubs from 5.0.2 to 5.0.3 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 8261ef56a..d525bb683 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy -django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs +django-stubs[compatible-mypy]==5.0.3 # https://github.com/typeddjango/django-stubs pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 9b42473bad2cd2cc2c890c31070856616f93103b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 19 Jul 2024 21:14:25 +0100 Subject: [PATCH 21/70] Update mypy from 1.10.0 to 1.11.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 8261ef56a..aef66327f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==1.10.0 # https://github.com/python/mypy +mypy==1.11.0 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar From a8105bdc9fd9b8a0b117ec0d081b1b85844c90b2 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 28 Jul 2024 09:59:08 +0200 Subject: [PATCH 22/70] Fix signature for UserUpdateView.get_object --- .../{{cookiecutter.project_slug}}/users/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index 3f20f2686..942f3e3f0 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -1,5 +1,6 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.messages.views import SuccessMessageMixin +from django.db.models import QuerySet from django.urls import reverse from django.utils.translation import gettext_lazy as _ from django.views.generic import DetailView @@ -28,12 +29,12 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): fields = ["name"] success_message = _("Information successfully updated") - def get_success_url(self): + def get_success_url(self) -> str: # for mypy to know that the user is authenticated assert self.request.user.is_authenticated return self.request.user.get_absolute_url() - def get_object(self): + def get_object(self, queryset: QuerySet | None=None) -> User: return self.request.user @@ -43,7 +44,7 @@ user_update_view = UserUpdateView.as_view() class UserRedirectView(LoginRequiredMixin, RedirectView): permanent = False - def get_redirect_url(self): + def get_redirect_url(self) -> str: {%- if cookiecutter.username_type == "email" %} return reverse("users:detail", kwargs={"pk": self.request.user.pk}) {%- else %} From 6355464230548fff50b498619ea43513376000d9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 28 Jul 2024 10:04:55 +0200 Subject: [PATCH 23/70] Add type guard --- .../{{cookiecutter.project_slug}}/users/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index 942f3e3f0..8bb1838cd 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -35,6 +35,8 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): return self.request.user.get_absolute_url() def get_object(self, queryset: QuerySet | None=None) -> User: + # for mypy to know that the user is authenticated + assert self.request.user.is_authenticated return self.request.user From bb8a1b6637e0563490c67cdfe76841097deba7fa Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 28 Jul 2024 10:18:38 +0200 Subject: [PATCH 24/70] Add AuthenticatedHttpRequest type for helping with LoginRequiredMixin views --- .../{{cookiecutter.project_slug}}/users/views.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index 8bb1838cd..ca3e104ec 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -1,6 +1,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.messages.views import SuccessMessageMixin from django.db.models import QuerySet +from django.http import HttpRequest from django.urls import reverse from django.utils.translation import gettext_lazy as _ from django.views.generic import DetailView @@ -10,6 +11,11 @@ from django.views.generic import UpdateView from {{ cookiecutter.project_slug }}.users.models import User +class AuthenticatedHttpRequest(HttpRequest): + """For mypy to know that the user is authenticated.""" + user: User + + class UserDetailView(LoginRequiredMixin, DetailView): model = User {%- if cookiecutter.username_type == "email" %} @@ -19,6 +25,7 @@ class UserDetailView(LoginRequiredMixin, DetailView): slug_field = "username" slug_url_kwarg = "username" {%- endif %} + request: AuthenticatedHttpRequest user_detail_view = UserDetailView.as_view() @@ -28,15 +35,12 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): model = User fields = ["name"] success_message = _("Information successfully updated") + request: AuthenticatedHttpRequest def get_success_url(self) -> str: - # for mypy to know that the user is authenticated - assert self.request.user.is_authenticated return self.request.user.get_absolute_url() def get_object(self, queryset: QuerySet | None=None) -> User: - # for mypy to know that the user is authenticated - assert self.request.user.is_authenticated return self.request.user @@ -45,6 +49,7 @@ user_update_view = UserUpdateView.as_view() class UserRedirectView(LoginRequiredMixin, RedirectView): permanent = False + request: AuthenticatedHttpRequest def get_redirect_url(self) -> str: {%- if cookiecutter.username_type == "email" %} From 429f4681006030ce59a6d6e3f9db082733c3221c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 28 Jul 2024 10:27:20 +0200 Subject: [PATCH 25/70] Revert to simpler type guard fix --- .../{{cookiecutter.project_slug}}/users/views.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index ca3e104ec..e7655f123 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -1,7 +1,6 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.messages.views import SuccessMessageMixin from django.db.models import QuerySet -from django.http import HttpRequest from django.urls import reverse from django.utils.translation import gettext_lazy as _ from django.views.generic import DetailView @@ -11,11 +10,6 @@ from django.views.generic import UpdateView from {{ cookiecutter.project_slug }}.users.models import User -class AuthenticatedHttpRequest(HttpRequest): - """For mypy to know that the user is authenticated.""" - user: User - - class UserDetailView(LoginRequiredMixin, DetailView): model = User {%- if cookiecutter.username_type == "email" %} @@ -25,7 +19,6 @@ class UserDetailView(LoginRequiredMixin, DetailView): slug_field = "username" slug_url_kwarg = "username" {%- endif %} - request: AuthenticatedHttpRequest user_detail_view = UserDetailView.as_view() @@ -35,12 +28,13 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): model = User fields = ["name"] success_message = _("Information successfully updated") - request: AuthenticatedHttpRequest def get_success_url(self) -> str: + assert self.request.user.is_authenticated # type guard return self.request.user.get_absolute_url() def get_object(self, queryset: QuerySet | None=None) -> User: + assert self.request.user.is_authenticated # type guard return self.request.user @@ -49,7 +43,6 @@ user_update_view = UserUpdateView.as_view() class UserRedirectView(LoginRequiredMixin, RedirectView): permanent = False - request: AuthenticatedHttpRequest def get_redirect_url(self) -> str: {%- if cookiecutter.username_type == "email" %} From 676aa25a3731cfaee44a67a3d7160b110c4a0565 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 28 Jul 2024 20:40:32 +0100 Subject: [PATCH 26/70] Update django-stubs from 5.0.2 to 5.0.4 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 8261ef56a..138484040 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy -django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs +django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-stubs pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 8f4c31cf8c1211d850024e40eea4fcd4a4bb75db Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 30 Jul 2024 17:41:25 +0100 Subject: [PATCH 27/70] Update redis from 5.0.7 to 5.0.8 --- {{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 c947883bb..4ee8f3e31 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.7.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==5.0.7 # https://github.com/redis/redis-py +redis==5.0.8 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py {%- endif %} From db496f9c0c3f4a5b423361305a811d6c1106608a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 06:58:50 -0700 Subject: [PATCH 28/70] Update sentry-sdk to 2.12.0 (#5268) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 47f1d4690..089a26cd4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.11.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.12.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py From 4c27a59678523974cf7702b6e150a3eb20b0a165 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 06:59:08 -0700 Subject: [PATCH 29/70] Update django-allauth to 64.0.0 (#5269) --- {{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 c947883bb..447503a14 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==5.0.7 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==64.0.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.3 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 4413b25706cb26093aed067637606d3c275c528e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 31 Jul 2024 15:02:04 +0100 Subject: [PATCH 30/70] Remove compatible-mypy extra from djangorestframework-stubs Looks like the latest version should work with mypy 1.11: https://github.com/typeddjango/djangorestframework-stubs/pull/642 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 00e583dbd..21280bb0f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-st pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From 0d9ffe5d7a8efcb7f00b227da80e78f02b3d4148 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 15:13:42 +0100 Subject: [PATCH 31/70] Update pyupgrade pre-commit hook to v3.17.0 (#5258) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index acf7676ec..1b3b76843 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.16.0 + rev: v3.17.0 hooks: - id: pyupgrade args: [--py312-plus] From bb053b0497cfc0cda2c7c7610552c61676efa909 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 07:14:24 -0700 Subject: [PATCH 32/70] Update pre-commit to 3.8.0 (#5257) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6bfad1d6f..5afa20ead 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 ruff==0.5.5 django-upgrade==1.20.0 djlint==1.34.1 -pre-commit==3.7.1 +pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 21280bb0f..22d8acf10 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -31,7 +31,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild ruff==0.5.5 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint -pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit +pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 20db5f13158720f9aa674d18a0ad38765cac400a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 07:23:25 -0700 Subject: [PATCH 33/70] Update mypy to 1.11.1 (#5270) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 22d8acf10..e7781dc2f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==1.11.0 # https://github.com/python/mypy +mypy==1.11.1 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-stubs pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar From 75a9da3de2abe59a7f8b523671ea0271c99ada25 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 15:08:44 -0700 Subject: [PATCH 34/70] Update uvicorn from 0.30.3 to 0.30.4 (#5271) --- {{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 82faffb04..c889b5dae 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.30.3 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.4 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From a2b1055e16fc286b182366a17bc98463574da948 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 1 Aug 2024 02:23:00 +0000 Subject: [PATCH 35/70] Release 2024.07.31 --- CHANGELOG.md | 23 +++++++++++++++++++++++ setup.py | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c03b41cb..c6f240d92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,29 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.31 + + +### Updated + +- Update uvicorn to 0.30.4 ([#5271](https://github.com/cookiecutter/cookiecutter-django/pull/5271)) + +- Update mypy to 1.11.1 ([#5270](https://github.com/cookiecutter/cookiecutter-django/pull/5270)) + +- Update pre-commit to 3.8.0 ([#5257](https://github.com/cookiecutter/cookiecutter-django/pull/5257)) + +- Update pyupgrade pre-commit hook to v3.17.0 ([#5258](https://github.com/cookiecutter/cookiecutter-django/pull/5258)) + +- Update redis to 5.0.8 ([#5265](https://github.com/cookiecutter/cookiecutter-django/pull/5265)) + +- Update django-stubs to 5.0.4 ([#5256](https://github.com/cookiecutter/cookiecutter-django/pull/5256)) + +- Update mypy to 1.11.0 ([#5231](https://github.com/cookiecutter/cookiecutter-django/pull/5231)) + +- Update django-allauth to 64.0.0 ([#5269](https://github.com/cookiecutter/cookiecutter-django/pull/5269)) + +- Update sentry-sdk to 2.12.0 ([#5268](https://github.com/cookiecutter/cookiecutter-django/pull/5268)) + ## 2024.07.26 diff --git a/setup.py b/setup.py index 9166d8ce8..cf3864c43 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.26" +version = "2024.07.31" with open("README.md") as readme_file: long_description = readme_file.read() From 739ba6206b5c8dc5000d1fec3eb883cc9c11b75d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 11:35:41 +0100 Subject: [PATCH 36/70] Auto-update pre-commit hooks (#5274) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1b3b76843..a1f0c603f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,7 +33,7 @@ repos: exclude: hooks/ - repo: https://github.com/psf/black - rev: 24.4.2 + rev: 24.8.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index d15e46270..ffe38a7ac 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.5 + rev: v0.5.6 hooks: # Linter - id: ruff From f56562db7962ce349d3118df19e7c4c7454bb340 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 4 Aug 2024 03:35:58 -0700 Subject: [PATCH 37/70] Update ruff to 0.5.6 (#5273) * Update ruff from 0.5.5 to 0.5.6 * Update ruff from 0.5.5 to 0.5.6 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5afa20ead..8139fb9f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.5 +ruff==0.5.6 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.8.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e7781dc2f..51d789e9a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.5 # https://github.com/astral-sh/ruff +ruff==0.5.6 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From a7f34df264dd1e841a6288b6c1d6e7cb62616a8f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 4 Aug 2024 03:36:12 -0700 Subject: [PATCH 38/70] Update uvicorn from 0.30.4 to 0.30.5 (#5272) --- {{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 c889b5dae..03cc2b835 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.30.4 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.5 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From 74c5794a72bef6612181fdec44e1b01f16aa85e3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Aug 2024 02:20:10 +0000 Subject: [PATCH 39/70] Release 2024.08.04 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f240d92..5210aa041 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.04 + + +### Updated + +- Update uvicorn to 0.30.5 ([#5272](https://github.com/cookiecutter/cookiecutter-django/pull/5272)) + +- Update ruff to 0.5.6 ([#5273](https://github.com/cookiecutter/cookiecutter-django/pull/5273)) + +- Auto-update pre-commit hooks ([#5274](https://github.com/cookiecutter/cookiecutter-django/pull/5274)) + ## 2024.07.31 diff --git a/setup.py b/setup.py index cf3864c43..9aaaa02db 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.31" +version = "2024.08.04" with open("README.md") as readme_file: long_description = readme_file.read() From 775c7730f669f7cab812a0ee8b171f77cde10afc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:33:11 +0100 Subject: [PATCH 40/70] Auto-update pre-commit hooks (#5277) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a1f0c603f..d8d601e92 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 7.1.0 + rev: 7.1.1 hooks: - id: flake8 From e6916a858a07856b47fb9888fa8ba9337a9c981d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 5 Aug 2024 12:10:21 -0700 Subject: [PATCH 41/70] Update myst-parser to 4.0.0 (#5279) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index f2b16c26f..f3b153721 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ sphinx==7.4.7 sphinx-rtd-theme==2.0.0 -myst-parser==3.0.1 +myst-parser==4.0.0 From 875d9200cf1e350590c5ca16c8ee4003f11c15b2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 5 Aug 2024 12:10:52 -0700 Subject: [PATCH 42/70] Update coverage to 7.6.1 (#5276) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 51d789e9a..78fec207c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.5.6 # https://github.com/astral-sh/ruff -coverage==7.6.0 # https://github.com/nedbat/coveragepy +coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From 7390948fc53b4316d81f795454da510e472540b1 Mon Sep 17 00:00:00 2001 From: Kevin Mills <35641675+millsks@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:12:30 -0500 Subject: [PATCH 43/70] Update README.md (#5275) Add new Medium story in the Articles section --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6e3c0a74c..879b2b2cf 100644 --- a/README.md +++ b/README.md @@ -244,6 +244,7 @@ experience better. ## Articles +- [Why cookiecutter-django is Essential for Your Next Django Project](https://medium.com/@millsks/why-cookiecutter-django-is-essential-for-your-next-django-project-7d3c00cdce51) - Aug. 4, 2024 - [How to Make Your Own Django Cookiecutter Template!](https://medium.com/@FatemeFouladkar/how-to-make-your-own-django-cookiecutter-template-a753d4cbb8c2) - Aug. 10, 2023 - [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021 - [Complete Walkthrough: Blue/Green Deployment to AWS ECS using GitHub actions](https://github.com/Andrew-Chen-Wang/cookiecutter-django-ecs-github) - June 10, 2020 From 0576726cabcd78513a99e853e3a71b3130961819 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 5 Aug 2024 19:14:39 +0000 Subject: [PATCH 44/70] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 62b93da92..c11bce30d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1608,5 +1608,10 @@ "name": "Filipe Nascimento", "github_login": "FilipeNas", "twitter_username": "" + }, + { + "name": "Kevin Mills", + "github_login": "millsks", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 03f86e76c..503eb8bfa 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1293,6 +1293,13 @@ Listed in alphabetical order. + + Kevin Mills + + millsks + + + Kevin Ndung'u From 3cbe3b2a908d822f370c311525d44be77c283659 Mon Sep 17 00:00:00 2001 From: Jimmy Gitonga Date: Mon, 5 Aug 2024 22:40:12 +0300 Subject: [PATCH 45/70] Resolve https documentation around local development environment (#5252) --- docs/developing-locally-docker.rst | 139 +++++++++-------------------- 1 file changed, 41 insertions(+), 98 deletions(-) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 83de99bb9..cb2cdc0e5 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -43,7 +43,6 @@ Before doing any git commit, `pre-commit`_ should be installed globally on your Failing to do so will result with a bunch of CI and Linter errors that can be avoided with pre-commit. - Run the Stack ------------- @@ -91,7 +90,6 @@ Also, please note that the ``docker exec`` does not work for running management When ``DEBUG`` is set to ``True``, the host is validated against ``['localhost', '127.0.0.1', '[::1]']``. This is adequate when running a ``virtualenv``. For Docker, in the ``config.settings.local``, add your host development server IP to ``INTERNAL_IPS`` or ``ALLOWED_HOSTS`` if the variable exists. - .. _envs: Configuring the Environment @@ -117,8 +115,8 @@ The most important thing for us here now is ``env_file`` section enlisting ``./. .envs ├── .local - │   ├── .django - │   └── .postgres + │ ├── .django + │ └── .postgres └── .production ├── .django └── .postgres @@ -195,7 +193,6 @@ The ``container_name`` from the yml file can be used to check on containers with $ docker logs _local_celeryworker $ docker top _local_celeryworker - Notice that the ``container_name`` is generated dynamically using your project slug as a prefix Mailpit @@ -245,118 +242,64 @@ The stack comes with a dedicated node service to build the static assets, watch .. _Sass: https://sass-lang.com/ .. _live reloading: https://browsersync.io -Developing locally with HTTPS ------------------------------ +(Optionally) Developing locally with HTTPS +------------------------------------------ -Increasingly it is becoming necessary to develop software in a secure environment in order that there are very few changes when deploying to production. Recently Facebook changed their policies for apps/sites that use Facebook login which requires the use of an HTTPS URL for the OAuth redirect URL. So if you want to use the ``users`` application with a OAuth provider such as Facebook, securing your communication to the local development environment will be necessary. - -In order to create a secure environment, we need to have a trusted SSL certificate installed in our Docker application. - -#. **Let's Encrypt** - - The official line from Let’s Encrypt is: - - [For local development section] ... The best option: Generate your own certificate, either self-signed or signed by a local root, and trust it in your operating system’s trust store. Then use that certificate in your local web server. See below for details. - - See `letsencrypt.org - certificates-for-localhost`_ - - .. _`letsencrypt.org - certificates-for-localhost`: https://letsencrypt.org/docs/certificates-for-localhost/ - -#. **mkcert: Valid Https Certificates For Localhost** - - `mkcert`_ is a simple by design tool that hides all the arcane knowledge required to generate valid TLS certificates. It works for any hostname or IP, including localhost. It supports macOS, Linux, and Windows, and Firefox, Chrome and Java. It even works on mobile devices with a couple manual steps. - - See https://blog.filippo.io/mkcert-valid-https-certificates-for-localhost/ - - .. _`mkcert`: https://github.com/FiloSottile/mkcert/blob/master/README.md#supported-root-stores - -After installing a trusted TLS certificate, configure your docker installation. We are going to configure an ``nginx`` reverse-proxy server. This makes sure that it does not interfere with our ``traefik`` configuration that is reserved for production environments. - -These are the places that you should configure to secure your local environment. - -certs +Nginx ~~~~~ -Take the certificates that you generated and place them in a folder called ``certs`` in the project's root folder. Assuming that you registered your local hostname as ``my-dev-env.local``, the certificates you will put in the folder should have the names ``my-dev-env.local.crt`` and ``my-dev-env.local.key``. +If you want to add some sort of social authentication with a OAuth provider such as Facebook, securing your communication to the local development environment will be necessary. These providers usually require that you use an HTTPS URL for the OAuth redirect URL for the Facebook login to work appropriately. -docker-compose.local.yml -~~~~~~~~~ +Here is a link to an article on `how to add HTTPS using Nginx`_ to your local docker installation. This also includes how to serve files from the ``media`` location, in the event that you are want to serve user-uploaded content. -#. Add the ``nginx-proxy`` service. :: +.. _`how to add HTTPS using Nginx`: https://afroshok.com/cookiecutter-https - ... +Webpack +~~~~~~~ - nginx-proxy: - image: jwilder/nginx-proxy:alpine - container_name: nginx-proxy - ports: - - "80:80" - - "443:443" - volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro - - ./certs:/etc/nginx/certs - restart: always - depends_on: - - django +If you are using Webpack, first install ``mkcert``_. It is a simple by design tool that hides all the arcane knowledge required to generate valid TLS certificates. It works for any hostname or IP, including localhost. It supports macOS, Linux, and Windows, and Firefox, Chrome and Java. It even works on mobile devices with a couple manual steps. See https://blog.filippo.io/mkcert-valid-https-certificates-for-localhost/ - ... +.. _`mkcert`: https://github.com/FiloSottile/mkcert/blob/master/README.md#supported-root-stores -#. Link the ``nginx-proxy`` to ``django`` through environment variables. +These are the places that you should configure to secure your local environment. Take the certificates that you generated and place them in a folder called ``certs`` in the project's root folder. Configure an ``nginx`` reverse-proxy server as a ``service`` in the ``docker-compose.local.yml``. This makes sure that it does not interfere with our ``traefik`` configuration that is reserved for production environments. - ``django`` already has an ``.env`` file connected to it. Add the following variables. You should do this especially if you are working with a team and you want to keep your local environment details to yourself. +Assuming that you registered your local hostname as ``my-dev-env.local``, the certificates you will put in the folder should have the names ``my-dev-env.local.crt`` and ``my-dev-env.local.key``. - :: +1. Add the ``nginx-proxy`` service to the ``docker-compose.local.yml``. :: - # HTTPS - # ------------------------------------------------------------------------------ - VIRTUAL_HOST=my-dev-env.local - VIRTUAL_PORT=8000 + nginx-proxy: + image: jwilder/nginx-proxy:alpine + container_name: nginx-proxy + ports: + - "80:80" + - "443:443" + volumes: + - /var/run/docker.sock:/tmp/docker.sock:ro + - ./certs:/etc/nginx/certs + restart: always + depends_on: + - node + environment: + - VIRTUAL_HOST=my-dev-env.local + - VIRTUAL_PORT=3000 - The services run behind the reverse proxy. - -config/settings/local.py -~~~~~~~~~~~~~~~~~~~~~~~~ - -You should allow the new hostname. :: +2. Add the local secure domain to the ``config/settings/local.py``. You should allow the new hostname :: ALLOWED_HOSTS = ["localhost", "0.0.0.0", "127.0.0.1", "my-dev-env.local"] +3. Add the following configuration to the ``devServer`` section of ``webpack/dev.config.js`` :: + + client: { + webSocketURL: 'auto://0.0.0.0:0/ws', // note the `:0` after `0.0.0.0` + }, + + Rebuild your ``docker`` application. :: $ docker compose -f docker-compose.local.yml up -d --build -Go to your browser and type in your URL bar ``https://my-dev-env.local`` +Go to your browser and type in your URL bar ``https://my-dev-env.local``. -See `https with nginx`_ for more information on this configuration. +For more on this configuration, see `https with nginx`_. - .. _`https with nginx`: https://codewithhugo.com/docker-compose-local-https/ - -.gitignore -~~~~~~~~~~ - -Add ``certs/*`` to the ``.gitignore`` file. This allows the folder to be included in the repo but its contents to be ignored. - -*This configuration is for local development environments only. Do not use this for production since you might expose your local* ``rootCA-key.pem``. - -Webpack -~~~~~~~ - -If you are using Webpack: - -1. On the ``nginx-proxy`` service in ``docker-compose.local.yml``, change ``depends_on`` to ``node`` instead of ``django``. - -2. On the ``node`` service in ``docker-compose.local.yml``, add the following environment configuration: - - :: - - environment: - - VIRTUAL_HOST=my-dev-env.local - - VIRTUAL_PORT=3000 - -3. Add the following configuration to the ``devServer`` section of ``webpack/dev.config.js``: - - :: - - client: { - webSocketURL: 'auto://0.0.0.0:0/ws', // note the `:0` after `0.0.0.0` - }, +.. _`https with nginx`: https://codewithhugo.com/docker-compose-local-https/ From af50d111914aa66d78c1eb13a476b34aa35f2a97 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 6 Aug 2024 02:19:20 +0000 Subject: [PATCH 46/70] Release 2024.08.05 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5210aa041..36bd98f6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.05 + + +### Documentation + +- Simplify documentation for https in local development ([#5252](https://github.com/cookiecutter/cookiecutter-django/pull/5252)) + +- Add Medium story in the Articles section ([#5275](https://github.com/cookiecutter/cookiecutter-django/pull/5275)) + +### Updated + +- Update coverage to 7.6.1 ([#5276](https://github.com/cookiecutter/cookiecutter-django/pull/5276)) + +- Auto-update pre-commit hooks ([#5277](https://github.com/cookiecutter/cookiecutter-django/pull/5277)) + ## 2024.08.04 diff --git a/setup.py b/setup.py index 9aaaa02db..885a2b5fe 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.04" +version = "2024.08.05" with open("README.md") as readme_file: long_description = readme_file.read() From 936fc52602f30e16f42da15fd6983877ba91bb25 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 6 Aug 2024 00:44:44 -0700 Subject: [PATCH 47/70] Update tox from 4.16.0 to 4.17.0 (#5280) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8139fb9f4..d5a73a7ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ -tox==4.16.0 +tox==4.17.0 pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From 5846b051cba44e511b175361ed8e3820e2f82144 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 6 Aug 2024 09:03:46 -0700 Subject: [PATCH 48/70] Update django to 5.0.8 (#5281) --- {{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 03cc2b835..7e6031fe3 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==5.0.7 # pyup: < 5.1 # https://www.djangoproject.com/ +django==5.0.8 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==64.0.0 # https://github.com/pennersr/django-allauth From e1354239d82fee70043b3a5c4e12570d07310f00 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 7 Aug 2024 02:20:20 +0000 Subject: [PATCH 49/70] Release 2024.08.06 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36bd98f6f..d6e2afa15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.06 + + +### Updated + +- Update django to 5.0.8 ([#5281](https://github.com/cookiecutter/cookiecutter-django/pull/5281)) + ## 2024.08.05 diff --git a/setup.py b/setup.py index 885a2b5fe..0895f753c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.05" +version = "2024.08.06" with open("README.md") as readme_file: long_description = readme_file.read() From 358b26a0d641d96d2d80f1ed3de5bc0b4d11670e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Aug 2024 05:46:04 -0700 Subject: [PATCH 50/70] Update pyyaml to 6.0.2 (#5284) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d5a73a7ae..6cf0f3f74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 -pyyaml==6.0.1 +pyyaml==6.0.2 # Scripting # ------------------------------------------------------------------------------ From c8165ef92cf34004eceea0697f27df74c65a07bf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:34 +0100 Subject: [PATCH 51/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 089a26cd4..693047903 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ django-storages[google]==1.14.4 # https://github.com/jschneier/django-storages django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon-ses]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} From 68814e94e2139f27d2a123174cc54fdf61d3895f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:34 +0100 Subject: [PATCH 52/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 693047903..0350d066c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -26,7 +26,7 @@ django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon-ses]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[amazon-ses]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} From f2f1ef6cd41ce7c4d6218e1f674dd284376393a5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:35 +0100 Subject: [PATCH 53/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 0350d066c..a94e36dcf 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -28,7 +28,7 @@ django-anymail[mailgun]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon-ses]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} From ced3148af61a2e800692f11ea3f73188cd1bbc8e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:35 +0100 Subject: [PATCH 54/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index a94e36dcf..77b8216ec 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -30,7 +30,7 @@ django-anymail[amazon-ses]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} From 54dca549d3b7f8b2343bed46eb023360b274d183 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:36 +0100 Subject: [PATCH 55/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 77b8216ec..bd985ac73 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -32,7 +32,7 @@ django-anymail[mailjet]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[postmark]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} From d0fa1e473d54b5ba8fa7acc77cec160eecc4eec1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:37 +0100 Subject: [PATCH 56/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index bd985ac73..b9bce8949 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -34,7 +34,7 @@ django-anymail[mandrill]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} django-anymail[brevo]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} From 107d0125aff53f85387406a6519a3e24af533771 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:37 +0100 Subject: [PATCH 57/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index b9bce8949..99f6b531e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -36,7 +36,7 @@ django-anymail[postmark]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} -django-anymail[brevo]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[brevo]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} From 1c23f83fc4292d3a76c1dbaec8918f6393ef3e83 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:38 +0100 Subject: [PATCH 58/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 99f6b531e..3fbc444a4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -38,7 +38,7 @@ django-anymail[sendgrid]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} django-anymail[brevo]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} django-anymail==11.0.1 # https://github.com/anymail/django-anymail {%- endif %} From 75464de51229e16d11fa56654610f854b8209a42 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:38 +0100 Subject: [PATCH 59/70] Update django-anymail from 11.0.1 to 11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 3fbc444a4..5894e239b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -40,5 +40,5 @@ django-anymail[brevo]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==11.0.1 # https://github.com/anymail/django-anymail +django-anymail==11.1 # https://github.com/anymail/django-anymail {%- endif %} From 532941a4181f774e8f949e20da9bf79ccb400dbc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 19:29:38 +0100 Subject: [PATCH 60/70] Update tox from 4.17.0 to 4.17.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6cf0f3f74..06f9373f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ -tox==4.17.0 +tox==4.17.1 pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From 4e3768145bda2eb67ea9ba1415f656611ef170d9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 8 Aug 2024 02:19:59 +0000 Subject: [PATCH 61/70] Release 2024.08.07 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6e2afa15..1c7a8129f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.07 + + +### Updated + +- Update tox to 4.17.1 ([#5285](https://github.com/cookiecutter/cookiecutter-django/pull/5285)) + +- Update django-anymail to 11.1 ([#5286](https://github.com/cookiecutter/cookiecutter-django/pull/5286)) + ## 2024.08.06 diff --git a/setup.py b/setup.py index 0895f753c..a27e3a53d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.06" +version = "2024.08.07" with open("README.md") as readme_file: long_description = readme_file.read() From 89d1ae1536c358a02b73f26e0e1351851b0f04ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:50:33 +0000 Subject: [PATCH 62/70] Bump python in /{{cookiecutter.project_slug}}/compose/production/django Bumps python from 3.12.4-slim-bookworm to 3.12.5-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../compose/production/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 6279908a9..3e0859c24 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -25,7 +25,7 @@ RUN npm run build {%- endif %} # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm AS python +FROM docker.io/python:3.12.5-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From 774176f9bed52b563bcdd3404ab63df29fe75622 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:38:31 +0000 Subject: [PATCH 63/70] Bump python in /{{cookiecutter.project_slug}}/compose/local/django Bumps python from 3.12.4-slim-bookworm to 3.12.5-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 1183ae984..ddec2d4e7 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm AS python +FROM docker.io/python:3.12.5-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From 4b683d86d20951271242fc142b7d07688f221bb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:12:57 +0000 Subject: [PATCH 64/70] Bump python in /{{cookiecutter.project_slug}}/compose/local/docs Bumps python from 3.12.4-slim-bookworm to 3.12.5-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index cdc002fe0..49e25cba9 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm AS python +FROM docker.io/python:3.12.5-slim-bookworm AS python # Python build stage From 07af107e1e1422c78e0808dd1acc6db803fc2b47 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 8 Aug 2024 12:13:18 +0100 Subject: [PATCH 65/70] Update Heroku Python runtime --- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 74d315a82..8a7cba521 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.12.4 +python-3.12.5 From 734faf13eadc4d9e97eb36f6584b3af2fa91f41e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 8 Aug 2024 18:42:46 +0100 Subject: [PATCH 66/70] Update ruff from 0.5.6 to 0.5.7 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 06f9373f8..12ede4a32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.6 +ruff==0.5.7 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.8.0 From 851155656d38bd75bfc39a92083fedaed0067517 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 8 Aug 2024 18:42:46 +0100 Subject: [PATCH 67/70] Update ruff from 0.5.6 to 0.5.7 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 78fec207c..a0cb1a5e3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.6 # https://github.com/astral-sh/ruff +ruff==0.5.7 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From cf1ce9e45fb8d05196887514cbb87ed3934d4cce Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 9 Aug 2024 02:20:23 +0000 Subject: [PATCH 68/70] Release 2024.08.08 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c7a8129f..a3614d090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.08 + + +### Updated + +- Update ruff to 0.5.7 ([#5291](https://github.com/cookiecutter/cookiecutter-django/pull/5291)) + +- Bump python from 3.12.4 to 3.12.5 in docs Docker image ([#5287](https://github.com/cookiecutter/cookiecutter-django/pull/5287)) + +- Bump python from 3.12.4 to 3.12.5 in local Docker image ([#5289](https://github.com/cookiecutter/cookiecutter-django/pull/5289)) + +- Bump python from 3.12.4 to 3.12.5 in production Docker image ([#5290](https://github.com/cookiecutter/cookiecutter-django/pull/5290)) + ## 2024.08.07 diff --git a/setup.py b/setup.py index a27e3a53d..56e39674f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.07" +version = "2024.08.08" with open("README.md") as readme_file: long_description = readme_file.read() From b1089c254c7fd66217d411edceb34ada6efd6bb3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 09:19:12 +0100 Subject: [PATCH 69/70] Update Ruff pre-commit hook to v0.5.7 (#5293) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- {{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 ffe38a7ac..d8d699845 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.6 + rev: v0.5.7 hooks: # Linter - id: ruff From 5ba04c6c78f2a03d932dfd33d78430da77a4ae77 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 10 Aug 2024 02:19:39 +0000 Subject: [PATCH 70/70] Release 2024.08.09 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3614d090..c8ba95b38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.09 + + +### Updated + +- Update Ruff pre-commit hook to v0.5.7 ([#5293](https://github.com/cookiecutter/cookiecutter-django/pull/5293)) + ## 2024.08.08 diff --git a/setup.py b/setup.py index 56e39674f..ef3eb13ad 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.08" +version = "2024.08.09" with open("README.md") as readme_file: long_description = readme_file.read()