From 1840ed7b395c482a792c1f5f60ac2da6d26441c6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 13 Mar 2023 03:21:15 -0500 Subject: [PATCH 01/59] Update tox to 4.4.7 (#4207) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5a65d6160..b2e7cedb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.1.1 # Testing # ------------------------------------------------------------------------------ -tox==4.4.6 +tox==4.4.7 pytest==7.2.2 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From d588f71dff05538fca4b4ac9a195cffe2dfc4a70 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 13 Mar 2023 03:21:59 -0500 Subject: [PATCH 02/59] Update django-anymail to 9.1 (#4206) --- .../requirements/production.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 3d725fae7..c79f98431 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,21 +24,21 @@ django-storages[google]==1.13.2 # https://github.com/jschneier/django-storages django-storages[azure]==1.13.2 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==9.0 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==9.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==9.0 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==9.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==9.0 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==9.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==9.0 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==9.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==9.0 # https://github.com/anymail/django-anymail +django-anymail[postmark]==9.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==9.0 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==9.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==9.0 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==9.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==9.0 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==9.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==9.0 # https://github.com/anymail/django-anymail +django-anymail==9.1 # https://github.com/anymail/django-anymail {%- endif %} From ef73440c223b9459f8c59bf910c13ef741a58aa2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 13 Mar 2023 03:23:58 -0500 Subject: [PATCH 03/59] Update uvicorn to 0.21.0 (#4203) --- {{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 1550be1bb..f8ef0f150 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.20.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.21.0 # https://github.com/encode/uvicorn {%- endif %} # Django From fe947fabfbd4f767ef74e34e42a6e3c256523c7b Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 14 Mar 2023 02:17:49 +0000 Subject: [PATCH 04/59] Release 2023.03.13 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00daff8e2..b938ecc05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.13 + +### Updated +- Update uvicorn to 0.21.0 ([#4203](https://github.com/cookiecutter/cookiecutter-django/pull/4203)) +- Update django-anymail to 9.1 ([#4206](https://github.com/cookiecutter/cookiecutter-django/pull/4206)) +- Update tox to 4.4.7 ([#4207](https://github.com/cookiecutter/cookiecutter-django/pull/4207)) + ## 2023.03.09 ### Fixed diff --git a/setup.py b/setup.py index e6f1f0b65..cf45c28eb 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.09" +version = "2023.03.13" with open("README.rst") as readme_file: long_description = readme_file.read() From f08c81eb2ce23d9a79a619ae08d372782d44473e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 14 Mar 2023 08:22:37 -0500 Subject: [PATCH 05/59] Update django-celery-beat from 2.4.0 to 2.5.0 (#4208) --- {{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 f8ef0f150..e94221728 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -18,7 +18,7 @@ hiredis==2.2.2 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery -django-celery-beat==2.4.0 # https://github.com/celery/django-celery-beat +django-celery-beat==2.5.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==1.2.0 # https://github.com/mher/flower {%- endif %} From 6e078fad858d9095bce2f50fb69c7810dceb4c6d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 15 Mar 2023 02:23:03 +0000 Subject: [PATCH 06/59] Release 2023.03.14 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b938ecc05..8457fa646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.14 + +### Updated +- Update django-celery-beat to 2.5.0 ([#4208](https://github.com/cookiecutter/cookiecutter-django/pull/4208)) + ## 2023.03.13 ### Updated diff --git a/setup.py b/setup.py index cf45c28eb..762673d9a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.13" +version = "2023.03.14" with open("README.rst") as readme_file: long_description = readme_file.read() From c56088406c4c928e8e8c9f9e3b923000c5e7b4f9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 16 Mar 2023 08:30:32 -0500 Subject: [PATCH 07/59] Update django-allauth from 0.52.0 to 0.53.0 (#4210) --- {{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 e94221728..ff85377e5 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.21.0 # https://github.com/encode/uvicorn django==4.0.10 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.52.0 # https://github.com/pennersr/django-allauth +django-allauth==0.53.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 5cd58ce160c8348c73acca5b05d75b68c3f6c369 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 16 Mar 2023 10:37:33 -0500 Subject: [PATCH 08/59] Update uvicorn to 0.21.1 (#4211) --- {{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 ff85377e5..2fff9561f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.21.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.21.1 # https://github.com/encode/uvicorn {%- endif %} # Django From d90f16b6479327f6e4acd7695acec29ac241b2f1 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 16 Mar 2023 16:05:02 +0000 Subject: [PATCH 09/59] Pin base Python Docker images to bugfix (#4194) * Pin base Python Docker images to bugfix Fix #1810 * Skip major & minor versions of Docker images in Dependabot * Remove argument for docs Docker image * Update Dependabot config of generated project --- .github/dependabot.yml | 9 +++++ .../.github/dependabot.yml | 40 +++++++++++-------- .../compose/local/django/Dockerfile | 4 +- .../compose/local/docs/Dockerfile | 4 +- .../compose/production/django/Dockerfile | 4 +- 5 files changed, 35 insertions(+), 26 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d95192f33..d308ff96a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -27,6 +27,9 @@ updates: directory: "{{cookiecutter.project_slug}}/compose/local/django/" schedule: interval: "daily" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] labels: - "update" @@ -34,6 +37,9 @@ updates: directory: "{{cookiecutter.project_slug}}/compose/local/docs/" schedule: interval: "daily" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] labels: - "update" @@ -55,6 +61,9 @@ updates: directory: "{{cookiecutter.project_slug}}/compose/production/django/" schedule: interval: "daily" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] labels: - "update" diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml index 420a63cdc..3f4eefe94 100644 --- a/{{cookiecutter.project_slug}}/.github/dependabot.yml +++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml @@ -6,7 +6,7 @@ updates: # Update GitHub actions in workflows - package-ecosystem: "github-actions" directory: "/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" @@ -19,55 +19,61 @@ updates: - package-ecosystem: "docker" # Look for a `Dockerfile` in the `compose/local/django` directory directory: "compose/local/django/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" + # Ignore minor version updates (3.10 -> 3.11) but update patch versions + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] - # Enable version updates for Docker - package-ecosystem: "docker" # Look for a `Dockerfile` in the `compose/local/docs` directory directory: "compose/local/docs/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" + # Ignore minor version updates (3.10 -> 3.11) but update patch versions + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] - # Enable version updates for Docker - package-ecosystem: "docker" # Look for a `Dockerfile` in the `compose/local/node` directory directory: "compose/local/node/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" - # Enable version updates for Docker - package-ecosystem: "docker" # Look for a `Dockerfile` in the `compose/production/aws` directory directory: "compose/production/aws/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" - # Enable version updates for Docker - package-ecosystem: "docker" # Look for a `Dockerfile` in the `compose/production/django` directory directory: "compose/production/django/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" + # Ignore minor version updates (3.10 -> 3.11) but update patch versions + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major", "version-update:semver-minor"] - # Enable version updates for Docker - package-ecosystem: "docker" # Look for a `Dockerfile` in the `compose/production/postgres` directory directory: "compose/production/postgres/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" - # Enable version updates for Docker - package-ecosystem: "docker" # Look for a `Dockerfile` in the `compose/production/traefik` directory directory: "compose/production/traefik/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" @@ -78,7 +84,7 @@ updates: # Look for a `requirements.txt` in the `root` directory # also 'setup.cfg', 'runtime.txt' and 'requirements/*.txt' directory: "/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" @@ -86,9 +92,9 @@ updates: # Enable version updates for javascript/npm - package-ecosystem: "npm" - # Look for a `packages.json' in the `root` directory + # Look for a `packages.json` in the `root` directory directory: "/" - # Check for updates to GitHub Actions every weekday + # Every weekday schedule: interval: "daily" diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 3ea6b2d4c..36659d31d 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,7 +1,5 @@ -ARG PYTHON_VERSION=3.10-slim-bullseye - # define an alias for the specfic python version used in this file. -FROM python:${PYTHON_VERSION} as python +FROM python:3.10.9-slim-bullseye as python # Python build stage FROM python as python-build-stage diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index c45d18c95..f52e34d26 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,7 +1,5 @@ -ARG PYTHON_VERSION=3.10-slim-bullseye - # define an alias for the specfic python version used in this file. -FROM python:${PYTHON_VERSION} as python +FROM python:3.10.9-slim-bullseye as python # Python build stage diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index ef80441ba..ac4ca7714 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -1,5 +1,3 @@ -ARG PYTHON_VERSION=3.10-slim-bullseye - {% if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] -%} FROM node:16-bullseye-slim as client-builder @@ -28,7 +26,7 @@ RUN npm run build {%- endif %} # define an alias for the specfic python version used in this file. -FROM python:${PYTHON_VERSION} as python +FROM python:3.10.9-slim-bullseye as python # Python build stage FROM python as python-build-stage From 6554049a8751f8c541f358d7ec8ea9c7612112a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 16:35:28 +0000 Subject: [PATCH 10/59] Bump Docker python image from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye for local Django service (#4212) Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye. --- 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 36659d31d..4be394f72 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 specfic python version used in this file. -FROM python:3.10.9-slim-bullseye as python +FROM python:3.10.10-slim-bullseye as python # Python build stage FROM python as python-build-stage From 96950f2191094edb890ca5f02f97d191d895636e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 16:35:57 +0000 Subject: [PATCH 11/59] Bump Docker python image from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye for docs (#4213) Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye. --- 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 f52e34d26..587b8d3ae 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 specfic python version used in this file. -FROM python:3.10.9-slim-bullseye as python +FROM python:3.10.10-slim-bullseye as python # Python build stage From 160510132187e2fd269bca4c798671fff30da456 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 17:13:53 +0000 Subject: [PATCH 12/59] Bump Docker python image from 3.10.9 to 3.10.10 on production Django (#4214) Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye. --- 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 ac4ca7714..8ca35f180 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -26,7 +26,7 @@ RUN npm run build {%- endif %} # define an alias for the specfic python version used in this file. -FROM python:3.10.9-slim-bullseye as python +FROM python:3.10.10-slim-bullseye as python # Python build stage FROM python as python-build-stage From 73628a5f48193435480b07f1acc99eaab7ec1595 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 16 Mar 2023 12:15:46 -0500 Subject: [PATCH 13/59] Update sentry-sdk to 1.17.0 (#4215) --- {{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 c79f98431..2104d9ad4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.16.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.17.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py From 9ac1abe194dd2080f80b104f70e5e89d34eaf313 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 16 Mar 2023 12:16:04 -0500 Subject: [PATCH 14/59] Update coverage to 7.2.2 (#4218) --- {{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 218cdcaad..b160eed22 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.2.1 # https://github.com/nedbat/coveragepy +coverage==7.2.2 # https://github.com/nedbat/coveragepy black==23.1.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From dcea8f1e7bde5e1faf6bd788f0141c53c2dffcd9 Mon Sep 17 00:00:00 2001 From: Hoai-Thu Vuong Date: Fri, 17 Mar 2023 00:17:02 +0700 Subject: [PATCH 15/59] Trim leading and trailing space in `domain_name` and `email` (#4163) * remove trailing space in domain_name and email * Add test for leading and trailing spaces removals * Move magic string and add a comment explaining its role --------- Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- cookiecutter.json | 2 +- hooks/pre_gen_project.py | 8 ++++++++ tests/test_cookiecutter_generation.py | 21 ++++++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/cookiecutter.json b/cookiecutter.json index cf4da9a45..b24ce4286 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -4,7 +4,7 @@ "description": "Behold My Awesome Project!", "author_name": "Daniel Roy Greenfeld", "domain_name": "example.com", - "email": "{{ cookiecutter.author_name.lower()|replace(' ', '-') }}@example.com", + "email": "{{ cookiecutter.author_name.lower() | trim() |replace(' ', '-') }}@{{ cookiecutter.domain_name.lower() | trim() }}", "version": "0.1.0", "open_source_license": [ "MIT", diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index c3eef1e43..4f4378f58 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -17,6 +17,14 @@ INFO = "\x1b[1;33m [INFO]: " HINT = "\x1b[3;33m" SUCCESS = "\x1b[1;32m [SUCCESS]: " +# The content of this string is evaluated by Jinja, and plays an important role. +# It updates the cookiecutter context to trim leading and trailing spaces +# from domain/email values +""" +{{ cookiecutter.update({ "domain_name": cookiecutter.domain_name | trim }) }} +{{ cookiecutter.update({ "email": cookiecutter.email | trim }) }} +""" + project_slug = "{{ cookiecutter.project_slug }}" if hasattr(project_slug, "isidentifier"): assert ( diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 7628e5e1d..eb6c4710f 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -319,10 +319,29 @@ def test_error_if_incompatible(cookies, context, invalid_context): ], ) def test_pycharm_docs_removed(cookies, context, use_pycharm, pycharm_docs_exist): - """.""" context.update({"use_pycharm": use_pycharm}) result = cookies.bake(extra_context=context) with open(f"{result.project_path}/docs/index.rst") as f: has_pycharm_docs = "pycharm/configuration" in f.read() assert has_pycharm_docs is pycharm_docs_exist + + +def test_trim_domain_email(cookies, context): + """Check that leading and trailing spaces are trimmed in domain and email.""" + context.update( + { + "use_docker": "y", + "domain_name": " example.com ", + "email": " me@example.com ", + } + ) + result = cookies.bake(extra_context=context) + + assert result.exit_code == 0 + + prod_django_env = result.project_path / ".envs" / ".production" / ".django" + assert "DJANGO_ALLOWED_HOSTS=.example.com" in prod_django_env.read_text() + + base_settings = result.project_path / "config" / "settings" / "base.py" + assert '"me@example.com"' in base_settings.read_text() From d4a3887e2d1565e7e48608d4ef3443cccf470eeb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 16 Mar 2023 12:29:41 -0500 Subject: [PATCH 16/59] Update django-stubs to 1.16.0 (#4216) --- {{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 b160eed22..c81d4ee07 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.1.1 # https://github.com/python/mypy -django-stubs==1.15.0 # https://github.com/typeddjango/django-stubs +django-stubs==1.16.0 # https://github.com/typeddjango/django-stubs pytest==7.2.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 52b1a59b7f4257dae387c01a3126d2506472066a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 16 Mar 2023 12:30:17 -0500 Subject: [PATCH 17/59] Update djangorestframework-stubs to 1.10.0 (#4217) --- {{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 c81d4ee07..1760bdcfe 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs==1.16.0 # https://github.com/typeddjango/django-stubs pytest==7.2.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs==1.9.1 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==1.10.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From d53a51c9b3d37a90a931b1faa1ab152c91ba2a57 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 17 Mar 2023 02:21:28 +0000 Subject: [PATCH 18/59] Release 2023.03.16 --- CHANGELOG.md | 17 +++++++++++++++++ setup.py | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8457fa646..061dd01c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.16 + +### Changed +- Pin base Python Docker images to bugfix ([#4194](https://github.com/cookiecutter/cookiecutter-django/pull/4194)) +### Fixed +- Trim leading and trailing space in `domain_name` and `email` ([#4163](https://github.com/cookiecutter/cookiecutter-django/pull/4163)) +### Updated +- Update djangorestframework-stubs to 1.10.0 ([#4217](https://github.com/cookiecutter/cookiecutter-django/pull/4217)) +- Update django-stubs to 1.16.0 ([#4216](https://github.com/cookiecutter/cookiecutter-django/pull/4216)) +- Update coverage to 7.2.2 ([#4218](https://github.com/cookiecutter/cookiecutter-django/pull/4218)) +- Update sentry-sdk to 1.17.0 ([#4215](https://github.com/cookiecutter/cookiecutter-django/pull/4215)) +- Bump Docker python image from 3.10.9 to 3.10.10 on production Django ([#4214](https://github.com/cookiecutter/cookiecutter-django/pull/4214)) +- Bump Docker python image from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye for docs ([#4213](https://github.com/cookiecutter/cookiecutter-django/pull/4213)) +- Bump Docker python image from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye for local Django service ([#4212](https://github.com/cookiecutter/cookiecutter-django/pull/4212)) +- Update uvicorn to 0.21.1 ([#4211](https://github.com/cookiecutter/cookiecutter-django/pull/4211)) +- Update django-allauth to 0.53.0 ([#4210](https://github.com/cookiecutter/cookiecutter-django/pull/4210)) + ## 2023.03.14 ### Updated diff --git a/setup.py b/setup.py index 762673d9a..bb49aa4b4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.14" +version = "2023.03.16" with open("README.rst") as readme_file: long_description = readme_file.read() From d78fe734da8f8721593d215a9e2b378c737e062b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 18 Mar 2023 05:37:38 -0500 Subject: [PATCH 19/59] Update pre-commit to 3.2.0 (#4219) * Update pre-commit from 3.1.1 to 3.2.0 * Update pre-commit from 3.1.1 to 3.2.0 --- 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 b2e7cedb4..a20ddaa56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.1.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==3.1.1 +pre-commit==3.2.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 1760bdcfe..65cbfc8c0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,7 +36,7 @@ pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==3.1.1 # https://github.com/pre-commit/pre-commit +pre-commit==3.2.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From b32f579ad82ce905ebfd68f6f674f4364b667e8c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 18 Mar 2023 05:46:31 -0500 Subject: [PATCH 20/59] Update pygithub from 1.58.0 to 1.58.1 (#4220) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a20ddaa56..466975b66 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.58.0 +PyGithub==1.58.1 gitpython==3.1.31 jinja2==3.1.2 requests==2.28.2 From b159194897f75fa2fa062169ad252e7215cedb3d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 18 Mar 2023 17:36:31 -0500 Subject: [PATCH 21/59] Update drf-spectacular from 0.26.0 to 0.26.1 (#4221) --- {{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 2fff9561f..0b29caa89 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -44,7 +44,7 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework django-cors-headers==3.14.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation -drf-spectacular==0.26.0 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.26.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} {%- if cookiecutter.frontend_pipeline == 'Webpack' %} django-webpack-loader==1.8.1 # https://github.com/django-webpack/django-webpack-loader From 641ffb5bd427eab89bfcfda7de51c777a46f7628 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 19 Mar 2023 02:29:01 +0000 Subject: [PATCH 22/59] Release 2023.03.18 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 061dd01c4..8aea65acb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.18 + +### Updated +- Update drf-spectacular to 0.26.1 ([#4221](https://github.com/cookiecutter/cookiecutter-django/pull/4221)) +- Update pygithub to 1.58.1 ([#4220](https://github.com/cookiecutter/cookiecutter-django/pull/4220)) +- Update pre-commit to 3.2.0 ([#4219](https://github.com/cookiecutter/cookiecutter-django/pull/4219)) + ## 2023.03.16 ### Changed diff --git a/setup.py b/setup.py index bb49aa4b4..c4e337020 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.16" +version = "2023.03.18" with open("README.rst") as readme_file: long_description = readme_file.read() From 93165c4859fa99072e49878316c29c8aa208086b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 20 Mar 2023 07:11:01 -0500 Subject: [PATCH 23/59] Update redis to 4.5.2 (#4222) --- {{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 0b29caa89..d093c48d2 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.4.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.5.1 # https://github.com/redis/redis-py +redis==4.5.2 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py {%- endif %} From 95ec685983876611828c577bead28eb09b73e70a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 20 Mar 2023 07:11:18 -0500 Subject: [PATCH 24/59] Update django-allauth to 0.53.1 (#4223) --- {{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 d093c48d2..bb25c87e7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.21.1 # https://github.com/encode/uvicorn django==4.0.10 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.53.0 # https://github.com/pennersr/django-allauth +django-allauth==0.53.1 # https://github.com/pennersr/django-allauth django-crispy-forms==2.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 386330de0e3752884691a1ff23aa76e02aa70581 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 20 Mar 2023 16:46:33 -0500 Subject: [PATCH 25/59] Update sh from 2.0.2 to 2.0.3 (#4224) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 466975b66..85012dcb0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==2.1.1 -sh==2.0.2; sys_platform != "win32" +sh==2.0.3; sys_platform != "win32" binaryornot==0.4.4 # Code quality From ba0a6afa8156bd0dd62dcb167860f7f764f2c36b Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 21 Mar 2023 02:17:59 +0000 Subject: [PATCH 26/59] Release 2023.03.20 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aea65acb..123471e1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.20 + +### Updated +- Update django-allauth to 0.53.1 ([#4223](https://github.com/cookiecutter/cookiecutter-django/pull/4223)) +- Update redis to 4.5.2 ([#4222](https://github.com/cookiecutter/cookiecutter-django/pull/4222)) + ## 2023.03.18 ### Updated diff --git a/setup.py b/setup.py index c4e337020..43b269032 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.18" +version = "2023.03.20" with open("README.rst") as readme_file: long_description = readme_file.read() From 8eb30dfae3ece511df113515979132217f4944a6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 22 Mar 2023 15:33:08 -0500 Subject: [PATCH 27/59] Update pytest-cookies from 0.6.1 to 0.7.0 (#4226) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 85012dcb0..672d40b02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pre-commit==3.2.0 # ------------------------------------------------------------------------------ tox==4.4.7 pytest==7.2.2 -pytest-cookies==0.6.1 +pytest-cookies==0.7.0 pytest-instafail==0.4.2 pyyaml==6.0 From 3533b4dd93fae6068438d72119eb4bc0839229d1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 22 Mar 2023 15:34:03 -0500 Subject: [PATCH 28/59] Update redis from 4.5.2 to 4.5.3 (#4227) --- {{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 bb25c87e7..911b44b3f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.4.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.5.2 # https://github.com/redis/redis-py +redis==4.5.3 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py {%- endif %} From 9c23bb0194581c2dbd0a4d581a5bdf22640bc627 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 23 Mar 2023 02:18:47 +0000 Subject: [PATCH 29/59] Release 2023.03.22 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 123471e1f..6563022af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.22 + +### Updated +- Update redis to 4.5.3 ([#4227](https://github.com/cookiecutter/cookiecutter-django/pull/4227)) + ## 2023.03.20 ### Updated diff --git a/setup.py b/setup.py index 43b269032..fe04abc05 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.20" +version = "2023.03.22" with open("README.rst") as readme_file: long_description = readme_file.read() From 68133e83547a24f3460846c43ec07f38f0b52469 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 17:15:43 +0000 Subject: [PATCH 30/59] Bump traefik from 2.9.8 to 2.9.9 (#4225) Bumps traefik from 2.9.8 to 2.9.9. --- updated-dependencies: - dependency-name: traefik 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/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 2365c4c49..2b146cc63 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM traefik:2.9.8 +FROM traefik:2.9.9 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From c2b7e65d81f72fc3d3492a43e6348d1f9ca949e3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 24 Mar 2023 02:19:52 +0000 Subject: [PATCH 31/59] Release 2023.03.23 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6563022af..07fa9122a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.23 + +### Updated +- Bump traefik from 2.9.8 to 2.9.9 ([#4225](https://github.com/cookiecutter/cookiecutter-django/pull/4225)) + ## 2023.03.22 ### Updated diff --git a/setup.py b/setup.py index fe04abc05..8ec8f4281 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.22" +version = "2023.03.23" with open("README.rst") as readme_file: long_description = readme_file.read() From ad9ea8823293467aa67b1770b65844a53fbf36a9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Mar 2023 09:58:44 -0500 Subject: [PATCH 32/59] Update pytz from 2022.7.1 to 2023.2 (#4228) --- {{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 911b44b3f..463008e09 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.7.1 # https://github.com/stub42/pytz +pytz==2023.2 # https://github.com/stub42/pytz python-slugify==8.0.1 # https://github.com/un33k/python-slugify Pillow==9.4.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 2517d037ded11082207085952d7d2cd7165759e5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 26 Mar 2023 02:22:45 +0000 Subject: [PATCH 33/59] Release 2023.03.25 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07fa9122a..91b07b4e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.25 + +### Updated +- Update pytz to 2023.2 ([#4228](https://github.com/cookiecutter/cookiecutter-django/pull/4228)) + ## 2023.03.23 ### Updated diff --git a/setup.py b/setup.py index 8ec8f4281..503028691 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.23" +version = "2023.03.25" with open("README.rst") as readme_file: long_description = readme_file.read() From 8156efd583a1daef98f098db6a8946fef8d1894f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 26 Mar 2023 12:44:19 -0500 Subject: [PATCH 34/59] Update pre-commit to 3.2.1 (#4229) * Update pre-commit from 3.2.0 to 3.2.1 * Update pre-commit from 3.2.0 to 3.2.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 672d40b02..658f39cb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.1.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==3.2.0 +pre-commit==3.2.1 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 65cbfc8c0..5baf9111d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,7 +36,7 @@ pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==3.2.0 # https://github.com/pre-commit/pre-commit +pre-commit==3.2.1 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 3ca2c87a17b62428190a9076d9bf8c71524eecd2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 26 Mar 2023 17:55:44 -0500 Subject: [PATCH 35/59] Update tox from 4.4.7 to 4.4.8 (#4231) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 658f39cb1..c4ab1014e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.2.1 # Testing # ------------------------------------------------------------------------------ -tox==4.4.7 +tox==4.4.8 pytest==7.2.2 pytest-cookies==0.7.0 pytest-instafail==0.4.2 From b1d06f32a06b8317fa392206308d96712c2d561c Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 27 Mar 2023 02:19:11 +0000 Subject: [PATCH 36/59] Release 2023.03.26 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91b07b4e1..92bc1b70f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.26 + +### Updated +- Update pre-commit to 3.2.1 ([#4229](https://github.com/cookiecutter/cookiecutter-django/pull/4229)) + ## 2023.03.25 ### Updated diff --git a/setup.py b/setup.py index 503028691..b3312a217 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.25" +version = "2023.03.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 6475dffbd8bae9ac4774139955ca33caa2cc8fd2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 27 Mar 2023 18:00:22 -0500 Subject: [PATCH 37/59] Update watchfiles from 0.18.1 to 0.19.0 (#4232) --- {{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 5baf9111d..a9de59141 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 psycopg2-binary==2.9.5 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From 53029732824ea9e411e7a9ae4fe9fe0b8446ae64 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 28 Mar 2023 02:20:35 +0000 Subject: [PATCH 38/59] Release 2023.03.27 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92bc1b70f..4767aa20e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.27 + +### Updated +- Update watchfiles to 0.19.0 ([#4232](https://github.com/cookiecutter/cookiecutter-django/pull/4232)) + ## 2023.03.26 ### Updated diff --git a/setup.py b/setup.py index b3312a217..66349a791 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.26" +version = "2023.03.27" with open("README.rst") as readme_file: long_description = readme_file.read() From d77b33df434dcda80735a128b6ed6ccdf1a05e0b Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 28 Mar 2023 23:38:48 +0100 Subject: [PATCH 39/59] Update code of conduct link --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 8a5fc4158..a7b21223b 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,3 @@ ## Code of Conduct -Everyone who interacts in the Cookiecutter project's codebase, issue trackers, chat rooms, and mailing lists is expected to follow the [PyPA Code of Conduct](https://www.pypa.io/en/latest/code-of-conduct/). +Everyone who interacts in the Cookiecutter project's codebase, issue trackers, chat rooms, and mailing lists is expected to follow the [PSF Code of Conduct](https://www.python.org/psf/conduct/) From 43c32961e5bf794765379f0d9f5c5e2b968b5625 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 29 Mar 2023 10:53:29 -0500 Subject: [PATCH 40/59] Update black to 23.3.0 (#4236) * Update black from 23.1.0 to 23.3.0 * Update black from 23.1.0 to 23.3.0 --- 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 c4ab1014e..4b45e7f81 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==23.1.0 +black==23.3.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index a9de59141..0b3a39d97 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort coverage==7.2.2 # https://github.com/nedbat/coveragepy -black==23.1.0 # https://github.com/psf/black +black==23.3.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery From fffc2a2fa60e38a25fd646436b60c737fe921d27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 16:53:39 +0100 Subject: [PATCH 41/59] Auto-update pre-commit hooks (#4235) Co-authored-by: browniebroke --- .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 438de52b4..2dc0f81cb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: exclude: hooks/ - repo: https://github.com/psf/black - rev: 23.1.0 + rev: 23.3.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index a8cdb1357..073df732e 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: args: [--py310-plus] - repo: https://github.com/psf/black - rev: 23.1.0 + rev: 23.3.0 hooks: - id: black From 4ed32dde32ffa0f08a246fdc27b35317623ff21e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 29 Mar 2023 10:54:44 -0500 Subject: [PATCH 42/59] Update pytz to 2023.3 (#4238) --- {{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 463008e09..d040f45d7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2023.2 # https://github.com/stub42/pytz +pytz==2023.3 # https://github.com/stub42/pytz python-slugify==8.0.1 # https://github.com/un33k/python-slugify Pillow==9.4.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 694a29794ddc2d11aba5fdf98943eac8a926b18a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 29 Mar 2023 12:30:37 -0500 Subject: [PATCH 43/59] Update redis to 4.5.4 (#4239) --- {{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 d040f45d7..1a3766e6e 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.4.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.5.3 # https://github.com/redis/redis-py +redis==4.5.4 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py {%- endif %} From 6c702a50de2fec1e069f8405c27b2ad5da76c65a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 30 Mar 2023 02:21:03 +0000 Subject: [PATCH 44/59] Release 2023.03.29 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4767aa20e..c339a19b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.03.29 + +### Updated +- Update redis to 4.5.4 ([#4239](https://github.com/cookiecutter/cookiecutter-django/pull/4239)) +- Update pytz to 2023.3 ([#4238](https://github.com/cookiecutter/cookiecutter-django/pull/4238)) +- Update black to 23.3.0 ([#4236](https://github.com/cookiecutter/cookiecutter-django/pull/4236)) + ## 2023.03.27 ### Updated diff --git a/setup.py b/setup.py index 66349a791..695baf8bc 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.27" +version = "2023.03.29" with open("README.rst") as readme_file: long_description = readme_file.read() From 58de1db4a0c716106e44e247f5a8502d5dde7189 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 1 Apr 2023 06:32:09 -0500 Subject: [PATCH 45/59] Update django-allauth from 0.53.1 to 0.54.0 (#4241) --- {{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 1a3766e6e..392b49abf 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.21.1 # https://github.com/encode/uvicorn django==4.0.10 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.53.1 # https://github.com/pennersr/django-allauth +django-allauth==0.54.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 28f05920cf407c63e7361d1ffb5c0d7ccf31b0f8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 1 Apr 2023 06:32:20 -0500 Subject: [PATCH 46/59] Update pillow from 9.4.0 to 9.5.0 (#4242) --- {{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 392b49abf..fb3559194 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2023.3 # https://github.com/stub42/pytz python-slugify==8.0.1 # https://github.com/un33k/python-slugify -Pillow==9.4.0 # https://github.com/python-pillow/Pillow +Pillow==9.5.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.1.0 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From cf7f919d422fb910fb3cdfba2bd38b25812b5607 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 1 Apr 2023 06:32:32 -0500 Subject: [PATCH 47/59] Update pytest-instafail from 0.4.2 to 0.5.0 (#4240) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4b45e7f81..d635f79a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ pre-commit==3.2.1 tox==4.4.8 pytest==7.2.2 pytest-cookies==0.7.0 -pytest-instafail==0.4.2 +pytest-instafail==0.5.0 pyyaml==6.0 # Scripting From 9642181b28ef2c9d778e6f1361336f5a16d4cdfb Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 2 Apr 2023 02:18:05 +0000 Subject: [PATCH 48/59] Release 2023.04.01 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c339a19b5..2008354ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.01 + +### Updated +- Update pytest-instafail to 0.5.0 ([#4240](https://github.com/cookiecutter/cookiecutter-django/pull/4240)) +- Update pillow to 9.5.0 ([#4242](https://github.com/cookiecutter/cookiecutter-django/pull/4242)) +- Update django-allauth to 0.54.0 ([#4241](https://github.com/cookiecutter/cookiecutter-django/pull/4241)) + ## 2023.03.29 ### Updated diff --git a/setup.py b/setup.py index 695baf8bc..52ec07456 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.03.29" +version = "2023.04.01" with open("README.rst") as readme_file: long_description = readme_file.read() From 3db64512c81a7d045e4b89fb6076c50afd7d9ee7 Mon Sep 17 00:00:00 2001 From: Adin Hodovic Date: Mon, 3 Apr 2023 15:34:45 +0200 Subject: [PATCH 49/59] fix: Syntax for ignoring specific errors (#4250) Noticed when started using pygrep-hooks. Syntax is noqa: code with a colon. --- .../config/settings/local.py | 10 +++++----- .../config/settings/production.py | 14 ++++++++------ .../config/settings/test.py | 4 ++-- .../{{cookiecutter.project_slug}}/users/apps.py | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index 7220c5e4c..09d3bb9fa 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -47,15 +47,15 @@ EMAIL_BACKEND = env( # WhiteNoise # ------------------------------------------------------------------------------ # http://whitenoise.evans.io/en/latest/django.html#using-whitenoise-in-development -INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS # noqa F405 +INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS # noqa: F405 {% endif %} # django-debug-toolbar # ------------------------------------------------------------------------------ # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#prerequisites -INSTALLED_APPS += ["debug_toolbar"] # noqa F405 +INSTALLED_APPS += ["debug_toolbar"] # noqa: F405 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#middleware -MIDDLEWARE += ["debug_toolbar.middleware.DebugToolbarMiddleware"] # noqa F405 +MIDDLEWARE += ["debug_toolbar.middleware.DebugToolbarMiddleware"] # noqa: F405 # https://django-debug-toolbar.readthedocs.io/en/latest/configuration.html#debug-toolbar-config DEBUG_TOOLBAR_CONFIG = { "DISABLE_PANELS": ["debug_toolbar.panels.redirects.RedirectsPanel"], @@ -82,7 +82,7 @@ if env("USE_DOCKER") == "yes": # django-extensions # ------------------------------------------------------------------------------ # https://django-extensions.readthedocs.io/en/latest/installation_instructions.html#configuration -INSTALLED_APPS += ["django_extensions"] # noqa F405 +INSTALLED_APPS += ["django_extensions"] # noqa: F405 {% if cookiecutter.use_celery == 'y' -%} # Celery @@ -98,7 +98,7 @@ CELERY_TASK_EAGER_PROPAGATES = True {%- if cookiecutter.frontend_pipeline == 'Webpack' %} # django-webpack-loader # ------------------------------------------------------------------------------ -WEBPACK_LOADER["DEFAULT"]["CACHE"] = not DEBUG # noqa F405 +WEBPACK_LOADER["DEFAULT"]["CACHE"] = not DEBUG # noqa: F405 {%- endif %} # Your stuff... diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 5de0529e2..d5760147c 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -2,8 +2,10 @@ import logging import sentry_sdk + {%- if cookiecutter.use_celery == 'y' %} from sentry_sdk.integrations.celery import CeleryIntegration + {%- endif %} from sentry_sdk.integrations.django import DjangoIntegration from sentry_sdk.integrations.logging import LoggingIntegration @@ -22,7 +24,7 @@ ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["{{ cookiecutter.domai # DATABASES # ------------------------------------------------------------------------------ -DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60) # noqa F405 +DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60) # noqa: F405 # CACHES # ------------------------------------------------------------------------------ @@ -68,7 +70,7 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool( # STORAGES # ------------------------------------------------------------------------------ # https://django-storages.readthedocs.io/en/latest/#installation -INSTALLED_APPS += ["storages"] # noqa F405 +INSTALLED_APPS += ["storages"] # noqa: F405 {%- endif -%} {% if cookiecutter.cloud_provider == 'AWS' %} # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings @@ -159,7 +161,7 @@ ADMIN_URL = env("DJANGO_ADMIN_URL") # Anymail # ------------------------------------------------------------------------------ # https://anymail.readthedocs.io/en/stable/installation/#installing-anymail -INSTALLED_APPS += ["anymail"] # noqa F405 +INSTALLED_APPS += ["anymail"] # noqa: F405 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend # https://anymail.readthedocs.io/en/stable/installation/#anymail-settings-reference {%- if cookiecutter.mail_service == 'Mailgun' %} @@ -241,7 +243,7 @@ COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage" COMPRESS_STORAGE = STATICFILES_STORAGE {%- endif %} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL -COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %} # noqa F405{% endif %} +COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %} # noqa: F405{% endif %} {%- if cookiecutter.use_whitenoise == 'y' %} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_OFFLINE COMPRESS_OFFLINE = True # Offline compression is required when using Whitenoise @@ -259,7 +261,7 @@ COMPRESS_FILTERS = { # Collectfast # ------------------------------------------------------------------------------ # https://github.com/antonagestam/collectfast#installation -INSTALLED_APPS = ["collectfast"] + INSTALLED_APPS # noqa F405 +INSTALLED_APPS = ["collectfast"] + INSTALLED_APPS # noqa: F405 {% endif %} # LOGGING # ------------------------------------------------------------------------------ @@ -373,7 +375,7 @@ sentry_sdk.init( # django-rest-framework # ------------------------------------------------------------------------------- # Tools that generate code samples can use SERVERS to point to the correct domain -SPECTACULAR_SETTINGS["SERVERS"] = [ # noqa F405 +SPECTACULAR_SETTINGS["SERVERS"] = [ # noqa: F405 {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"} ] diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 587b99324..7941c7413 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -27,12 +27,12 @@ EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" # DEBUGGING FOR TEMPLATES # ------------------------------------------------------------------------------ -TEMPLATES[0]["OPTIONS"]["debug"] = True # type: ignore # noqa F405 +TEMPLATES[0]["OPTIONS"]["debug"] = True # type: ignore # noqa: F405 {%- if cookiecutter.frontend_pipeline == 'Webpack' %} # django-webpack-loader # ------------------------------------------------------------------------------ -WEBPACK_LOADER["DEFAULT"][ # noqa F405 +WEBPACK_LOADER["DEFAULT"][ # noqa: F405 "LOADER_CLASS" ] = "webpack_loader.loader.FakeWebpackLoader" diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py index 2241e5eb5..92e7a74ec 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py @@ -8,6 +8,6 @@ class UsersConfig(AppConfig): def ready(self): try: - import {{ cookiecutter.project_slug }}.users.signals # noqa F401 + import {{ cookiecutter.project_slug }}.users.signals # noqa: F401 except ImportError: pass From 1c74c8724e5167636c5f64bafaa7554780c707bf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 3 Apr 2023 08:47:54 -0500 Subject: [PATCH 50/59] Update psycopg2 to 2.9.6 (#4248) * Update psycopg2 from 2.9.5 to 2.9.6 * Update psycopg2 from 2.9.5 to 2.9.6 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0b3a39d97..7998a908c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,7 +3,7 @@ Werkzeug[watchdog]==2.2.3 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 {%- else %} psycopg2-binary==2.9.5 # https://github.com/psycopg/psycopg2 {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 2104d9ad4..7d3634d4b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==20.1.0 # https://github.com/benoitc/gunicorn -psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From 4641830430fa375af314f105bdaa8e5d1a0a5248 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 3 Apr 2023 08:48:04 -0500 Subject: [PATCH 51/59] Update psycopg2-binary from 2.9.5 to 2.9.6 (#4249) --- {{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 7998a908c..8c0c0e156 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -5,7 +5,7 @@ ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 {%- else %} -psycopg2-binary==2.9.5 # https://github.com/psycopg/psycopg2 +psycopg2-binary==2.9.6 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles From 1cba3b62e04a79d61cde9e90b2987ba3630a03c6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 4 Apr 2023 02:18:27 +0000 Subject: [PATCH 52/59] Release 2023.04.03 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2008354ab..872748fd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.03 + +### Changed +- fix: Syntax for ignoring specific noqa errors ([#4250](https://github.com/cookiecutter/cookiecutter-django/pull/4250)) +### Updated +- Update psycopg2-binary to 2.9.6 ([#4249](https://github.com/cookiecutter/cookiecutter-django/pull/4249)) +- Update psycopg2 to 2.9.6 ([#4248](https://github.com/cookiecutter/cookiecutter-django/pull/4248)) + ## 2023.04.01 ### Updated diff --git a/setup.py b/setup.py index 52ec07456..334bd2906 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.01" +version = "2023.04.03" with open("README.rst") as readme_file: long_description = readme_file.read() From e13f7afcb832588a65bcce6da8b950075dad13db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Micha=C5=82=20Ry=C5=9B?= <6430069+arrys@users.noreply.github.com> Date: Tue, 4 Apr 2023 11:25:06 +0200 Subject: [PATCH 53/59] Fix traefik rule priority for media router (#4244) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add option to serve media files locally using nginx * Fix nginx media location and storage issue * Fix traefik django-media typo * Add certresolver property to web-media-router * Add trailing slash in nginx configuration to avoid path traversal exploits * Remove autoindexing from nginx configuration so nginx uses its default off setting * Use nginx to serve media files if cloud provider is None * Add back warning about lack of media files without Docker or Cloud providers * Update documentation * Fix typos and rephrase Co-authored-by: Arkadiusz Ryś * Change Traefik media router rule generation to force priority The web-secure-router could end up having priority over the web-media-router when the www subdomain was used. This fix adds the www subdomain to the web-media-router if it's also present in the web-secure-router rule. Traefik looks at the length of rules to determine priority when no explicit priority is set. The web-media-router needs to always have priority over the web-secure-router in order for the media files to be served. * Add space to Traefik rule --------- Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- .../compose/production/traefik/traefik.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml index ea57f4a51..85d9572b9 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml @@ -60,7 +60,11 @@ http: {%- if cookiecutter.cloud_provider == 'None' %} web-media-router: + {%- if cookiecutter.domain_name.count('.') == 1 %} + rule: "(Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)) && PathPrefix(`/media/`)" + {%- else %} rule: "Host(`{{ cookiecutter.domain_name }}`) && PathPrefix(`/media/`)" + {%- endif %} entryPoints: - web-secure middlewares: From f55b30bb29350ec011bb35b02a8fc84f8fb8602e Mon Sep 17 00:00:00 2001 From: Morten Kaae <37534541+MortenKaae@users.noreply.github.com> Date: Tue, 4 Apr 2023 11:31:08 +0200 Subject: [PATCH 54/59] Remove deprecated security setting (#4247) * Remove deprecated setting * Update documentation --- docs/settings.rst | 1 - {{cookiecutter.project_slug}}/config/settings/base.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index 4691adbbd..6dacb7404 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -22,7 +22,6 @@ DATABASE_URL DATABASES auto w/ Dock DJANGO_ADMIN_URL n/a 'admin/' raises error DJANGO_DEBUG DEBUG True False DJANGO_SECRET_KEY SECRET_KEY auto-generated raises error -DJANGO_SECURE_BROWSER_XSS_FILTER SECURE_BROWSER_XSS_FILTER n/a True DJANGO_SECURE_SSL_REDIRECT SECURE_SSL_REDIRECT n/a True DJANGO_SECURE_CONTENT_TYPE_NOSNIFF SECURE_CONTENT_TYPE_NOSNIFF n/a True DJANGO_SECURE_FRAME_DENY SECURE_FRAME_DENY n/a True diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index cc77b864a..441fe4a2c 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -225,8 +225,6 @@ FIXTURE_DIRS = (str(APPS_DIR / "fixtures"),) SESSION_COOKIE_HTTPONLY = True # https://docs.djangoproject.com/en/dev/ref/settings/#csrf-cookie-httponly CSRF_COOKIE_HTTPONLY = True -# https://docs.djangoproject.com/en/dev/ref/settings/#secure-browser-xss-filter -SECURE_BROWSER_XSS_FILTER = True # https://docs.djangoproject.com/en/dev/ref/settings/#x-frame-options X_FRAME_OPTIONS = "DENY" From 6fdc2623e9093859ea02816eec63baad4a2e41aa Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 4 Apr 2023 09:31:36 +0000 Subject: [PATCH 55/59] 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 e84337123..ca5762fe8 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1382,5 +1382,10 @@ "name": "mpsantos", "github_login": "mpsantos", "twitter_username": "" + }, + { + "name": "Morten Kaae", + "github_login": "MortenKaae", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f78278e34..7d9ee7756 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1426,6 +1426,13 @@ Listed in alphabetical order. + + Morten Kaae + + MortenKaae + + + mozillazg From d7783f5c5546906f74a1f8d0d354447d9478e9ce Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 4 Apr 2023 07:42:17 -0500 Subject: [PATCH 56/59] Update django-debug-toolbar from 3.8.1 to 4.0.0 (#4251) --- {{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 8c0c0e156..9503b19d4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,7 +42,7 @@ pre-commit==3.2.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.8.1 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==4.0.0 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.0.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From e05122e4b357d526f04034ba10bf16300ac9c5c3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 4 Apr 2023 15:31:01 -0500 Subject: [PATCH 57/59] Update sentry-sdk to 1.19.0 (#4254) --- {{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 7d3634d4b..42cdbf53f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.17.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.19.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py From f93a9f78d9a249718acd20e297fb02b177353912 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Tue, 4 Apr 2023 22:42:53 +0200 Subject: [PATCH 58/59] Replace `runserver_plus` with `runserver` (#4255) * Replace runserver_plus with runserver since it is not compatible with django >= 4.1 * Replace runserver_plus with runserver in post_gen_hooks --------- Co-authored-by: Bruno Alla --- hooks/post_gen_project.py | 2 +- .../runConfigurations/runserver_plus.xml | 33 ------------------- .../compose/local/django/start | 2 +- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index dbc367175..b28bb0166 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -182,7 +182,7 @@ def handle_js_runner(choice, use_docker, use_async): dev_django_cmd = ( "uvicorn config.asgi:application --reload" if use_async - else "python manage.py runserver_plus" + else "python manage.py runserver" ) scripts.update( { diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml deleted file mode 100644 index 242f861a6..000000000 --- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start index ec57dc8e4..6415d7fb4 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/start @@ -9,5 +9,5 @@ python manage.py migrate {%- if cookiecutter.use_async == 'y' %} exec uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html' {%- else %} -exec python manage.py runserver_plus 0.0.0.0:8000 +exec python manage.py runserver 0.0.0.0:8000 {%- endif %} From a07b4b31125534bff0689355b72fe124925b80f1 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Tue, 4 Apr 2023 23:10:17 +0200 Subject: [PATCH 59/59] Upgrade to Django 4.1 (#4028) * Upgrade to Django 4.1 * Bump django-environ back to 0.10.0 --------- Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- README.md | 2 +- setup.py | 2 +- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index aaeb25828..d951c7a21 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ production-ready Django projects quickly. ## Features -- For Django 4.0 +- For Django 4.1 - Works with Python 3.10 - 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 334bd2906..8155fd234 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( classifiers=[ "Development Status :: 4 - Beta", "Environment :: Console", - "Framework :: Django :: 4.0", + "Framework :: Django :: 4.1", "Intended Audience :: Developers", "Natural Language :: English", "License :: OSI Approved :: BSD License", diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index fb3559194..6cce06457 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.21.1 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==4.0.10 # pyup: < 4.1 # https://www.djangoproject.com/ +django==4.1.7 # pyup: < 4.2 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.54.0 # https://github.com/pennersr/django-allauth