From 7082e66db36297a406c321dd93693531c638d493 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 18 Jul 2024 09:50:15 -0700 Subject: [PATCH 01/54] Update sphinx to 7.4.6 (#5223) * Update sphinx from 7.4.5 to 7.4.6 * Update sphinx from 7.4.5 to 7.4.6 --- 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 d4b0420de..e1bc625ff 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.4.5 +sphinx==7.4.6 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 6c418272b..06065fa12 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.5 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.6 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality From e16eed7f1b8b8688dd894b51819a383c5c0e3245 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 19 Jul 2024 02:18:50 +0000 Subject: [PATCH 02/54] Release 2024.07.18 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df51251bb..843244210 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.18 + + +### Updated + +- Update sphinx to 7.4.6 ([#5223](https://github.com/cookiecutter/cookiecutter-django/pull/5223)) + ## 2024.07.17 diff --git a/setup.py b/setup.py index 312da1c83..edeeadfbd 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.17" +version = "2024.07.18" with open("README.md") as readme_file: long_description = readme_file.read() From e68d93598712347775bf1ce1b481d117b1ef79d7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 19 Jul 2024 01:52:29 -0700 Subject: [PATCH 03/54] Update ruff to 0.5.3 (#5224) --- 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 000d1cf36..f0e7f7b9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.2 +ruff==0.5.3 django-upgrade==1.19.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 956ca8d00..0c79e7234 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.2 + rev: v0.5.3 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 06065fa12..4fb93fb4b 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.2 # https://github.com/astral-sh/ruff +ruff==0.5.3 # 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 cb103ce28d684b81d5efbf0b36d9b526c137b001 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Thu, 18 Jul 2024 17:07:44 -0300 Subject: [PATCH 04/54] Use "ENV key=value" instead of "ENV key value" in Dockerfiles The old syntax for ENV and LABEL is marked as deprecated in docker buildx v0.14.0 https://docs.docker.com/reference/build-checks/legacy-key-value-format/ https://github.com/moby/buildkit/pull/4923 --- .../compose/local/django/Dockerfile | 6 +++--- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 6 +++--- {{cookiecutter.project_slug}}/compose/local/node/Dockerfile | 2 +- .../compose/production/django/Dockerfile | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 26a21c938..1183ae984 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -27,9 +27,9 @@ FROM python AS python-run-stage ARG BUILD_ENVIRONMENT=local ARG APP_HOME=/app -ENV PYTHONUNBUFFERED 1 -ENV PYTHONDONTWRITEBYTECODE 1 -ENV BUILD_ENV ${BUILD_ENVIRONMENT} +ENV PYTHONUNBUFFERED=1 +ENV PYTHONDONTWRITEBYTECODE=1 +ENV BUILD_ENV=${BUILD_ENVIRONMENT} WORKDIR ${APP_HOME} diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 54e209886..cdc002fe0 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -5,7 +5,7 @@ FROM docker.io/python:3.12.4-slim-bookworm AS python # Python build stage FROM python AS python-build-stage -ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONDONTWRITEBYTECODE=1 RUN apt-get update && apt-get install --no-install-recommends -y \ # dependencies for building Python packages @@ -29,8 +29,8 @@ RUN pip wheel --no-cache-dir --wheel-dir /usr/src/app/wheels \ FROM python AS python-run-stage ARG BUILD_ENVIRONMENT -ENV PYTHONUNBUFFERED 1 -ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED=1 +ENV PYTHONDONTWRITEBYTECODE=1 RUN apt-get update && apt-get install --no-install-recommends -y \ # To run the Makefile diff --git a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile index 0848ecaf8..438e3fa08 100644 --- a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile @@ -6,4 +6,4 @@ COPY ./package.json /app RUN npm install && npm cache clean --force -ENV PATH ./node_modules/.bin/:$PATH +ENV PATH=./node_modules/.bin/:$PATH diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index ee3b9994a..6279908a9 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -53,9 +53,9 @@ FROM python AS python-run-stage ARG BUILD_ENVIRONMENT=production ARG APP_HOME=/app -ENV PYTHONUNBUFFERED 1 -ENV PYTHONDONTWRITEBYTECODE 1 -ENV BUILD_ENV ${BUILD_ENVIRONMENT} +ENV PYTHONUNBUFFERED=1 +ENV PYTHONDONTWRITEBYTECODE=1 +ENV BUILD_ENV=${BUILD_ENVIRONMENT} WORKDIR ${APP_HOME} From ab081ee4715f68316721056b314cdde3991d3eab Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 19 Jul 2024 04:55:50 -0700 Subject: [PATCH 05/54] Update django-upgrade to 1.20.0 (#5227) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f0e7f7b9b..ca98dce69 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ ruff==0.5.3 -django-upgrade==1.19.0 +django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.7.1 From 88da1f44136b332f472bce681d3b53ef8a06ebd0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 20 Jul 2024 02:17:34 +0000 Subject: [PATCH 06/54] Release 2024.07.19 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 843244210..0fa376e15 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.19 + + +### Changed + +- Use "ENV key=value" instead of "ENV key value" in Dockerfiles ([#5225](https://github.com/cookiecutter/cookiecutter-django/pull/5225)) + +### Updated + +- Update django-upgrade to 1.20.0 ([#5227](https://github.com/cookiecutter/cookiecutter-django/pull/5227)) + +- Update ruff to 0.5.3 ([#5224](https://github.com/cookiecutter/cookiecutter-django/pull/5224)) + ## 2024.07.18 diff --git a/setup.py b/setup.py index edeeadfbd..1cf1166e7 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.18" +version = "2024.07.19" with open("README.md") as readme_file: long_description = readme_file.read() From 1b88b699c97a5f35755d5d75a95f3e9098e04c37 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 10:37:43 +0100 Subject: [PATCH 07/54] Update django-upgrade pre-commit hooks (#5232) --- {{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 0c79e7234..07577c0b2 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/adamchainz/django-upgrade - rev: '1.19.0' + rev: '1.20.0' hooks: - id: django-upgrade args: ['--target-version', '4.2'] From 4d74cd9730a4aa487d0a09d10573175def3f5924 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 20 Jul 2024 02:41:47 -0700 Subject: [PATCH 08/54] Update django-crispy-forms to 2.3 (#5229) --- {{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 65b49facc..6dd2ed8a1 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -33,7 +33,7 @@ django==4.2.14 # pyup: < 5.0 # 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-crispy-forms==2.2 # https://github.com/django-crispy-forms/django-crispy-forms +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 From a5f0967eeca8b111dd96d6abbdb4aac9bffaa135 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 20 Jul 2024 10:47:06 +0100 Subject: [PATCH 09/54] Update Heroku runtime to Python 3.12.4 --- {{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 4ddc7cd66..74d315a82 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.12.3 +python-3.12.4 From b5d7460ae12895ae04d2bc095b2644cd72ec3256 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 20 Jul 2024 07:46:39 -0700 Subject: [PATCH 10/54] Update uvicorn from 0.30.1 to 0.30.3 (#5234) --- {{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 6dd2ed8a1..e4e191e40 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.1 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.3 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From e4a2a46c686eebdc7e7f286495abb930b6a21bca Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 20 Jul 2024 07:47:04 -0700 Subject: [PATCH 11/54] Update hiredis to 3.0.0 (#5228) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e4e191e40..0717745a7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -13,7 +13,7 @@ whitenoise==6.7.0 # https://github.com/evansd/whitenoise {%- endif %} redis==5.0.7 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} -hiredis==2.3.2 # https://github.com/redis/hiredis-py +hiredis==3.0.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.4.0 # pyup: < 6.0 # https://github.com/celery/celery diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 5fa14841c..3cda1be50 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta sentry-sdk==2.10.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} -hiredis==2.3.2 # https://github.com/redis/hiredis-py +hiredis==3.0.0 # https://github.com/redis/hiredis-py {%- endif %} # Django From e6bd8d1a2a42832a4212a58e07a3dd23ffe00b53 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 21 Jul 2024 02:20:10 +0000 Subject: [PATCH 12/54] 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 13/54] 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 14/54] 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 15/54] 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 16/54] 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 17/54] 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 18/54] 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 19/54] 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 20/54] 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 21/54] 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 22/54] 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 23/54] 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 24/54] 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 25/54] 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 26/54] 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 27/54] 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 28/54] 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 29/54] 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 30/54] 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 31/54] 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 32/54] 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 33/54] 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 34/54] 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 35/54] 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 36/54] 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 37/54] 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 38/54] 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 39/54] 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 40/54] 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 41/54] 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 42/54] 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 43/54] 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 44/54] 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 45/54] 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 46/54] 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 47/54] 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 48/54] 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 49/54] 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 50/54] 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 51/54] 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 52/54] 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 53/54] 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 54/54] 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