From 310b803f29623aa071432d814cf53a51706d0193 Mon Sep 17 00:00:00 2001 From: Alexandr Artemyev Date: Tue, 28 May 2024 14:10:33 +0500 Subject: [PATCH 01/22] Enhancing the security of cookies --- {{cookiecutter.project_slug}}/config/settings/production.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 5a6cbdb1d..a650d8315 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -55,8 +55,12 @@ SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https") SECURE_SSL_REDIRECT = env.bool("DJANGO_SECURE_SSL_REDIRECT", default=True) # https://docs.djangoproject.com/en/dev/ref/settings/#session-cookie-secure SESSION_COOKIE_SECURE = True +# https://docs.djangoproject.com/en/dev/ref/settings/#session-cookie-name +SESSION_COOKIE_NAME = "__Secure-sessionid" # https://docs.djangoproject.com/en/dev/ref/settings/#csrf-cookie-secure CSRF_COOKIE_SECURE = True +# https://docs.djangoproject.com/en/dev/ref/settings/#csrf-cookie-name +CSRF_COOKIE_NAME = "__Secure-csrftoken" # https://docs.djangoproject.com/en/dev/topics/security/#ssl-https # https://docs.djangoproject.com/en/dev/ref/settings/#secure-hsts-seconds # TODO: set this to 60 seconds first and then to 518400 once you prove the former works From d3ce7925b2be40784168f840bb30cb373a5fe81c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:45:22 +0100 Subject: [PATCH 02/22] Bump amazon/aws-cli Docker image from 2.15.58 to 2.16.6 (#5135) Bumps amazon/aws-cli from 2.15.58 to 2.16.6. --- updated-dependencies: - dependency-name: amazon/aws-cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index be01056d7..a7fe8c6bb 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/amazon/aws-cli:2.15.58 +FROM docker.io/amazon/aws-cli:2.16.6 COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From c1ca194e4f3a1f826a71a85084bd6a34adbfd59d Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 13 Jun 2024 02:17:40 +0000 Subject: [PATCH 03/22] Release 2024.06.12 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39a1e2e80..d9a37307b 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.06.12 + + +### Updated + +- Bump amazon/aws-cli Docker image from 2.15.58 to 2.16.6 ([#5135](https://github.com/cookiecutter/cookiecutter-django/pull/5135)) + ## 2024.06.08 diff --git a/setup.py b/setup.py index 4cc0bf346..c7adeb651 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.08" +version = "2024.06.12" with open("README.md") as readme_file: long_description = readme_file.read() From a0ae1945b598c492b66de9a5a034dafff0ea0915 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 13 Jun 2024 11:49:51 -0700 Subject: [PATCH 04/22] Update redis from 5.0.5 to 5.0.6 (#5137) --- {{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 4e89b9453..4163ad9bb 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.6.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==5.0.5 # https://github.com/redis/redis-py +redis==5.0.6 # 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 {%- endif %} From 4b94cde8870c2fb1581d73fdfda856c692b766f1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 14 Jun 2024 02:17:54 +0000 Subject: [PATCH 05/22] Release 2024.06.13 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9a37307b..bca8ad36c 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.06.13 + + +### Updated + +- Update redis to 5.0.6 ([#5137](https://github.com/cookiecutter/cookiecutter-django/pull/5137)) + ## 2024.06.12 diff --git a/setup.py b/setup.py index c7adeb651..055395824 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.12" +version = "2024.06.13" with open("README.md") as readme_file: long_description = readme_file.read() From 07c125d940c3412d189e2cef8af0994072336d12 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 Jun 2024 16:42:05 +0100 Subject: [PATCH 06/22] Update ruff from 0.4.8 to 0.4.9 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b2d8690c0..cd8a823f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.8 +ruff==0.4.9 django-upgrade==1.18.0 djlint==1.34.1 pre-commit==3.7.1 From bde8236e9a5d952dba9a52a12e54f86d1a0b99d5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 Jun 2024 16:42:05 +0100 Subject: [PATCH 07/22] Update ruff from 0.4.8 to 0.4.9 --- {{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 bad8f4002..96814cd31 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.4.8 # https://github.com/astral-sh/ruff +ruff==0.4.9 # https://github.com/astral-sh/ruff coverage==7.5.3 # 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 453ea25b1d62820e16739ccaf11335e9883e1cf6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 05:41:54 +0000 Subject: [PATCH 08/22] Bump amazon/aws-cli Bumps amazon/aws-cli from 2.16.6 to 2.16.8. --- updated-dependencies: - dependency-name: amazon/aws-cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index a7fe8c6bb..687c6d5cf 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/amazon/aws-cli:2.16.6 +FROM docker.io/amazon/aws-cli:2.16.8 COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From ed0857f7b3f672a259001cf0d855f3b9029c3530 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 05:36:04 +0000 Subject: [PATCH 09/22] Bump python in /{{cookiecutter.project_slug}}/compose/production/django Bumps python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../compose/production/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 671eb4635..ab83fcd8f 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -25,7 +25,7 @@ RUN npm run build {%- endif %} # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.3-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm as python # Python build stage FROM python as python-build-stage From c11d5519d6cb034b1a42b998a0577e0052343dbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 05:22:44 +0000 Subject: [PATCH 10/22] Bump python in /{{cookiecutter.project_slug}}/compose/local/django Bumps python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 88ccb7491..b085d990c 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.3-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm as python # Python build stage FROM python as python-build-stage From 03e68e893f0c169f398f88e8a14d14cf8742e140 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 05:05:04 +0000 Subject: [PATCH 11/22] Bump python in /{{cookiecutter.project_slug}}/compose/local/docs Bumps python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 35565042d..0fadd009b 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.3-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm as python # Python build stage From 80674b017e16ab105f7b4b1da6ac6439510ea18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Fri, 14 Jun 2024 17:26:01 -0300 Subject: [PATCH 12/22] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 23ca7a37f..5d7d9f9ca 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,5 +1,5 @@ # These are supported funding model platforms -github: [pydanny, browniebroke] +github: [pydanny, browniebroke, luzfcb] patreon: feldroy open_collective: cookiecutter-django From 987bee4573ea5e021754aa5c6964616d95464349 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 15 Jun 2024 02:17:13 +0000 Subject: [PATCH 13/22] Release 2024.06.14 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bca8ad36c..c0dd776d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.14 + + +### Updated + +- Bump python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm in /{{cookiecutter.project_slug}}/compose/local/docs ([#5129](https://github.com/cookiecutter/cookiecutter-django/pull/5129)) + +- Bump python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm in /{{cookiecutter.project_slug}}/compose/local/django ([#5130](https://github.com/cookiecutter/cookiecutter-django/pull/5130)) + +- Bump python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm in /{{cookiecutter.project_slug}}/compose/production/django ([#5132](https://github.com/cookiecutter/cookiecutter-django/pull/5132)) + +- Bump amazon/aws-cli from 2.16.6 to 2.16.8 in /{{cookiecutter.project_slug}}/compose/production/aws ([#5138](https://github.com/cookiecutter/cookiecutter-django/pull/5138)) + +- Update ruff to 0.4.9 ([#5139](https://github.com/cookiecutter/cookiecutter-django/pull/5139)) + ## 2024.06.13 diff --git a/setup.py b/setup.py index 055395824..65982cb81 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.13" +version = "2024.06.14" with open("README.md") as readme_file: long_description = readme_file.read() From f6b9fa370802afe1ec6d9852a73dbf6f794ba1e1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 15 Jun 2024 15:46:42 -0700 Subject: [PATCH 14/22] Update django-allauth from 0.63.2 to 0.63.3 (#5111) --- {{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 4163ad9bb..8fd928a65 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==4.2.13 # 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.2 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==0.63.3 # https://github.com/pennersr/django-allauth django-crispy-forms==2.1 # 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 c4f7b09cf3f4dc9dc9a6c982728938ce3c983ce6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Jun 2024 23:46:57 +0100 Subject: [PATCH 15/22] Auto-update pre-commit hooks (#5140) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 871e01014..e9629f6da 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.4.8 + rev: v0.4.9 hooks: # Linter - id: ruff From f9a4d864db51ad7f4a8b168f9f78ab24364a4eca Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 15 Jun 2024 15:48:02 -0700 Subject: [PATCH 16/22] Update sentry-sdk from 2.5.0 to 2.5.1 (#5142) --- {{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 f6f27308f..9a742a16a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.5.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.5.1 # 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 From c3335e6604d8f34272b293b72795485f7c17e733 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 15 Jun 2024 22:54:26 +0000 Subject: [PATCH 17/22] 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 9a2ae24f9..2e40624f4 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1593,5 +1593,10 @@ "name": "Manas Mallick", "github_login": "ManDun", "twitter_username": "" + }, + { + "name": "Alexandr Artemyev", + "github_login": "Mogost", + "twitter_username": "MOGOST" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 2e894f387..520f6423d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -215,6 +215,13 @@ Listed in alphabetical order. + + Alexandr Artemyev + + Mogost + + MOGOST + Alvaro [Andor] From 401ffd0e860ecd72789b7f685998a4dfad088388 Mon Sep 17 00:00:00 2001 From: Arnav Choudhury Date: Sun, 16 Jun 2024 04:25:43 +0530 Subject: [PATCH 18/22] Update start-flower in flower to wait until all celery workers are online (#5012) Flower needs to start only after the celery workers come online. Otherwise one will see errors like `inspect method failed` etc --- .../compose/local/django/celery/flower/start | 8 ++++++++ .../compose/production/django/celery/flower/start | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index b4783d2f0..cebb62203 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -3,6 +3,14 @@ set -o errexit set -o nounset + +until timeout 10 celery -A config.celery_app inspect ping; do + >&2 echo "Celery workers not available" +done + +echo 'Starting flower' + + exec watchfiles --filter python celery.__main__.main \ --args \ "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\"" diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start index 4180d6778..f903a05a2 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start @@ -4,6 +4,14 @@ set -o errexit set -o nounset + +until timeout 10 celery -A config.celery_app inspect ping; do + >&2 echo "Celery workers not available" +done + +echo 'Starting flower' + + exec celery \ -A config.celery_app \ -b "${CELERY_BROKER_URL}" \ From a2e364b5c1440e025c3b67138c06aca0621dc1b6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 15 Jun 2024 15:57:21 -0700 Subject: [PATCH 19/22] Update django-crispy-forms from 2.1 to 2.2 (#5143) --- {{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 8fd928a65..c81952198 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -33,7 +33,7 @@ django==4.2.13 # 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.3 # https://github.com/pennersr/django-allauth -django-crispy-forms==2.1 # https://github.com/django-crispy-forms/django-crispy-forms +django-crispy-forms==2.2 # 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.4 # https://github.com/django-compressor/django-compressor From d40623b3821ab6b533ad19d66723a083e2445050 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 16 Jun 2024 02:19:35 +0000 Subject: [PATCH 20/22] Release 2024.06.15 --- CHANGELOG.md | 19 +++++++++++++++++++ setup.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0dd776d7..6d2e5371e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.15 + + +### Changed + +- Update start-flower in flower to wait until all celery workers are online ([#5012](https://github.com/cookiecutter/cookiecutter-django/pull/5012)) + +- Enhancing the security of cookies ([#5102](https://github.com/cookiecutter/cookiecutter-django/pull/5102)) + +### Updated + +- Update django-crispy-forms to 2.2 ([#5143](https://github.com/cookiecutter/cookiecutter-django/pull/5143)) + +- Update sentry-sdk to 2.5.1 ([#5142](https://github.com/cookiecutter/cookiecutter-django/pull/5142)) + +- Auto-update pre-commit hooks ([#5140](https://github.com/cookiecutter/cookiecutter-django/pull/5140)) + +- Update django-allauth to 0.63.3 ([#5111](https://github.com/cookiecutter/cookiecutter-django/pull/5111)) + ## 2024.06.14 diff --git a/setup.py b/setup.py index 65982cb81..e240446f8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.14" +version = "2024.06.15" with open("README.md") as readme_file: long_description = readme_file.read() From 16652acaf1bcd9a4142e84a406135342c66316af Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 17 Jun 2024 01:17:45 -0700 Subject: [PATCH 21/22] Update django-compressor to 4.5 (#5145) * Update django-compressor from 4.4 to 4.5 * Update rcssmin to 1.1.2 (#4614) --- {{cookiecutter.project_slug}}/requirements/base.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index c81952198..62a7d45c6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -2,9 +2,9 @@ python-slugify==8.0.4 # https://github.com/un33k/python-slugify Pillow==10.3.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 +rcssmin==1.1.2 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin {%- else %} -rcssmin==1.1.1 # https://github.com/ndparker/rcssmin +rcssmin==1.1.2 # https://github.com/ndparker/rcssmin {%- endif %} {%- endif %} argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi @@ -36,7 +36,7 @@ django-allauth[mfa]==0.63.3 # https://github.com/pennersr/django-allauth django-crispy-forms==2.2 # 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.4 # https://github.com/django-compressor/django-compressor +django-compressor==4.5 # 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 0b95d16aaa7099701e94f4ec011e9ff4a6f6fd08 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:21:47 +0100 Subject: [PATCH 22/22] Update flake8 pre-commit hook in template (#5144) 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 c81f51ec0..acf7676ec 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.0.0 + rev: 7.1.0 hooks: - id: flake8