From c44f6f6372917e0b8d25cc8dafbce110d053a9c1 Mon Sep 17 00:00:00 2001 From: LJFP Date: Thu, 5 Sep 2024 10:02:48 +0200 Subject: [PATCH 01/32] Fix Makefile and make.bat files for doc generation using sphinx-build. They were using a non-existent Builder called "help". I changed it to "html" since that is the one used by sphinx-autobuild. --- {{cookiecutter.project_slug}}/docs/Makefile | 8 ++++---- {{cookiecutter.project_slug}}/docs/make.bat | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile index cf080e4767..9e0e4d6c06 100644 --- a/{{cookiecutter.project_slug}}/docs/Makefile +++ b/{{cookiecutter.project_slug}}/docs/Makefile @@ -13,11 +13,11 @@ APP = /app APP = ../{{cookiecutter.project_slug}} {% endif %} -.PHONY: help livehtml apidocs Makefile +.PHONY: html livehtml apidocs Makefile -# Put it first so that "make" without argument is like "make help". -help: - @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -c . +# Put it first so that "make" without argument is like "make html". +html: + @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -c . # Build, watch and serve docs with live reload livehtml: diff --git a/{{cookiecutter.project_slug}}/docs/make.bat b/{{cookiecutter.project_slug}}/docs/make.bat index 6cd1129f03..fbf6eb45f2 100644 --- a/{{cookiecutter.project_slug}}/docs/make.bat +++ b/{{cookiecutter.project_slug}}/docs/make.bat @@ -12,7 +12,7 @@ set SOURCEDIR=_source set BUILDDIR=_build set APP=..\{{cookiecutter.project_slug}} -if "%1" == "" goto help +if "%1" == "" goto html %SPHINXBUILD% >NUL 2>NUL if errorlevel 9009 ( @@ -39,8 +39,8 @@ GOTO :EOF sphinx-apidoc -o %SOURCEDIR%/api %APP% GOTO :EOF -:help -%SPHINXBUILD% -b help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +:html +%SPHINXBUILD% -b html %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% :end popd From 63abaaadf83a74455b50e0d7c132bdbdfbc9de36 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 19 Sep 2024 09:05:17 +0100 Subject: [PATCH 02/32] Update tox from 4.19.0 to 4.20.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4b2443fdd8..852e747b9d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ -tox==4.19.0 +tox==4.20.0 pytest==8.3.3 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From f1b5b663475a82367ebaf135da5895ee33cdb302 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 20 Sep 2024 04:46:30 +0100 Subject: [PATCH 03/32] Update ruff from 0.6.5 to 0.6.6 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 852e747b9d..b153f7e711 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.5 +ruff==0.6.6 django-upgrade==1.21.0 djlint==1.35.2 pre-commit==3.8.0 From d1e33915321a4f777dd5ebb50bec02df96d35fe3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 20 Sep 2024 04:46:31 +0100 Subject: [PATCH 04/32] Update ruff from 0.6.5 to 0.6.6 --- {{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 8698553557..df6a1649c9 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.9.17 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.5 # https://github.com/astral-sh/ruff +ruff==0.6.6 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From 7f07b02a84af4c5944f4d50102d3176843878291 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 05:12:58 +0000 Subject: [PATCH 05/32] Bump traefik Bumps traefik from 3.1.3 to 3.1.4. --- updated-dependencies: - dependency-name: traefik dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../compose/production/traefik/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile index e6ca24eb96..0ef4ce6ca9 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/traefik:3.1.3 +FROM docker.io/traefik:3.1.4 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From 2396bfbca6768027b1f2f067ebbc2ad8c25a05d5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 19 Sep 2024 00:49:32 +0100 Subject: [PATCH 06/32] Update sphinx-autobuild from 2024.9.17 to 2024.9.19 --- {{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 df6a1649c9..fc74cd2655 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -25,7 +25,7 @@ djangorestframework-stubs==3.15.1 # https://github.com/typeddjango/djangorestfr # Documentation # ------------------------------------------------------------------------------ sphinx==7.4.7 # https://github.com/sphinx-doc/sphinx -sphinx-autobuild==2024.9.17 # https://github.com/GaretJax/sphinx-autobuild +sphinx-autobuild==2024.9.19 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ From c3345e1ece6392f3a3081d92308e7b2f1bfc5763 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 21 Sep 2024 02:24:35 +0000 Subject: [PATCH 07/32] Release 2024.09.20 --- CHANGELOG.md | 13 +++++++++++++ pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c73612a0a..023f2c457b 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.09.20 + + +### Updated + +- Update sphinx-autobuild to 2024.9.19 ([#5386](https://github.com/cookiecutter/cookiecutter-django/pull/5386)) + +- Bump traefik from 3.1.3 to 3.1.4 in /{{cookiecutter.project_slug}}/compose/production/traefik ([#5389](https://github.com/cookiecutter/cookiecutter-django/pull/5389)) + +- Update ruff to 0.6.6 ([#5388](https://github.com/cookiecutter/cookiecutter-django/pull/5388)) + +- Update tox to 4.20.0 ([#5387](https://github.com/cookiecutter/cookiecutter-django/pull/5387)) + ## 2024.09.17 diff --git a/pyproject.toml b/pyproject.toml index 27e52d8b3b..696ad29ab0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.17" +version = "2024.09.20" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From d0ddb001a052b327a720960999e42c1d3dfa6563 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 21 Sep 2024 11:38:40 -0300 Subject: [PATCH 08/32] Auto-update pre-commit hooks (#5391) 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 e487ac49da..0eb87a7952 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.6.5 + rev: v0.6.6 hooks: # Linter - id: ruff From 37a20861dbda19cc248338921b0e597670f1910c Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 22 Sep 2024 02:29:46 +0000 Subject: [PATCH 09/32] Release 2024.09.21 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 023f2c457b..92e0e4dc3b 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.09.21 + + +### Updated + +- Auto-update pre-commit hooks ([#5391](https://github.com/cookiecutter/cookiecutter-django/pull/5391)) + ## 2024.09.20 diff --git a/pyproject.toml b/pyproject.toml index 696ad29ab0..f14e75099a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.20" +version = "2024.09.21" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From ec4438a1fd7e6bf05905865a0f0485490dc51718 Mon Sep 17 00:00:00 2001 From: browniebroke <861044+browniebroke@users.noreply.github.com> Date: Sun, 22 Sep 2024 02:39:44 +0000 Subject: [PATCH 10/32] Auto-update pre-commit hooks --- {{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 0eb87a7952..3e34af9a40 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.6.6 + rev: v0.6.7 hooks: # Linter - id: ruff From af9b0bcc40d274249c9801637ecea9d5884be74f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 22 Sep 2024 10:53:07 +0100 Subject: [PATCH 11/32] Update django-allauth from 64.2.1 to 65.0.0 --- {{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 7ea91c806c..ad925b0631 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.9 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==64.2.1 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==65.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 a0d6949877de6f238e52089825e705f0f79ab3bd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 23 Sep 2024 06:13:20 -0700 Subject: [PATCH 12/32] Update ruff to 0.6.7 (#5394) * Update ruff from 0.6.6 to 0.6.7 * Update ruff from 0.6.6 to 0.6.7 --- 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 b153f7e711..de159d8ff0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.6 +ruff==0.6.7 django-upgrade==1.21.0 djlint==1.35.2 pre-commit==3.8.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index fc74cd2655..9d5ac1d73d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.9.19 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.6 # https://github.com/astral-sh/ruff +ruff==0.6.7 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From 77813a90ab0aaf1b02388fd18387e14bf09566d3 Mon Sep 17 00:00:00 2001 From: foarsitter Date: Mon, 23 Sep 2024 14:40:35 +0000 Subject: [PATCH 13/32] 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 4c1ae84862..a04f8c9df1 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1643,5 +1643,10 @@ "name": "Alex Kanavos", "github_login": "alexkanavos", "twitter_username": "" + }, + { + "name": "LJFP", + "github_login": "ljfp", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index bbf688aebc..14b2581d20 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1419,6 +1419,13 @@ Listed in alphabetical order. + + LJFP + + ljfp + + + Luis Nell From fc6a38ea83e84e2b04d64051b6d62885010df702 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 23 Sep 2024 16:54:11 +0100 Subject: [PATCH 14/32] Update django-allauth from 65.0.0 to 65.0.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 ad925b0631..fb148932f3 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.9 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==65.0.0 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==65.0.1 # 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 f3397536d47870733e8a83694cbab1de4318805a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 23 Sep 2024 20:40:11 +0100 Subject: [PATCH 15/32] Update django-stubs from 5.0.4 to 5.1.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 9d5ac1d73d..f4c1525812 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.24.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.11.2 # https://github.com/python/mypy -django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-stubs +django-stubs[compatible-mypy]==5.1.0 # https://github.com/typeddjango/django-stubs pytest==8.3.3 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From bf67fe405dea6e165871abbf1c5e81822f95c907 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 24 Sep 2024 02:28:26 +0000 Subject: [PATCH 16/32] Release 2024.09.23 --- CHANGELOG.md | 17 +++++++++++++++++ pyproject.toml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92e0e4dc3b..35bc6378cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.09.23 + + +### Changed + +- Fix Makefile and make.bat files used for automatic generation of documentation. ([#5347](https://github.com/cookiecutter/cookiecutter-django/pull/5347)) + +### Updated + +- Update django-allauth to 65.0.1 ([#5399](https://github.com/cookiecutter/cookiecutter-django/pull/5399)) + +- Auto-update pre-commit hooks ([#5392](https://github.com/cookiecutter/cookiecutter-django/pull/5392)) + +- Update django-allauth to 65.0.0 ([#5393](https://github.com/cookiecutter/cookiecutter-django/pull/5393)) + +- Update ruff to 0.6.7 ([#5394](https://github.com/cookiecutter/cookiecutter-django/pull/5394)) + ## 2024.09.21 diff --git a/pyproject.toml b/pyproject.toml index f14e75099a..78ce289483 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.21" +version = "2024.09.23" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 8329947a2316a6dccfa39c0925c4474887157fc4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 25 Sep 2024 02:28:53 +0000 Subject: [PATCH 17/32] Release 2024.09.24 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35bc6378cf..0211dff62d 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.09.24 + + +### Updated + +- Update django-stubs to 5.1.0 ([#5400](https://github.com/cookiecutter/cookiecutter-django/pull/5400)) + ## 2024.09.23 diff --git a/pyproject.toml b/pyproject.toml index 78ce289483..40847e796b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.23" +version = "2024.09.24" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 4e7a412b8bccf1f81f3edc574a429234d8e8b27a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 26 Sep 2024 11:40:38 -0700 Subject: [PATCH 18/32] Update ruff to 0.6.8 (#5402) * Update ruff from 0.6.7 to 0.6.8 * Update ruff from 0.6.7 to 0.6.8 * Update ruff pre-commit hook (#5403) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- 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 de159d8ff0..1517a3c7a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.7 +ruff==0.6.8 django-upgrade==1.21.0 djlint==1.35.2 pre-commit==3.8.0 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 3e34af9a40..3d7cc6f092 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.6.7 + rev: v0.6.8 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index f4c1525812..87474565e4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.9.19 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.7 # https://github.com/astral-sh/ruff +ruff==0.6.8 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From 9de28fc3a89eb5df03992d59cf3c1cd516f8991d Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 27 Sep 2024 02:28:40 +0000 Subject: [PATCH 19/32] Release 2024.09.26 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0211dff62d..4e6e3b6a47 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.09.26 + + +### Updated + +- Update ruff to 0.6.8 ([#5402](https://github.com/cookiecutter/cookiecutter-django/pull/5402)) + ## 2024.09.24 diff --git a/pyproject.toml b/pyproject.toml index 40847e796b..62d4af41c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.24" +version = "2024.09.26" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 811b3010b91834985296a5ae69bd20cf0075f395 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 27 Sep 2024 03:48:35 -0700 Subject: [PATCH 20/32] Update django-allauth to 65.0.2 (#5405) --- {{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 fb148932f3..11e6bdf9db 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.9 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==65.0.1 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==65.0.2 # 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 5023e549e13d2f3b39e6310d970ffa05386c8ba6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 27 Sep 2024 19:22:43 +0100 Subject: [PATCH 21/32] Update redis from 5.0.8 to 5.1.0 --- {{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 11e6bdf9db..9cc94bc1c9 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.8 # https://github.com/redis/redis-py +redis==5.1.0 # 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 80680fe7ce5611672ebda2fec8247769053a28b5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 28 Sep 2024 02:26:59 +0000 Subject: [PATCH 22/32] Release 2024.09.27 --- CHANGELOG.md | 9 +++++++++ pyproject.toml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e6e3b6a47..f114a97b05 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.09.27 + + +### Updated + +- Update redis to 5.1.0 ([#5406](https://github.com/cookiecutter/cookiecutter-django/pull/5406)) + +- Update django-allauth to 65.0.2 ([#5405](https://github.com/cookiecutter/cookiecutter-django/pull/5405)) + ## 2024.09.26 diff --git a/pyproject.toml b/pyproject.toml index 62d4af41c9..0751ee94d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.26" +version = "2024.09.27" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 748382c95e1373313063c5d853c5e2ba2d84a102 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 28 Sep 2024 08:19:23 -0700 Subject: [PATCH 23/32] Update uvicorn to 0.31.0 (#5408) --- {{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 9cc94bc1c9..a84169f427 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.6 # https://github.com/encode/uvicorn +uvicorn[standard]==0.31.0 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From 866e6293bace9a548bb35bb7aa761efab1b79997 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 29 Sep 2024 02:30:33 +0000 Subject: [PATCH 24/32] Release 2024.09.28 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f114a97b05..21293eaf56 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.09.28 + + +### Updated + +- Update uvicorn to 0.31.0 ([#5408](https://github.com/cookiecutter/cookiecutter-django/pull/5408)) + ## 2024.09.27 diff --git a/pyproject.toml b/pyproject.toml index 0751ee94d4..35139da952 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.27" +version = "2024.09.28" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 053543d8d25467bdacebb7527f0b60202170ebec Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 29 Sep 2024 15:34:27 -0700 Subject: [PATCH 25/32] Update psycopg to 3.2.3 (#5411) * Update psycopg from 3.2.2 to 3.2.3 * Update psycopg from 3.2.2 to 3.2.3 * Update psycopg from 3.2.2 to 3.2.3 --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++-- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 87474565e4..1d635b37dc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -4,9 +4,9 @@ watchdog==4.0.2 # https://github.com/gorakhargosh/watchdog Werkzeug[watchdog]==3.0.4 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg[c]==3.2.2 # https://github.com/psycopg/psycopg +psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg {%- else %} -psycopg[binary]==3.2.2 # https://github.com/psycopg/psycopg +psycopg[binary]==3.2.3 # https://github.com/psycopg/psycopg {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchfiles==0.24.0 # https://github.com/samuelcolvin/watchfiles diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 8678d3121d..524c7a05fe 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==23.0.0 # https://github.com/benoitc/gunicorn -psycopg[c]==3.2.2 # https://github.com/psycopg/psycopg +psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg {%- if cookiecutter.use_whitenoise == 'n' %} Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} From 60adaa716de9be713c86d011215fee18baa37b90 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 30 Sep 2024 02:30:57 +0000 Subject: [PATCH 26/32] Release 2024.09.29 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21293eaf56..e459a4955c 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.09.29 + + +### Updated + +- Update psycopg to 3.2.3 ([#5411](https://github.com/cookiecutter/cookiecutter-django/pull/5411)) + ## 2024.09.28 diff --git a/pyproject.toml b/pyproject.toml index 35139da952..c9256ac384 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.28" +version = "2024.09.29" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From faba566d317086294d03ed795358362b16e79555 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 1 Oct 2024 09:28:38 -0700 Subject: [PATCH 27/32] Update sentry-sdk to 2.15.0 (#5413) --- {{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 524c7a05fe..424704337d 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.14.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.15.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 f8ef6c6251547492171482568169971d1057eac4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 2 Oct 2024 02:28:03 +0000 Subject: [PATCH 28/32] Release 2024.10.01 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e459a4955c..d7006c6907 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.10.01 + + +### Updated + +- Update sentry-sdk to 2.15.0 ([#5413](https://github.com/cookiecutter/cookiecutter-django/pull/5413)) + ## 2024.09.29 diff --git a/pyproject.toml b/pyproject.toml index c9256ac384..e672a24bcd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.29" +version = "2024.10.01" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 9379027267ac8e227cdc0a3c20d0f2087380cd9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:18:28 +0100 Subject: [PATCH 29/32] Bump python from 3.12.6 to 3.12.7 production Docker (#5414) Bumps python from 3.12.6-slim-bookworm to 3.12.7-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../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 86aae67d5b..35393dbf76 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.6-slim-bookworm AS python +FROM docker.io/python:3.12.7-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From ec499fa0acb22c19e051f617a50a3632e3bf30f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:18:54 +0100 Subject: [PATCH 30/32] Bump python from 3.12.6 to 3.12.7 in local Docker image (#5415) Bumps python from 3.12.6-slim-bookworm to 3.12.7-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{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 fbb62e2394..028e8f0f74 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.6-slim-bookworm AS python +FROM docker.io/python:3.12.7-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From e0819933ad03c5126ea468571791df5da8c10716 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 12:19:16 +0100 Subject: [PATCH 31/32] Bump python from 3.12.6 to 3.12.7 in docs Docker image (#5416) Bumps python from 3.12.6-slim-bookworm to 3.12.7-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{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 ed1b1dd2a2..40caf85117 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.6-slim-bookworm AS python +FROM docker.io/python:3.12.7-slim-bookworm AS python # Python build stage From 12380e1e8001e30a7de581c08d2e9314c29953b3 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 2 Oct 2024 12:20:06 +0100 Subject: [PATCH 32/32] Update Heroku runtime version to 3.12.7 --- {{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 32bcba665c..32905d6e0f 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.12.6 +python-3.12.7