From 4709a30bd7a698b5628dc5d3d3a4e2e091463873 Mon Sep 17 00:00:00 2001 From: Jelmer Draaijer Date: Thu, 15 Feb 2024 10:30:46 +0100 Subject: [PATCH 01/85] Remove CELERY_BROKER_URL in favor of REDIS_URL --- .github/workflows/ci.yml | 2 +- docs/1-getting-started/settings.rst | 1 - docs/2-local-development/developing-locally.rst | 2 -- docs/3-deployment/deployment-on-heroku.rst | 2 -- tests/test_docker.sh | 1 - {{cookiecutter.project_slug}}/.drone.yml | 2 +- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 2 +- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 2 +- .../compose/local/django/celery/flower/start | 2 +- .../compose/production/django/Dockerfile | 3 --- .../compose/production/django/celery/flower/start | 2 +- .../compose/production/django/entrypoint | 6 ------ {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- {{cookiecutter.project_slug}}/docs/conf.py | 3 --- 14 files changed, 7 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2ef936fc..44e31e598 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: POSTGRES_PASSWORD: postgres env: - CELERY_BROKER_URL: "redis://localhost:6379/0" + REDIS_URL: "redis://localhost:6379/0" # postgres://user:password@host:port/database DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres" diff --git a/docs/1-getting-started/settings.rst b/docs/1-getting-started/settings.rst index 2be79cbf5..dfdccc7cc 100644 --- a/docs/1-getting-started/settings.rst +++ b/docs/1-getting-started/settings.rst @@ -39,7 +39,6 @@ The following table lists settings and their defaults for third-party applicatio ======================================= =========================== ============================================== ====================================================================== Environment Variable Django Setting Development Default Production Default ======================================= =========================== ============================================== ====================================================================== -CELERY_BROKER_URL CELERY_BROKER_URL auto w/ Docker; raises error w/o raises error DJANGO_AWS_ACCESS_KEY_ID AWS_ACCESS_KEY_ID n/a raises error DJANGO_AWS_SECRET_ACCESS_KEY AWS_SECRET_ACCESS_KEY n/a raises error DJANGO_AWS_STORAGE_BUCKET_NAME AWS_STORAGE_BUCKET_NAME n/a raises error diff --git a/docs/2-local-development/developing-locally.rst b/docs/2-local-development/developing-locally.rst index 11343e154..b8484bfe0 100644 --- a/docs/2-local-development/developing-locally.rst +++ b/docs/2-local-development/developing-locally.rst @@ -55,8 +55,6 @@ First things first. #. Set the environment variables for your database(s): :: $ export DATABASE_URL=postgres://postgres:@127.0.0.1:5432/ - # Optional: set broker URL if using Celery - $ export CELERY_BROKER_URL=redis://localhost:6379/0 .. note:: diff --git a/docs/3-deployment/deployment-on-heroku.rst b/docs/3-deployment/deployment-on-heroku.rst index a828d6745..75bf76936 100644 --- a/docs/3-deployment/deployment-on-heroku.rst +++ b/docs/3-deployment/deployment-on-heroku.rst @@ -86,8 +86,6 @@ it's in the ``Procfile``, but is turned off by default: .. code-block:: bash - # Set the broker URL to Redis - heroku config:set CELERY_BROKER_URL=`heroku config:get REDIS_URL` # Scale dyno to 1 instance heroku ps:scale worker=1 diff --git a/tests/test_docker.sh b/tests/test_docker.sh index d8e625900..326e58328 100755 --- a/tests/test_docker.sh +++ b/tests/test_docker.sh @@ -33,7 +33,6 @@ docker compose -f docker-compose.local.yml run django python manage.py makemessa docker compose -f docker-compose.local.yml run \ -e DJANGO_SECRET_KEY="$(openssl rand -base64 64)" \ -e REDIS_URL=redis://redis:6379/0 \ - -e CELERY_BROKER_URL=redis://redis:6379/0 \ -e DJANGO_AWS_ACCESS_KEY_ID=x \ -e DJANGO_AWS_SECRET_ACCESS_KEY=x \ -e DJANGO_AWS_STORAGE_BUCKET_NAME=x \ diff --git a/{{cookiecutter.project_slug}}/.drone.yml b/{{cookiecutter.project_slug}}/.drone.yml index d6c13e62b..20d6fb1bb 100644 --- a/{{cookiecutter.project_slug}}/.drone.yml +++ b/{{cookiecutter.project_slug}}/.drone.yml @@ -7,7 +7,7 @@ environment: POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}' POSTGRES_HOST_AUTH_METHOD: trust {%- if cookiecutter.use_celery == 'y' %} - CELERY_BROKER_URL: 'redis://redis:6379/0' + REDIS_URL: 'redis://redis:6379/0' {%- endif %} steps: diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 0d8ed0cad..6bb555063 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: env: {%- if cookiecutter.use_celery == 'y' %} - CELERY_BROKER_URL: 'redis://localhost:6379/0' + REDIS_URL: 'redis://localhost:6379/0' {%- endif %} # postgres://user:password@host:port/database DATABASE_URL: 'postgres://postgres:postgres@localhost:5432/postgres' diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 71216bc7a..9c7cd5367 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}' POSTGRES_HOST_AUTH_METHOD: trust {%- if cookiecutter.use_celery == 'y' %} - CELERY_BROKER_URL: 'redis://redis:6379/0' + REDIS_URL: 'redis://redis:6379/0' {%- endif %} precommit: diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index cebb62203..f8377adae 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -13,4 +13,4 @@ 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}\"" + "-A config.celery_app -b \"${REDIS_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\"" diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 83d385949..a3908625c 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -125,9 +125,6 @@ RUN chown -R django:django ${APP_HOME} USER django RUN DATABASE_URL="" \ - {%- if cookiecutter.use_celery == "y" %} - CELERY_BROKER_URL="" \ - {%- endif %} DJANGO_SETTINGS_MODULE="config.settings.test" \ python manage.py compilemessages diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start index f903a05a2..c0b1cbe5d 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start @@ -14,6 +14,6 @@ echo 'Starting flower' exec celery \ -A config.celery_app \ - -b "${CELERY_BROKER_URL}" \ + -b "${REDIS_URL}" \ flower \ --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint index fe517f4ce..fe9a0133f 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint +++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint @@ -4,12 +4,6 @@ set -o errexit set -o pipefail set -o nounset - -{% if cookiecutter.use_celery == 'y' %} -# N.B. If only .env files supported variable expansion... -export CELERY_BROKER_URL="${REDIS_URL}" -{% endif %} - if [ -z "${POSTGRES_USER}" ]; then base_postgres_image_default_user='postgres' export POSTGRES_USER="${base_postgres_image_default_user}" diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index f1039b748..ec7c500a0 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -289,7 +289,7 @@ if USE_TZ: # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-timezone CELERY_TIMEZONE = TIME_ZONE # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-broker_url -CELERY_BROKER_URL = env("CELERY_BROKER_URL") +CELERY_BROKER_URL = env("REDIS_URL") # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend CELERY_RESULT_BACKEND = CELERY_BROKER_URL # https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py index 40d59dbbb..31a828fe5 100644 --- a/{{cookiecutter.project_slug}}/docs/conf.py +++ b/{{cookiecutter.project_slug}}/docs/conf.py @@ -26,9 +26,6 @@ else: sys.path.insert(0, os.path.abspath("..")) {%- endif %} os.environ["DATABASE_URL"] = "sqlite:///readthedocs.db" -{%- if cookiecutter.use_celery == 'y' %} -os.environ["CELERY_BROKER_URL"] = os.getenv("REDIS_URL", "redis://redis:6379") -{%- endif %} os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") django.setup() From deb813ca056c1250d575a121235acd2e11a42ea7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 15 Oct 2024 02:28:45 +0000 Subject: [PATCH 02/85] Release 2024.10.14 --- CHANGELOG.md | 13 +++++++++++++ pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c9fea651..c27e7e0d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.14 + + +### Changed + +- Add requirements for ubuntu 24.04 ([#5467](https://github.com/cookiecutter/cookiecutter-django/pull/5467)) + +### Updated + +- Update sphinx to 8.1.3 ([#5463](https://github.com/cookiecutter/cookiecutter-django/pull/5463)) + +- Update coverage to 7.6.3 ([#5464](https://github.com/cookiecutter/cookiecutter-django/pull/5464)) + ## 2024.10.12 diff --git a/pyproject.toml b/pyproject.toml index 0d49d0365..aaaf8cd8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.12" +version = "2024.10.14" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 16b2c16b52c83978de1105b02cefa51c5aa91348 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 09:27:16 +0100 Subject: [PATCH 03/85] Auto-update pre-commit hooks (#5469) 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 b667b30b8..40305f9e7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,7 @@ repos: - id: flake8 - repo: https://github.com/tox-dev/pyproject-fmt - rev: "2.3.0" + rev: "2.3.1" hooks: - id: pyproject-fmt From 67af42be0c96dab34fe8931643d5931ab04152ca Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Oct 2024 02:29:09 +0000 Subject: [PATCH 04/85] Release 2024.10.15 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c27e7e0d0..c4f78f4d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.15 + + +### Changed + +- [pre-commit.ci] pre-commit autoupdate ([#5468](https://github.com/cookiecutter/cookiecutter-django/pull/5468)) + ## 2024.10.14 diff --git a/pyproject.toml b/pyproject.toml index aaaf8cd8a..d3b432fb3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.14" +version = "2024.10.15" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From ff7874b316f932290c7f852a9895576850b704e8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 17 Oct 2024 04:52:13 -0700 Subject: [PATCH 05/85] Update sentry-sdk to 2.17.0 (#5473) --- {{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 999d804f3..79e667519 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.16.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.17.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py From dc4d102477841eecad227d5140548d4a11bcac7a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 17 Oct 2024 04:52:42 -0700 Subject: [PATCH 06/85] Update pillow to 11.0.0 (#5470) --- {{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 b98450a6f..f2203aa40 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ python-slugify==8.0.4 # https://github.com/un33k/python-slugify -Pillow==10.4.0 # https://github.com/python-pillow/Pillow +Pillow==11.0.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.2 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From ae86e01779f8dab6be446c0a8e80aef088008bd6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 17 Oct 2024 04:52:53 -0700 Subject: [PATCH 07/85] Update uvicorn to 0.32.0 (#5471) --- {{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 f2203aa40..97246b5a4 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.31.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.32.0 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From ca405049adb3212b1990d97810e38b6876e680c4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:10:50 +0100 Subject: [PATCH 08/85] Auto-update pre-commit hooks (#5475) 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 40305f9e7..98ce32a7f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,7 @@ repos: - id: flake8 - repo: https://github.com/tox-dev/pyproject-fmt - rev: "2.3.1" + rev: "2.4.3" hooks: - id: pyproject-fmt From abc199d5ef758f5ae4522462701fb2eacb20d87e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 17 Oct 2024 13:29:12 -0700 Subject: [PATCH 09/85] Update ruff to 0.7.0 (#5474) --- pyproject.toml | 2 +- uv.lock | 42 +++++++++---------- .../.pre-commit-config.yaml | 2 +- .../requirements/local.txt | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d3b432fb3..04d52a79d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ dependencies = [ "pytest-xdist==3.6.1", "pyyaml==6.0.2", "requests==2.32.3", - "ruff==0.6.9", + "ruff==0.7", "sh==2.0.7; sys_platform!='win23'", "tox==4.21.2", "tox-uv>=1.11.2", diff --git a/uv.lock b/uv.lock index 84927f157..20b4fa047 100644 --- a/uv.lock +++ b/uv.lock @@ -192,7 +192,7 @@ wheels = [ [[package]] name = "cookiecutter-django" -version = "2024.10.10" +version = "2024.10.15" source = { virtual = "." } dependencies = [ { name = "binaryornot" }, @@ -240,7 +240,7 @@ requires-dist = [ { name = "pytest-xdist", specifier = "==3.6.1" }, { name = "pyyaml", specifier = "==6.0.2" }, { name = "requests", specifier = "==2.32.3" }, - { name = "ruff", specifier = "==0.6.9" }, + { name = "ruff", specifier = "==0.7.0" }, { name = "sh", marker = "sys_platform != 'win23'", specifier = "==2.0.7" }, { name = "sphinx", marker = "extra == 'docs'", specifier = ">=8.0.2" }, { name = "sphinx-autobuild", marker = "extra == 'docs'", specifier = ">=2024.10.3" }, @@ -861,27 +861,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.6.9" +version = "0.7.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/26/0d/6148a48dab5662ca1d5a93b7c0d13c03abd3cc7e2f35db08410e47cef15d/ruff-0.6.9.tar.gz", hash = "sha256:b076ef717a8e5bc819514ee1d602bbdca5b4420ae13a9cf61a0c0a4f53a2baa2", size = 3095355 } +sdist = { url = "https://files.pythonhosted.org/packages/2c/c7/f3367d1da5d568192968c5c9e7f3d51fb317b9ac04828493b23d8fce8ce6/ruff-0.7.0.tar.gz", hash = "sha256:47a86360cf62d9cd53ebfb0b5eb0e882193fc191c6d717e8bef4462bc3b9ea2b", size = 3146645 } wheels = [ - { url = "https://files.pythonhosted.org/packages/6e/8f/f7a0a0ef1818662efb32ed6df16078c95da7a0a3248d64c2410c1e27799f/ruff-0.6.9-py3-none-linux_armv6l.whl", hash = "sha256:064df58d84ccc0ac0fcd63bc3090b251d90e2a372558c0f057c3f75ed73e1ccd", size = 10440526 }, - { url = "https://files.pythonhosted.org/packages/8b/69/b179a5faf936a9e2ab45bb412a668e4661eded964ccfa19d533f29463ef6/ruff-0.6.9-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:140d4b5c9f5fc7a7b074908a78ab8d384dd7f6510402267bc76c37195c02a7ec", size = 10034612 }, - { url = "https://files.pythonhosted.org/packages/c7/ef/fd1b4be979c579d191eeac37b5cfc0ec906de72c8bcd8595e2c81bb700c1/ruff-0.6.9-py3-none-macosx_11_0_arm64.whl", hash = "sha256:53fd8ca5e82bdee8da7f506d7b03a261f24cd43d090ea9db9a1dc59d9313914c", size = 9706197 }, - { url = "https://files.pythonhosted.org/packages/29/61/b376d775deb5851cb48d893c568b511a6d3625ef2c129ad5698b64fb523c/ruff-0.6.9-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:645d7d8761f915e48a00d4ecc3686969761df69fb561dd914a773c1a8266e14e", size = 10751855 }, - { url = "https://files.pythonhosted.org/packages/13/d7/def9e5f446d75b9a9c19b24231a3a658c075d79163b08582e56fa5dcfa38/ruff-0.6.9-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:eae02b700763e3847595b9d2891488989cac00214da7f845f4bcf2989007d577", size = 10200889 }, - { url = "https://files.pythonhosted.org/packages/6c/d6/7f34160818bcb6e84ce293a5966cba368d9112ff0289b273fbb689046047/ruff-0.6.9-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d5ccc9e58112441de8ad4b29dcb7a86dc25c5f770e3c06a9d57e0e5eba48829", size = 11038678 }, - { url = "https://files.pythonhosted.org/packages/13/34/a40ff8ae62fb1b26fb8e6fa7e64bc0e0a834b47317880de22edd6bfb54fb/ruff-0.6.9-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:417b81aa1c9b60b2f8edc463c58363075412866ae4e2b9ab0f690dc1e87ac1b5", size = 11808682 }, - { url = "https://files.pythonhosted.org/packages/2e/6d/25a4386ae4009fc798bd10ba48c942d1b0b3e459b5403028f1214b6dd161/ruff-0.6.9-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3c866b631f5fbce896a74a6e4383407ba7507b815ccc52bcedabb6810fdb3ef7", size = 11330446 }, - { url = "https://files.pythonhosted.org/packages/f7/f6/bdf891a9200d692c94ebcd06ae5a2fa5894e522f2c66c2a12dd5d8cb2654/ruff-0.6.9-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7b118afbb3202f5911486ad52da86d1d52305b59e7ef2031cea3425142b97d6f", size = 12483048 }, - { url = "https://files.pythonhosted.org/packages/a7/86/96f4252f41840e325b3fa6c48297e661abb9f564bd7dcc0572398c8daa42/ruff-0.6.9-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a67267654edc23c97335586774790cde402fb6bbdb3c2314f1fc087dee320bfa", size = 10936855 }, - { url = "https://files.pythonhosted.org/packages/45/87/801a52d26c8dbf73424238e9908b9ceac430d903c8ef35eab1b44fcfa2bd/ruff-0.6.9-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3ef0cc774b00fec123f635ce5c547dac263f6ee9fb9cc83437c5904183b55ceb", size = 10713007 }, - { url = "https://files.pythonhosted.org/packages/be/27/6f7161d90320a389695e32b6ebdbfbedde28ccbf52451e4b723d7ce744ad/ruff-0.6.9-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:12edd2af0c60fa61ff31cefb90aef4288ac4d372b4962c2864aeea3a1a2460c0", size = 10274594 }, - { url = "https://files.pythonhosted.org/packages/00/52/dc311775e7b5f5b19831563cb1572ecce63e62681bccc609867711fae317/ruff-0.6.9-py3-none-musllinux_1_2_i686.whl", hash = "sha256:55bb01caeaf3a60b2b2bba07308a02fca6ab56233302406ed5245180a05c5625", size = 10608024 }, - { url = "https://files.pythonhosted.org/packages/98/b6/be0a1ddcbac65a30c985cf7224c4fce786ba2c51e7efeb5178fe410ed3cf/ruff-0.6.9-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:925d26471fa24b0ce5a6cdfab1bb526fb4159952385f386bdcc643813d472039", size = 10982085 }, - { url = "https://files.pythonhosted.org/packages/bb/a4/c84bc13d0b573cf7bb7d17b16d6d29f84267c92d79b2f478d4ce322e8e72/ruff-0.6.9-py3-none-win32.whl", hash = "sha256:eb61ec9bdb2506cffd492e05ac40e5bc6284873aceb605503d8494180d6fc84d", size = 8522088 }, - { url = "https://files.pythonhosted.org/packages/74/be/fc352bd8ca40daae8740b54c1c3e905a7efe470d420a268cd62150248c91/ruff-0.6.9-py3-none-win_amd64.whl", hash = "sha256:785d31851c1ae91f45b3d8fe23b8ae4b5170089021fbb42402d811135f0b7117", size = 9359275 }, - { url = "https://files.pythonhosted.org/packages/3e/14/fd026bc74ded05e2351681545a5f626e78ef831f8edce064d61acd2e6ec7/ruff-0.6.9-py3-none-win_arm64.whl", hash = "sha256:a9641e31476d601f83cd602608739a0840e348bda93fec9f1ee816f8b6798b93", size = 8679879 }, + { url = "https://files.pythonhosted.org/packages/48/59/a0275a0913f3539498d116046dd679cd657fe3b7caf5afe1733319414932/ruff-0.7.0-py3-none-linux_armv6l.whl", hash = "sha256:0cdf20c2b6ff98e37df47b2b0bd3a34aaa155f59a11182c1303cce79be715628", size = 10434007 }, + { url = "https://files.pythonhosted.org/packages/cd/94/da0ba5f956d04c90dd899209904210600009dcda039ce840d83eb4298c7d/ruff-0.7.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:496494d350c7fdeb36ca4ef1c9f21d80d182423718782222c29b3e72b3512737", size = 10048066 }, + { url = "https://files.pythonhosted.org/packages/57/1d/e5cc149ecc46e4f203403a79ccd170fad52d316f98b87d0f63b1945567db/ruff-0.7.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:214b88498684e20b6b2b8852c01d50f0651f3cc6118dfa113b4def9f14faaf06", size = 9711389 }, + { url = "https://files.pythonhosted.org/packages/05/67/fb7ea2c869c539725a16c5bc294e9aa34f8b1b6fe702f1d173a5da517c2b/ruff-0.7.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:630fce3fefe9844e91ea5bbf7ceadab4f9981f42b704fae011bb8efcaf5d84be", size = 10755174 }, + { url = "https://files.pythonhosted.org/packages/5f/f0/13703bc50536a0613ea3dce991116e5f0917a1f05528c6ab738b33c08d3f/ruff-0.7.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:211d877674e9373d4bb0f1c80f97a0201c61bcd1e9d045b6e9726adc42c156aa", size = 10196040 }, + { url = "https://files.pythonhosted.org/packages/99/c1/77b04ab20324ab03d333522ee55fb0f1c38e3ca0d326b4905f82ce6b6c70/ruff-0.7.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:194d6c46c98c73949a106425ed40a576f52291c12bc21399eb8f13a0f7073495", size = 11033684 }, + { url = "https://files.pythonhosted.org/packages/f2/97/f463334dc4efeea3551cd109163df15561c18a1c3ec13d51643740fd36ba/ruff-0.7.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:82c2579b82b9973a110fab281860403b397c08c403de92de19568f32f7178598", size = 11803700 }, + { url = "https://files.pythonhosted.org/packages/b4/f8/a31d40c4bb92933d376a53e7c5d0245d9b27841357e4820e96d38f54b480/ruff-0.7.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9af971fe85dcd5eaed8f585ddbc6bdbe8c217fb8fcf510ea6bca5bdfff56040e", size = 11347848 }, + { url = "https://files.pythonhosted.org/packages/83/62/0c133b35ddaf91c65c30a56718b80bdef36bfffc35684d29e3a4878e0ea3/ruff-0.7.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b641c7f16939b7d24b7bfc0be4102c56562a18281f84f635604e8a6989948914", size = 12480632 }, + { url = "https://files.pythonhosted.org/packages/46/96/464058dd1d980014fb5aa0a1254e78799efb3096fc7a4823cd66a1621276/ruff-0.7.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d71672336e46b34e0c90a790afeac8a31954fd42872c1f6adaea1dff76fd44f9", size = 10941919 }, + { url = "https://files.pythonhosted.org/packages/a0/f7/bda37ec77986a435dde44e1f59374aebf4282a5fa9cf17735315b847141f/ruff-0.7.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:ab7d98c7eed355166f367597e513a6c82408df4181a937628dbec79abb2a1fe4", size = 10745519 }, + { url = "https://files.pythonhosted.org/packages/c2/33/5f77fc317027c057b61a848020a47442a1cbf12e592df0e41e21f4d0f3bd/ruff-0.7.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:1eb54986f770f49edb14f71d33312d79e00e629a57387382200b1ef12d6a4ef9", size = 10284872 }, + { url = "https://files.pythonhosted.org/packages/ff/50/98aec292bc9537f640b8d031c55f3414bf15b6ed13b3e943fed75ac927b9/ruff-0.7.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:dc452ba6f2bb9cf8726a84aa877061a2462afe9ae0ea1d411c53d226661c601d", size = 10600334 }, + { url = "https://files.pythonhosted.org/packages/f2/85/12607ae3201423a179b8cfadc7cb1e57d02cd0135e45bd0445acb4cef327/ruff-0.7.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:4b406c2dce5be9bad59f2de26139a86017a517e6bcd2688da515481c05a2cb11", size = 11017333 }, + { url = "https://files.pythonhosted.org/packages/d4/7f/3b85a56879e705d5f46ec14daf8a439fca05c3081720fe3dc3209100922d/ruff-0.7.0-py3-none-win32.whl", hash = "sha256:f6c968509f767776f524a8430426539587d5ec5c662f6addb6aa25bc2e8195ec", size = 8570962 }, + { url = "https://files.pythonhosted.org/packages/39/9f/c5ee2b40d377354dabcc23cff47eb299de4b4d06d345068f8f8cc1eadac8/ruff-0.7.0-py3-none-win_amd64.whl", hash = "sha256:ff4aabfbaaba880e85d394603b9e75d32b0693152e16fa659a3064a85df7fce2", size = 9365544 }, + { url = "https://files.pythonhosted.org/packages/89/8b/ee1509f60148cecba644aa718f6633216784302458340311898aaf0b1bed/ruff-0.7.0-py3-none-win_arm64.whl", hash = "sha256:10842f69c245e78d6adec7e1db0a7d9ddc2fff0621d730e61657b64fa36f207e", size = 8695763 }, ] [[package]] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index e055b7f3a..54b59abb7 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.9 + rev: v0.7.0 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 442461fca..122b5e7f6 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.9 # https://github.com/astral-sh/ruff +ruff==0.7.0 # https://github.com/astral-sh/ruff coverage==7.6.3 # https://github.com/nedbat/coveragepy djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From 8c1fac1b2e3a97a7aceae5e8175c8ecf6cd4fbfe Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 17 Oct 2024 21:38:22 +0100 Subject: [PATCH 10/85] Run uv lock when updating template version (#5478) --- .github/workflows/update-changelog.yml | 2 +- scripts/update_changelog.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 55d1558f0..7ba569380 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -23,7 +23,7 @@ jobs: run: | git config --global user.name "github-actions" git config --global user.email "action@github.com" - - name: Update list + - name: Update changelog run: uv run --frozen scripts/update_changelog.py env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py index 988370e43..9ef942c49 100644 --- a/scripts/update_changelog.py +++ b/scripts/update_changelog.py @@ -1,6 +1,7 @@ import datetime as dt import os import re +import subprocess from collections.abc import Iterable from pathlib import Path @@ -51,6 +52,9 @@ def main() -> None: update_version(setup_py_path, release) print(f"Updated version in {setup_py_path}") + # Run uv lock + subprocess.run(["uv", "lock"], cwd=ROOT) + # Commit changes, create tag and push update_git_repo([changelog_path, setup_py_path], release) From 1b83a472ec5131ee154df5df239cd561b110246b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 18 Oct 2024 02:28:50 +0000 Subject: [PATCH 11/85] Release 2024.10.17 --- CHANGELOG.md | 13 +++++++++++++ pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4f78f4d1..937f39123 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.17 + + +### Updated + +- Update ruff to 0.7.0 ([#5474](https://github.com/cookiecutter/cookiecutter-django/pull/5474)) + +- Update uvicorn to 0.32.0 ([#5471](https://github.com/cookiecutter/cookiecutter-django/pull/5471)) + +- Update pillow to 11.0.0 ([#5470](https://github.com/cookiecutter/cookiecutter-django/pull/5470)) + +- Update sentry-sdk to 2.17.0 ([#5473](https://github.com/cookiecutter/cookiecutter-django/pull/5473)) + ## 2024.10.15 diff --git a/pyproject.toml b/pyproject.toml index 04d52a79d..fb2f89cd8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.15" +version = "2024.10.17" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 6f5f1b8576dacdc0c9a6002cd05a1f24babd1e28 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 21 Oct 2024 10:12:29 +0100 Subject: [PATCH 12/85] Fix a number of issues with Azure storage (#5476) --- hooks/post_gen_project.py | 6 ++++++ {{cookiecutter.project_slug}}/config/settings/production.py | 4 ++-- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 9e9af5f2d..081e806c5 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -91,6 +91,10 @@ def remove_docker_files(): os.remove(os.path.join(".idea", "runConfigurations", file_name)) +def remove_nginx_docker_files(): + shutil.rmtree(os.path.join("compose", "production", "nginx")) + + def remove_utility_files(): shutil.rmtree("utility") @@ -457,6 +461,8 @@ def main(): if "{{ cookiecutter.use_docker }}".lower() == "y": remove_utility_files() + if "{{ cookiecutter.cloud_provider }}".lower() != "none": + remove_nginx_docker_files() else: remove_docker_files() diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 6349e17bb..468cc6687 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -170,7 +170,7 @@ STORAGES = { "BACKEND": "storages.backends.azure_storage.AzureStorage", "OPTIONS": { "location": "media", - "file_overwrite": False, + "overwrite_files": False, }, }, {%- if cookiecutter.use_whitenoise == 'y' %} @@ -323,7 +323,7 @@ COMPRESS_FILTERS = { "js": ["compressor.filters.jsmin.JSMinFilter"], } {% endif %} -{%- if cookiecutter.use_whitenoise == 'n' -%} +{%- if cookiecutter.use_whitenoise == 'n' and cookiecutter.cloud_provider in ('AWS', 'GCP') -%} # Collectfasta # ------------------------------------------------------------------------------ # https://github.com/jasongi/collectfasta#installation diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 79e667519..b6f22db45 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -4,7 +4,7 @@ gunicorn==23.0.0 # https://github.com/benoitc/gunicorn psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg -{%- if cookiecutter.use_whitenoise == 'n' %} +{%- if cookiecutter.use_whitenoise == 'n'and cookiecutter.cloud_provider in ('AWS', 'GCP') %} Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} From 02f6336d74f7481617a2bf1c1e17b8688a171864 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Oct 2024 02:12:40 -0700 Subject: [PATCH 13/85] Update coverage to 7.6.4 (#5480) --- {{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 122b5e7f6..e13666da1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.7.0 # https://github.com/astral-sh/ruff -coverage==7.6.3 # https://github.com/nedbat/coveragepy +coverage==7.6.4 # https://github.com/nedbat/coveragepy djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From 8bf9a8c2785073f7dfdc5bad72165eed9320ed4a Mon Sep 17 00:00:00 2001 From: Jelmer Draaijer Date: Mon, 21 Oct 2024 22:07:25 +0200 Subject: [PATCH 14/85] Add a default for REDIS_URL and add it as a variable to the settings --- {{cookiecutter.project_slug}}/config/settings/base.py | 6 ++++-- {{cookiecutter.project_slug}}/config/settings/production.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index ec7c500a0..97a4c42b9 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -282,6 +282,8 @@ LOGGING = { "root": {"level": "INFO", "handlers": ["console"]}, } +REDIS_URL = env("REDIS_URL", default="redis://{% if cookiecutter.use_docker == 'y' %}redis{%else%}localhost{% endif %}:6379/0") + {% if cookiecutter.use_celery == 'y' -%} # Celery # ------------------------------------------------------------------------------ @@ -289,9 +291,9 @@ if USE_TZ: # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-timezone CELERY_TIMEZONE = TIME_ZONE # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-broker_url -CELERY_BROKER_URL = env("REDIS_URL") +CELERY_BROKER_URL = REDIS_URL # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend -CELERY_RESULT_BACKEND = CELERY_BROKER_URL +CELERY_RESULT_BACKEND = REDIS_URL # https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended CELERY_RESULT_EXTENDED = True # https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-backend-always-retry diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 6349e17bb..d6a9b63d4 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -16,6 +16,7 @@ from sentry_sdk.integrations.redis import RedisIntegration from .base import * # noqa: F403 from .base import DATABASES from .base import INSTALLED_APPS +from .base import REDIS_URL {%- if cookiecutter.use_drf == "y" %} from .base import SPECTACULAR_SETTINGS {%- endif %} @@ -37,7 +38,7 @@ DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60) CACHES = { "default": { "BACKEND": "django_redis.cache.RedisCache", - "LOCATION": env("REDIS_URL"), + "LOCATION": REDIS_URL, "OPTIONS": { "CLIENT_CLASS": "django_redis.client.DefaultClient", # Mimicing memcache behavior. From a829571997081641c72f6cdc7c942422901317da Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Oct 2024 02:28:34 +0000 Subject: [PATCH 15/85] Release 2024.10.21 --- CHANGELOG.md | 15 +++++++++++++++ pyproject.toml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 937f39123..a32286cdf 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.10.21 + + +### Changed + +- Remove CELERY_BROKER_URL in favor of REDIS_URL ([#4861](https://github.com/cookiecutter/cookiecutter-django/pull/4861)) + +### Fixed + +- Fix a number of issues with Azure storage ([#5476](https://github.com/cookiecutter/cookiecutter-django/pull/5476)) + +### Updated + +- Update coverage to 7.6.4 ([#5480](https://github.com/cookiecutter/cookiecutter-django/pull/5480)) + ## 2024.10.17 diff --git a/pyproject.toml b/pyproject.toml index fb2f89cd8..49c9d46d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.17" +version = "2024.10.21" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 020639f86fb55200b5a35c907177ee64593e00c0 Mon Sep 17 00:00:00 2001 From: Mariot Tsitoara Date: Tue, 22 Oct 2024 08:39:07 +0200 Subject: [PATCH 16/85] Fix broken links in generated README.md (#5482) --- {{cookiecutter.project_slug}}/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md index cb7576892..9ee864afb 100644 --- a/{{cookiecutter.project_slug}}/README.md +++ b/{{cookiecutter.project_slug}}/README.md @@ -12,7 +12,7 @@ License: {{cookiecutter.open_source_license}} ## Settings -Moved to [settings](http://cookiecutter-django.readthedocs.io/en/latest/settings.html). +Moved to [settings](https://cookiecutter-django.readthedocs.io/en/latest/1-getting-started/settings.html). ## Basic Commands @@ -46,7 +46,7 @@ To run the tests, check your test coverage, and generate an HTML coverage report ### Live reloading and Sass CSS compilation -Moved to [Live reloading and SASS compilation](https://cookiecutter-django.readthedocs.io/en/latest/developing-locally.html#sass-compilation-live-reloading). +Moved to [Live reloading and SASS compilation](https://cookiecutter-django.readthedocs.io/en/latest/2-local-development/developing-locally.html#using-webpack-or-gulp). {%- if cookiecutter.use_celery == "y" %} @@ -87,7 +87,7 @@ celery -A config.celery_app worker -B -l info In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server [Mailpit](https://github.com/axllent/mailpit) with a web interface is available as docker container. Container mailpit will start automatically when you will run all docker containers. -Please check [cookiecutter-django Docker documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html) for more details how to start all containers. +Please check [cookiecutter-django Docker documentation](https://cookiecutter-django.readthedocs.io/en/latest/2-local-development/developing-locally-docker.html) for more details how to start all containers. With Mailpit running, to view messages that are sent by your application, open your browser and go to `http://127.0.0.1:8025` {%- else %} @@ -130,14 +130,14 @@ The following details how to deploy this application. ### Heroku -See detailed [cookiecutter-django Heroku documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-on-heroku.html). +See detailed [cookiecutter-django Heroku documentation](https://cookiecutter-django.readthedocs.io/en/latest/3-deployment/deployment-on-heroku.html). {%- endif %} {%- if cookiecutter.use_docker.lower() == "y" %} ### Docker -See detailed [cookiecutter-django Docker documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html). +See detailed [cookiecutter-django Docker documentation](https://cookiecutter-django.readthedocs.io/en/latest/3-deployment/deployment-with-docker.html). {%- endif %} {%- if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] %} From 2533f72d612ff1f7ca23b6066cea5ea5fad94ba4 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 22 Oct 2024 06:39:29 +0000 Subject: [PATCH 17/85] 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 31d33c004..807fafba3 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1653,5 +1653,10 @@ "name": "Francisco Navarro Morales ", "github_login": "spothound", "twitter_username": "" + }, + { + "name": "Mariot Tsitoara", + "github_login": "mariot", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b874dc227..0fa915cb5 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1489,6 +1489,13 @@ Listed in alphabetical order. + + Mariot Tsitoara + + mariot + + + Marlon Castillo From edd8a8b31574f8515ed37063515b9f4d2ffb57f9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 07:39:35 +0100 Subject: [PATCH 18/85] Auto-update pre-commit hooks (#5483) 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 98ce32a7f..b5ea9ab7a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.18.0 + rev: v3.19.0 hooks: - id: pyupgrade args: [--py312-plus] From fd05b1de21fbb5d1c14e6cbb93062c69e9542d02 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 23 Oct 2024 01:14:36 +0100 Subject: [PATCH 19/85] Update mypy from 1.11.2 to 1.13.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e13666da1..e74b89398 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.24.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==1.11.2 # https://github.com/python/mypy +mypy==1.13.0 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.1.0 # https://github.com/typeddjango/django-stubs pytest==8.3.3 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar From b4737acb6d5db5e9a186c94208375df6e9db1003 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Oct 2024 02:28:14 +0000 Subject: [PATCH 20/85] Release 2024.10.22 --- CHANGELOG.md | 11 +++++++++++ pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a32286cdf..c9efab044 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.22 + + +### Changed + +- Fix broken links in generated README ([#5482](https://github.com/cookiecutter/cookiecutter-django/pull/5482)) + +### Updated + +- Auto-update pre-commit hooks ([#5483](https://github.com/cookiecutter/cookiecutter-django/pull/5483)) + ## 2024.10.21 diff --git a/pyproject.toml b/pyproject.toml index 49c9d46d2..7aa15b121 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.21" +version = "2024.10.22" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From ceafff014e1fa139e243a040b8b2d02d747bc884 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 23 Oct 2024 23:44:01 -0700 Subject: [PATCH 21/85] Update django-allauth from 65.0.2 to 65.1.0 (#5485) --- {{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 97246b5a4..751455aef 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==5.0.9 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==65.0.2 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==65.1.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.3 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.10 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 244d7ac9cd8bf1a75883652ef35ea2cb2be5e029 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 24 Oct 2024 09:30:20 -0700 Subject: [PATCH 22/85] Update redis to 5.2.0 (#5486) --- {{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 751455aef..ea74cf0d5 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.7.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==5.1.1 # https://github.com/redis/redis-py +redis==5.2.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py {%- endif %} From 109238f746d9dc84590ea86b68ccdb40af199168 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 24 Oct 2024 11:48:35 -0700 Subject: [PATCH 23/85] Update ruff to 0.7.1 (#5487) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 54b59abb7..03adfccfa 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.7.0 + rev: v0.7.1 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e13666da1..a89fadcf5 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.7.0 # https://github.com/astral-sh/ruff +ruff==0.7.1 # https://github.com/astral-sh/ruff coverage==7.6.4 # https://github.com/nedbat/coveragepy djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From fb6549dc4da768b76e696d7b27bc812ff50931f7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 25 Oct 2024 03:25:21 +0100 Subject: [PATCH 24/85] Update werkzeug from 3.0.4 to 3.0.5 --- {{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 a89fadcf5..15e518a85 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ -r production.txt watchdog==4.0.2 # https://github.com/gorakhargosh/watchdog -Werkzeug[watchdog]==3.0.4 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==3.0.5 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg From 33a707dd9f800d08e3abc8c3f6069ec8ee5f13f7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 25 Oct 2024 02:28:42 +0000 Subject: [PATCH 25/85] Release 2024.10.24 --- CHANGELOG.md | 11 +++++++++++ pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9efab044..6e6db6d76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.24 + + +### Updated + +- Update ruff to 0.7.1 ([#5487](https://github.com/cookiecutter/cookiecutter-django/pull/5487)) + +- Update redis to 5.2.0 ([#5486](https://github.com/cookiecutter/cookiecutter-django/pull/5486)) + +- Update django-allauth to 65.1.0 ([#5485](https://github.com/cookiecutter/cookiecutter-django/pull/5485)) + ## 2024.10.22 diff --git a/pyproject.toml b/pyproject.toml index 7aa15b121..623bb2405 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.22" +version = "2024.10.24" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 0384b8f0016275a362de035cfdfe86df927484fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 08:57:01 +0100 Subject: [PATCH 26/85] Auto-update pre-commit hooks (#5490) 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 b5ea9ab7a..203570563 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,7 @@ repos: - id: flake8 - repo: https://github.com/tox-dev/pyproject-fmt - rev: "2.4.3" + rev: "v2.4.3" hooks: - id: pyproject-fmt From 428fac8776b2d9d28468e4c7945c6fdcadb7b251 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 25 Oct 2024 09:01:28 +0100 Subject: [PATCH 27/85] Remove watchdog pin <4 The issue that lead to this pinning should be fixed now: https://github.com/pallets/werkzeug/issues/2945 --- {{cookiecutter.project_slug}}/requirements/local.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 15e518a85..a8a22c742 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,5 @@ -r production.txt -watchdog==4.0.2 # https://github.com/gorakhargosh/watchdog Werkzeug[watchdog]==3.0.5 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} From 60cc312918b9f30a3996890182918ad4bbd56b88 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 26 Oct 2024 02:25:46 +0000 Subject: [PATCH 28/85] Release 2024.10.25 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e6db6d76..42c01036f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.25 + + +### Updated + +- Update werkzeug to 3.0.5 and unpin watchdog<5 ([#5489](https://github.com/cookiecutter/cookiecutter-django/pull/5489)) + ## 2024.10.24 diff --git a/pyproject.toml b/pyproject.toml index 623bb2405..a85e9fb39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.24" +version = "2024.10.25" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 19294ef8a0f4f43fa8e2ec5d107dbdbad9599a8f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 26 Oct 2024 04:57:56 -0700 Subject: [PATCH 29/85] Update werkzeug to 3.0.6 (#5492) --- {{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 a8a22c742..88dfabb44 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r production.txt -Werkzeug[watchdog]==3.0.5 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==3.0.6 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg From e86fd33633d463b41c82a62f40d4382d34767a38 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 26 Oct 2024 20:41:35 +0100 Subject: [PATCH 30/85] Update django-stubs from 5.1.0 to 5.1.1 --- {{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 88dfabb44..4a94bbc0b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.24.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.11.2 # https://github.com/python/mypy -django-stubs[compatible-mypy]==5.1.0 # https://github.com/typeddjango/django-stubs +django-stubs[compatible-mypy]==5.1.1 # https://github.com/typeddjango/django-stubs pytest==8.3.3 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From fb27881b33aabe4273dab9703df0f420db67c70d Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 27 Oct 2024 02:30:32 +0000 Subject: [PATCH 31/85] Release 2024.10.26 --- CHANGELOG.md | 11 +++++++++++ pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42c01036f..8a2dd47fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.26 + + +### Updated + +- Update django-stubs to 5.1.1 ([#5495](https://github.com/cookiecutter/cookiecutter-django/pull/5495)) + +- Update mypy to 1.13.0 ([#5484](https://github.com/cookiecutter/cookiecutter-django/pull/5484)) + +- Update werkzeug to 3.0.6 ([#5492](https://github.com/cookiecutter/cookiecutter-django/pull/5492)) + ## 2024.10.25 diff --git a/pyproject.toml b/pyproject.toml index a85e9fb39..70e3c167c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.25" +version = "2024.10.26" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 4377481f320f354af3f588648f998b498c4bf867 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 28 Oct 2024 15:57:36 +0000 Subject: [PATCH 32/85] Update whitenoise from 6.7.0 to 6.8.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index ea74cf0d5..9d37fac77 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -9,7 +9,7 @@ rcssmin==1.1.2 # https://github.com/ndparker/rcssmin {%- endif %} argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} -whitenoise==6.7.0 # https://github.com/evansd/whitenoise +whitenoise==6.8.1 # https://github.com/evansd/whitenoise {%- endif %} redis==5.2.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From 272ef407d682027e9bb76d214726110c5e035a0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 05:09:08 +0000 Subject: [PATCH 33/85] Bump traefik Bumps traefik from 3.1.6 to 3.2.0. --- updated-dependencies: - dependency-name: traefik dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../compose/production/traefik/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile index f587862e8..9ff5c95cb 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/traefik:3.1.6 +FROM docker.io/traefik:3.2.0 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From b40566e401f382c201ac3b8ae3a194900e537a44 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 29 Oct 2024 12:00:39 +0000 Subject: [PATCH 34/85] Update django-cors-headers from 4.5.0 to 4.6.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9d37fac77..497159c5f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -42,7 +42,7 @@ django-redis==5.4.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework djangorestframework==3.15.2 # https://github.com/encode/django-rest-framework -django-cors-headers==4.5.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==4.6.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation drf-spectacular==0.27.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 571f8787eb50223b6782cf87e0b421b6c8e8887d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 30 Oct 2024 02:28:45 +0000 Subject: [PATCH 35/85] Release 2024.10.29 --- CHANGELOG.md | 11 +++++++++++ pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a2dd47fa..abc10f176 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.29 + + +### Updated + +- Update django-cors-headers to 4.6.0 ([#5499](https://github.com/cookiecutter/cookiecutter-django/pull/5499)) + +- Update whitenoise to 6.8.1 ([#5497](https://github.com/cookiecutter/cookiecutter-django/pull/5497)) + +- Bump traefik from 3.1.6 to 3.2.0 ([#5498](https://github.com/cookiecutter/cookiecutter-django/pull/5498)) + ## 2024.10.26 diff --git a/pyproject.toml b/pyproject.toml index 70e3c167c..dc06f4121 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.26" +version = "2024.10.29" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 9bef46c198d42523f4ec212a989d34281ab7ca93 Mon Sep 17 00:00:00 2001 From: Christian Jensen Date: Wed, 30 Oct 2024 00:13:20 -0700 Subject: [PATCH 36/85] Small spelling correction (#5502) Mimicing > Mimicking --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 7d213067f..8ef7b57c8 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -41,7 +41,7 @@ CACHES = { "LOCATION": REDIS_URL, "OPTIONS": { "CLIENT_CLASS": "django_redis.client.DefaultClient", - # Mimicing memcache behavior. + # Mimicking memcache behavior. # https://github.com/jazzband/django-redis#memcached-exceptions-behavior "IGNORE_EXCEPTIONS": True, }, From 5f9acfdf47de0edb7bbc01becd05d96e808b26d2 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 30 Oct 2024 07:13:42 +0000 Subject: [PATCH 37/85] 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 807fafba3..569eec231 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1658,5 +1658,10 @@ "name": "Mariot Tsitoara", "github_login": "mariot", "twitter_username": "" + }, + { + "name": "Christian Jensen", + "github_login": "jensenbox", + "twitter_username": "cjensen" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0fa915cb5..278cc0ead 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -544,6 +544,13 @@ Listed in alphabetical order. + + Christian Jensen + + jensenbox + + cjensen + Christopher Clarke From 46795883b5f0bbdc382202479d5f2417bfc37edc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 30 Oct 2024 00:47:48 -0700 Subject: [PATCH 38/85] Update whitenoise from 6.8.1 to 6.8.2 (#5501) --- {{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 497159c5f..9a20692df 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -9,7 +9,7 @@ rcssmin==1.1.2 # https://github.com/ndparker/rcssmin {%- endif %} argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} -whitenoise==6.8.1 # https://github.com/evansd/whitenoise +whitenoise==6.8.2 # https://github.com/evansd/whitenoise {%- endif %} redis==5.2.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From 14ba82423e19e829d88de701ddaf2d97b71968c4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 30 Oct 2024 06:19:12 -0700 Subject: [PATCH 39/85] Update djlint to 1.35.3 (#5503) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 03adfccfa..688a1206d 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: ruff-format - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.35.2 + rev: v1.35.3 hooks: - id: djlint-reformat-django - id: djlint-django diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e94a71f5a..098386d14 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ ruff==0.7.1 # https://github.com/astral-sh/ruff coverage==7.6.4 # https://github.com/nedbat/coveragepy -djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint +djlint==1.35.3 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit # Django From 6b7c4aebdab1d9ca5e5b883a61bf5ba840b72498 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 17:01:41 +0000 Subject: [PATCH 40/85] Update pyproject-fmt pre-commit hook to v2.5.0 (#5505) 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 203570563..ca6730558 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,7 @@ repos: - id: flake8 - repo: https://github.com/tox-dev/pyproject-fmt - rev: "v2.4.3" + rev: "v2.5.0" hooks: - id: pyproject-fmt From 4c95392321d49de5396685791320dd01f28e634d Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 31 Oct 2024 02:29:26 +0000 Subject: [PATCH 41/85] Release 2024.10.30 --- CHANGELOG.md | 13 +++++++++++++ pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abc10f176..a71b71ef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.10.30 + + +### Documentation + +- Small spelling correction in comment ([#5502](https://github.com/cookiecutter/cookiecutter-django/pull/5502)) + +### Updated + +- Update djlint to 1.35.3 ([#5503](https://github.com/cookiecutter/cookiecutter-django/pull/5503)) + +- Update whitenoise to 6.8.2 ([#5501](https://github.com/cookiecutter/cookiecutter-django/pull/5501)) + ## 2024.10.29 diff --git a/pyproject.toml b/pyproject.toml index dc06f4121..336cc7075 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.29" +version = "2024.10.30" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 6b8d4dc85686ae3f2e8deaf1154e0be1e8cab8aa Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 31 Oct 2024 19:57:08 +0000 Subject: [PATCH 42/85] Replace docs extra by docs dependency group from PEP 735 (#5493) --- .readthedocs.yaml | 2 +- pyproject.toml | 6 +++-- uv.lock | 61 +++++++++-------------------------------------- 3 files changed, 16 insertions(+), 53 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 45f6183ac..de20c18cc 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -13,7 +13,7 @@ build: - asdf plugin add uv - asdf install uv latest - asdf global uv latest - - uv sync --extra docs --no-dev --frozen + - uv sync --only-group docs --frozen - uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html # Build documentation in the docs/ directory with Sphinx diff --git a/pyproject.toml b/pyproject.toml index 336cc7075..e31f2a081 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,13 +48,15 @@ dependencies = [ "tox==4.21.2", "tox-uv>=1.11.2", ] -optional-dependencies.docs = [ +urls = { Repository = "https://github.com/cookiecutter/cookiecutter-django" } + +[dependency-groups] +docs = [ "myst-parser>=4", "sphinx>=8.0.2", "sphinx-autobuild>=2024.10.3", "sphinx-rtd-theme>=3", ] -urls = { Repository = "https://github.com/cookiecutter/cookiecutter-django" } [tool.black] line-length = 119 diff --git a/uv.lock b/uv.lock index 20b4fa047..c6944c41d 100644 --- a/uv.lock +++ b/uv.lock @@ -95,17 +95,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/fc/83/8353e5c9b01bb46332dac3dfb18e6c597a04ceb085c19c814c2f78a8c0d0/cffi-1.17.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:17c6d6d3260c7f2d94f657e6872591fe8733872a86ed1345bda872cfc8c74885", size = 488388 }, { url = "https://files.pythonhosted.org/packages/73/0c/f9d5ca9a095b1fc88ef77d1f8b85d11151c374144e4606da33874e17b65b/cffi-1.17.0-cp312-cp312-win32.whl", hash = "sha256:c3b8bd3133cd50f6b637bb4322822c94c5ce4bf0d724ed5ae70afce62187c492", size = 172096 }, { url = "https://files.pythonhosted.org/packages/72/21/8c5d285fe20a6e31d29325f1287bb0e55f7d93630a5a44cafdafb5922495/cffi-1.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:dca802c8db0720ce1c49cce1149ff7b06e91ba15fa84b1d59144fef1a1bc7ac2", size = 181478 }, - { url = "https://files.pythonhosted.org/packages/17/8f/581f2f3c3464d5f7cf87c2f7a5ba9acc6976253e02d73804240964243ec2/cffi-1.17.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:6ce01337d23884b21c03869d2f68c5523d43174d4fc405490eb0091057943118", size = 182638 }, - { url = "https://files.pythonhosted.org/packages/8d/1c/c9afa66684b7039f48018eb11b229b659dfb32b7a16b88251bac106dd1ff/cffi-1.17.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:cab2eba3830bf4f6d91e2d6718e0e1c14a2f5ad1af68a89d24ace0c6b17cced7", size = 178453 }, - { url = "https://files.pythonhosted.org/packages/cc/b6/1a134d479d3a5a1ff2fabbee551d1d3f1dd70f453e081b5f70d604aae4c0/cffi-1.17.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:14b9cbc8f7ac98a739558eb86fabc283d4d564dafed50216e7f7ee62d0d25377", size = 454441 }, - { url = "https://files.pythonhosted.org/packages/b1/b4/e1569475d63aad8042b0935dbf62ae2a54d1e9142424e2b0e924d2d4a529/cffi-1.17.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b00e7bcd71caa0282cbe3c90966f738e2db91e64092a877c3ff7f19a1628fdcb", size = 478543 }, - { url = "https://files.pythonhosted.org/packages/d2/40/a9ad03fbd64309dec5bb70bc803a9a6772602de0ee164d7b9a6ca5a89249/cffi-1.17.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:41f4915e09218744d8bae14759f983e466ab69b178de38066f7579892ff2a555", size = 485463 }, - { url = "https://files.pythonhosted.org/packages/a6/1a/f10be60e006dd9242a24bcc2b1cd55c34c578380100f742d8c610f7a5d26/cffi-1.17.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e4760a68cab57bfaa628938e9c2971137e05ce48e762a9cb53b76c9b569f1204", size = 470854 }, - { url = "https://files.pythonhosted.org/packages/cc/b3/c035ed21aa3d39432bd749fe331ee90e4bc83ea2dbed1f71c4bc26c41084/cffi-1.17.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f", size = 479096 }, - { url = "https://files.pythonhosted.org/packages/00/cb/6f7edde01131de9382c89430b8e253b8c8754d66b63a62059663ceafeab2/cffi-1.17.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:a003ac9edc22d99ae1286b0875c460351f4e101f8c9d9d2576e78d7e048f64e0", size = 484013 }, - { url = "https://files.pythonhosted.org/packages/b9/83/8e4e8c211ea940210d293e951bf06b1bfb90f2eeee590e9778e99b4a8676/cffi-1.17.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ef9528915df81b8f4c7612b19b8628214c65c9b7f74db2e34a646a0a2a0da2d4", size = 488119 }, - { url = "https://files.pythonhosted.org/packages/5e/52/3f7cfbc4f444cb4f73ff17b28690d12436dde665f67d68f1e1687908ab6c/cffi-1.17.0-cp313-cp313-win32.whl", hash = "sha256:70d2aa9fb00cf52034feac4b913181a6e10356019b18ef89bc7c12a283bf5f5a", size = 172122 }, - { url = "https://files.pythonhosted.org/packages/94/19/cf5baa07ee0f0e55eab7382459fbddaba0fdb0ba45973dd92556ae0d02db/cffi-1.17.0-cp313-cp313-win_amd64.whl", hash = "sha256:b7b6ea9e36d32582cda3465f54c4b454f62f23cb083ebc7a94e2ca6ef011c3a7", size = 181504 }, ] [[package]] @@ -192,7 +181,7 @@ wheels = [ [[package]] name = "cookiecutter-django" -version = "2024.10.15" +version = "2024.10.24" source = { virtual = "." } dependencies = [ { name = "binaryornot" }, @@ -215,7 +204,7 @@ dependencies = [ { name = "tox-uv" }, ] -[package.optional-dependencies] +[package.dependency-groups] docs = [ { name = "myst-parser" }, { name = "sphinx" }, @@ -231,7 +220,6 @@ requires-dist = [ { name = "djlint", specifier = "==1.35.2" }, { name = "gitpython", specifier = "==3.1.43" }, { name = "jinja2", specifier = "==3.1.4" }, - { name = "myst-parser", marker = "extra == 'docs'", specifier = ">=4" }, { name = "pre-commit", specifier = "==3.8" }, { name = "pygithub", specifier = "==2.4" }, { name = "pytest", specifier = "==8.3.3" }, @@ -240,15 +228,20 @@ requires-dist = [ { name = "pytest-xdist", specifier = "==3.6.1" }, { name = "pyyaml", specifier = "==6.0.2" }, { name = "requests", specifier = "==2.32.3" }, - { name = "ruff", specifier = "==0.7.0" }, + { name = "ruff", specifier = "==0.7" }, { name = "sh", marker = "sys_platform != 'win23'", specifier = "==2.0.7" }, - { name = "sphinx", marker = "extra == 'docs'", specifier = ">=8.0.2" }, - { name = "sphinx-autobuild", marker = "extra == 'docs'", specifier = ">=2024.10.3" }, - { name = "sphinx-rtd-theme", marker = "extra == 'docs'", specifier = ">=3" }, { name = "tox", specifier = "==4.21.2" }, { name = "tox-uv", specifier = ">=1.11.2" }, ] +[package.metadata.dependency-groups] +docs = [ + { name = "myst-parser", specifier = ">=4" }, + { name = "sphinx", specifier = ">=8.0.2" }, + { name = "sphinx-autobuild", specifier = ">=2024.10.3" }, + { name = "sphinx-rtd-theme", specifier = ">=3" }, +] + [[package]] name = "cryptography" version = "43.0.0" @@ -797,15 +790,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/c9/1f/4f998c900485e5c0ef43838363ba4a9723ac0ad73a9dc42068b12aaba4e4/PyYAML-6.0.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b", size = 756611 }, { url = "https://files.pythonhosted.org/packages/df/d1/f5a275fdb252768b7a11ec63585bc38d0e87c9e05668a139fea92b80634c/PyYAML-6.0.2-cp312-cp312-win32.whl", hash = "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4", size = 140591 }, { url = "https://files.pythonhosted.org/packages/0c/e8/4f648c598b17c3d06e8753d7d13d57542b30d56e6c2dedf9c331ae56312e/PyYAML-6.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8", size = 156338 }, - { url = "https://files.pythonhosted.org/packages/ef/e3/3af305b830494fa85d95f6d95ef7fa73f2ee1cc8ef5b495c7c3269fb835f/PyYAML-6.0.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba", size = 181309 }, - { url = "https://files.pythonhosted.org/packages/45/9f/3b1c20a0b7a3200524eb0076cc027a970d320bd3a6592873c85c92a08731/PyYAML-6.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1", size = 171679 }, - { url = "https://files.pythonhosted.org/packages/7c/9a/337322f27005c33bcb656c655fa78325b730324c78620e8328ae28b64d0c/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133", size = 733428 }, - { url = "https://files.pythonhosted.org/packages/a3/69/864fbe19e6c18ea3cc196cbe5d392175b4cf3d5d0ac1403ec3f2d237ebb5/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484", size = 763361 }, - { url = "https://files.pythonhosted.org/packages/04/24/b7721e4845c2f162d26f50521b825fb061bc0a5afcf9a386840f23ea19fa/PyYAML-6.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5", size = 759523 }, - { url = "https://files.pythonhosted.org/packages/2b/b2/e3234f59ba06559c6ff63c4e10baea10e5e7df868092bf9ab40e5b9c56b6/PyYAML-6.0.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc", size = 726660 }, - { url = "https://files.pythonhosted.org/packages/fe/0f/25911a9f080464c59fab9027482f822b86bf0608957a5fcc6eaac85aa515/PyYAML-6.0.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652", size = 751597 }, - { url = "https://files.pythonhosted.org/packages/14/0d/e2c3b43bbce3cf6bd97c840b46088a3031085179e596d4929729d8d68270/PyYAML-6.0.2-cp313-cp313-win32.whl", hash = "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183", size = 140527 }, - { url = "https://files.pythonhosted.org/packages/fa/de/02b54f42487e3d3c6efb3f89428677074ca7bf43aae402517bc7cca949f3/PyYAML-6.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563", size = 156446 }, ] [[package]] @@ -1230,18 +1214,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/44/81/1f701323a9f70805bc81c74c990137123344a80ea23ab9504a99492907f8/watchfiles-0.24.0-cp312-none-win32.whl", hash = "sha256:d9018153cf57fc302a2a34cb7564870b859ed9a732d16b41a9b5cb2ebed2d444", size = 264109 }, { url = "https://files.pythonhosted.org/packages/b4/0b/32cde5bc2ebd9f351be326837c61bdeb05ad652b793f25c91cac0b48a60b/watchfiles-0.24.0-cp312-none-win_amd64.whl", hash = "sha256:551ec3ee2a3ac9cbcf48a4ec76e42c2ef938a7e905a35b42a1267fa4b1645896", size = 277055 }, { url = "https://files.pythonhosted.org/packages/4b/81/daade76ce33d21dbec7a15afd7479de8db786e5f7b7d249263b4ea174e08/watchfiles-0.24.0-cp312-none-win_arm64.whl", hash = "sha256:b52a65e4ea43c6d149c5f8ddb0bef8d4a1e779b77591a458a893eb416624a418", size = 266169 }, - { url = "https://files.pythonhosted.org/packages/30/dc/6e9f5447ae14f645532468a84323a942996d74d5e817837a5c8ce9d16c69/watchfiles-0.24.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:3d2e3ab79a1771c530233cadfd277fcc762656d50836c77abb2e5e72b88e3a48", size = 373764 }, - { url = "https://files.pythonhosted.org/packages/79/c0/c3a9929c372816c7fc87d8149bd722608ea58dc0986d3ef7564c79ad7112/watchfiles-0.24.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:327763da824817b38ad125dcd97595f942d720d32d879f6c4ddf843e3da3fe90", size = 367873 }, - { url = "https://files.pythonhosted.org/packages/2e/11/ff9a4445a7cfc1c98caf99042df38964af12eed47d496dd5d0d90417349f/watchfiles-0.24.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bd82010f8ab451dabe36054a1622870166a67cf3fce894f68895db6f74bbdc94", size = 438381 }, - { url = "https://files.pythonhosted.org/packages/48/a3/763ba18c98211d7bb6c0f417b2d7946d346cdc359d585cc28a17b48e964b/watchfiles-0.24.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d64ba08db72e5dfd5c33be1e1e687d5e4fcce09219e8aee893a4862034081d4e", size = 432809 }, - { url = "https://files.pythonhosted.org/packages/30/4c/616c111b9d40eea2547489abaf4ffc84511e86888a166d3a4522c2ba44b5/watchfiles-0.24.0-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1cf1f6dd7825053f3d98f6d33f6464ebdd9ee95acd74ba2c34e183086900a827", size = 451801 }, - { url = "https://files.pythonhosted.org/packages/b6/be/d7da83307863a422abbfeb12903a76e43200c90ebe5d6afd6a59d158edea/watchfiles-0.24.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:43e3e37c15a8b6fe00c1bce2473cfa8eb3484bbeecf3aefbf259227e487a03df", size = 468886 }, - { url = "https://files.pythonhosted.org/packages/1d/d3/3dfe131ee59d5e90b932cf56aba5c996309d94dafe3d02d204364c23461c/watchfiles-0.24.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:88bcd4d0fe1d8ff43675360a72def210ebad3f3f72cabfeac08d825d2639b4ab", size = 472973 }, - { url = "https://files.pythonhosted.org/packages/42/6c/279288cc5653a289290d183b60a6d80e05f439d5bfdfaf2d113738d0f932/watchfiles-0.24.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:999928c6434372fde16c8f27143d3e97201160b48a614071261701615a2a156f", size = 425282 }, - { url = "https://files.pythonhosted.org/packages/d6/d7/58afe5e85217e845edf26d8780c2d2d2ae77675eeb8d1b8b8121d799ce52/watchfiles-0.24.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:30bbd525c3262fd9f4b1865cb8d88e21161366561cd7c9e1194819e0a33ea86b", size = 612540 }, - { url = "https://files.pythonhosted.org/packages/6d/d5/b96eeb9fe3fda137200dd2f31553670cbc731b1e13164fd69b49870b76ec/watchfiles-0.24.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:edf71b01dec9f766fb285b73930f95f730bb0943500ba0566ae234b5c1618c18", size = 593625 }, - { url = "https://files.pythonhosted.org/packages/c1/e5/c326fe52ee0054107267608d8cea275e80be4455b6079491dfd9da29f46f/watchfiles-0.24.0-cp313-none-win32.whl", hash = "sha256:f4c96283fca3ee09fb044f02156d9570d156698bc3734252175a38f0e8975f07", size = 263899 }, - { url = "https://files.pythonhosted.org/packages/a6/8b/8a7755c5e7221bb35fe4af2dc44db9174f90ebf0344fd5e9b1e8b42d381e/watchfiles-0.24.0-cp313-none-win_amd64.whl", hash = "sha256:a974231b4fdd1bb7f62064a0565a6b107d27d21d9acb50c484d2cdba515b9366", size = 276622 }, ] [[package]] @@ -1261,17 +1233,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/5c/f1/a29dd6046d3a722d26f182b783a7997d25298873a14028c4760347974ea3/websockets-13.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a9dcaf8b0cc72a392760bb8755922c03e17a5a54e08cca58e8b74f6902b433cf", size = 164686 }, { url = "https://files.pythonhosted.org/packages/0f/99/ab1cdb282f7e595391226f03f9b498f52109d25a2ba03832e21614967dfa/websockets-13.1-cp312-cp312-win32.whl", hash = "sha256:2f85cf4f2a1ba8f602298a853cec8526c2ca42a9a4b947ec236eaedb8f2dc80c", size = 158712 }, { url = "https://files.pythonhosted.org/packages/46/93/e19160db48b5581feac8468330aa11b7292880a94a37d7030478596cc14e/websockets-13.1-cp312-cp312-win_amd64.whl", hash = "sha256:38377f8b0cdeee97c552d20cf1865695fcd56aba155ad1b4ca8779a5b6ef4ac3", size = 159145 }, - { url = "https://files.pythonhosted.org/packages/51/20/2b99ca918e1cbd33c53db2cace5f0c0cd8296fc77558e1908799c712e1cd/websockets-13.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:a9ab1e71d3d2e54a0aa646ab6d4eebfaa5f416fe78dfe4da2839525dc5d765c6", size = 157828 }, - { url = "https://files.pythonhosted.org/packages/b8/47/0932a71d3d9c0e9483174f60713c84cee58d62839a143f21a2bcdbd2d205/websockets-13.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b9d7439d7fab4dce00570bb906875734df13d9faa4b48e261c440a5fec6d9708", size = 155487 }, - { url = "https://files.pythonhosted.org/packages/a9/60/f1711eb59ac7a6c5e98e5637fef5302f45b6f76a2c9d64fd83bbb341377a/websockets-13.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:327b74e915cf13c5931334c61e1a41040e365d380f812513a255aa804b183418", size = 155721 }, - { url = "https://files.pythonhosted.org/packages/6a/e6/ba9a8db7f9d9b0e5f829cf626ff32677f39824968317223605a6b419d445/websockets-13.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:325b1ccdbf5e5725fdcb1b0e9ad4d2545056479d0eee392c291c1bf76206435a", size = 165609 }, - { url = "https://files.pythonhosted.org/packages/c1/22/4ec80f1b9c27a0aebd84ccd857252eda8418ab9681eb571b37ca4c5e1305/websockets-13.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:346bee67a65f189e0e33f520f253d5147ab76ae42493804319b5716e46dddf0f", size = 164556 }, - { url = "https://files.pythonhosted.org/packages/27/ac/35f423cb6bb15600438db80755609d27eda36d4c0b3c9d745ea12766c45e/websockets-13.1-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:91a0fa841646320ec0d3accdff5b757b06e2e5c86ba32af2e0815c96c7a603c5", size = 164993 }, - { url = "https://files.pythonhosted.org/packages/31/4e/98db4fd267f8be9e52e86b6ee4e9aa7c42b83452ea0ea0672f176224b977/websockets-13.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:18503d2c5f3943e93819238bf20df71982d193f73dcecd26c94514f417f6b135", size = 165360 }, - { url = "https://files.pythonhosted.org/packages/3f/15/3f0de7cda70ffc94b7e7024544072bc5b26e2c1eb36545291abb755d8cdb/websockets-13.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:a9cd1af7e18e5221d2878378fbc287a14cd527fdd5939ed56a18df8a31136bb2", size = 164745 }, - { url = "https://files.pythonhosted.org/packages/a1/6e/66b6b756aebbd680b934c8bdbb6dcb9ce45aad72cde5f8a7208dbb00dd36/websockets-13.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:70c5be9f416aa72aab7a2a76c90ae0a4fe2755c1816c153c1a2bcc3333ce4ce6", size = 164732 }, - { url = "https://files.pythonhosted.org/packages/35/c6/12e3aab52c11aeb289e3dbbc05929e7a9d90d7a9173958477d3ef4f8ce2d/websockets-13.1-cp313-cp313-win32.whl", hash = "sha256:624459daabeb310d3815b276c1adef475b3e6804abaf2d9d2c061c319f7f187d", size = 158709 }, - { url = "https://files.pythonhosted.org/packages/41/d8/63d6194aae711d7263df4498200c690a9c39fb437ede10f3e157a6343e0d/websockets-13.1-cp313-cp313-win_amd64.whl", hash = "sha256:c518e84bb59c2baae725accd355c8dc517b4a3ed8db88b4bc93c78dae2974bf2", size = 159144 }, { url = "https://files.pythonhosted.org/packages/56/27/96a5cd2626d11c8280656c6c71d8ab50fe006490ef9971ccd154e0c42cd2/websockets-13.1-py3-none-any.whl", hash = "sha256:a9a396a6ad26130cdae92ae10c36af09d9bfe6cafe69670fd3b6da9b07b4044f", size = 152134 }, ] From 8d5a4269fc0235b747667d10e1bc171d5ccd6512 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 09:55:01 +0000 Subject: [PATCH 43/85] Bump amazon/aws-cli from 2.18.1 to 2.19.0 (#5507) 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 c63ea74e4..5a6be94da 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.18.1 +FROM docker.io/amazon/aws-cli:2.19.0 # Clear entrypoint from the base image, otherwise it's always calling the aws CLI ENTRYPOINT [] From 33a7478559051672f95ef3adaae7ee4bca0e2ae0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 1 Nov 2024 05:21:39 -0700 Subject: [PATCH 44/85] Update djlint to 1.35.4 (#5508) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 688a1206d..3cc898aba 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: ruff-format - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.35.3 + rev: v1.35.4 hooks: - id: djlint-reformat-django - id: djlint-django diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 098386d14..7fcd85ac8 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ ruff==0.7.1 # https://github.com/astral-sh/ruff coverage==7.6.4 # https://github.com/nedbat/coveragepy -djlint==1.35.3 # https://github.com/Riverside-Healthcare/djLint +djlint==1.35.4 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit # Django From f2a45a3ee7724add4f75c071ae4b7286221296ad Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 2 Nov 2024 02:26:45 +0000 Subject: [PATCH 45/85] Release 2024.11.01 --- CHANGELOG.md | 9 +++++++++ pyproject.toml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a71b71ef1..613580f9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.11.01 + + +### Updated + +- Update djlint to 1.35.4 ([#5508](https://github.com/cookiecutter/cookiecutter-django/pull/5508)) + +- Bump amazon/aws-cli from 2.18.1 to 2.19.0 ([#5507](https://github.com/cookiecutter/cookiecutter-django/pull/5507)) + ## 2024.10.30 diff --git a/pyproject.toml b/pyproject.toml index e31f2a081..4c4a1f2c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.30" +version = "2024.11.01" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 5136d3da9928a674f006ffe2e35b249ce6f25a55 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 2 Nov 2024 11:51:49 -0700 Subject: [PATCH 46/85] Update ruff to 0.7.2 (#5510) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 3cc898aba..907b326e6 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.7.1 + rev: v0.7.2 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7fcd85ac8..a6e0eb4a4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.7.1 # https://github.com/astral-sh/ruff +ruff==0.7.2 # https://github.com/astral-sh/ruff coverage==7.6.4 # https://github.com/nedbat/coveragepy djlint==1.35.4 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From 51ce5427966773b3bf4b09b68570cfcc5109e719 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 3 Nov 2024 02:30:16 +0000 Subject: [PATCH 47/85] Release 2024.11.02 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 613580f9f..ca0f0beae 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.11.02 + + +### Updated + +- Update ruff to 0.7.2 ([#5510](https://github.com/cookiecutter/cookiecutter-django/pull/5510)) + ## 2024.11.01 diff --git a/pyproject.toml b/pyproject.toml index 4c4a1f2c1..80e0e4410 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.01" +version = "2024.11.02" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From dd981120517cfa2bffbb13dbe1c836687d881196 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 4 Nov 2024 10:09:28 -0800 Subject: [PATCH 48/85] Update sentry-sdk to 2.18.0 (#5515) --- {{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 b6f22db45..bf2bc3fe1 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.17.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.18.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py From 06bfd2ebaa3b012f3f3be5dbafb155726674d2e6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 5 Nov 2024 02:26:45 +0000 Subject: [PATCH 49/85] Release 2024.11.04 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca0f0beae..03122a47b 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.11.04 + + +### Updated + +- Update sentry-sdk to 2.18.0 ([#5515](https://github.com/cookiecutter/cookiecutter-django/pull/5515)) + ## 2024.11.02 diff --git a/pyproject.toml b/pyproject.toml index 80e0e4410..84b8cd081 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.02" +version = "2024.11.04" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 1e0c9ff2c1afad7646a7b642a4a1a3a675c148f9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 5 Nov 2024 00:21:05 -0800 Subject: [PATCH 50/85] Update djlint to 1.36.0 (#5517) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 907b326e6..6870cc1fe 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: ruff-format - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.35.4 + rev: v1.36.0 hooks: - id: djlint-reformat-django - id: djlint-django diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index a6e0eb4a4..451d123b2 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ ruff==0.7.2 # https://github.com/astral-sh/ruff coverage==7.6.4 # https://github.com/nedbat/coveragepy -djlint==1.35.4 # https://github.com/Riverside-Healthcare/djLint +djlint==1.36.0 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit # Django From f8954e8a47d78a989578ca855a8423be761b2137 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Nov 2024 02:26:15 +0000 Subject: [PATCH 51/85] Release 2024.11.05 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03122a47b..3ba3d4eab 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.11.05 + + +### Updated + +- Update djlint to 1.36.0 ([#5517](https://github.com/cookiecutter/cookiecutter-django/pull/5517)) + ## 2024.11.04 diff --git a/pyproject.toml b/pyproject.toml index 84b8cd081..01cdafba4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.04" +version = "2024.11.05" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 8d6c8ebed11aa9dc12fa670679d191bd8a116dd6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 7 Nov 2024 11:43:37 -0800 Subject: [PATCH 52/85] Update djlint to 1.36.1 (#5519) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 6870cc1fe..f742b7ae5 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: ruff-format - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.36.0 + rev: v1.36.1 hooks: - id: djlint-reformat-django - id: djlint-django diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 451d123b2..326d09d56 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ ruff==0.7.2 # https://github.com/astral-sh/ruff coverage==7.6.4 # https://github.com/nedbat/coveragepy -djlint==1.36.0 # https://github.com/Riverside-Healthcare/djLint +djlint==1.36.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit # Django From 4e506b44f18d72fadd81dfcdcb5aab8fada50bb9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 8 Nov 2024 02:26:52 +0000 Subject: [PATCH 53/85] Release 2024.11.07 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ba3d4eab..952afd187 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.11.07 + + +### Updated + +- Update djlint to 1.36.1 ([#5519](https://github.com/cookiecutter/cookiecutter-django/pull/5519)) + ## 2024.11.05 diff --git a/pyproject.toml b/pyproject.toml index 01cdafba4..9200c65e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.05" +version = "2024.11.07" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From b932c9bf15d666848ad8827e03297919cef5afd8 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 8 Nov 2024 13:51:11 +0000 Subject: [PATCH 54/85] Update django-allauth from 65.1.0 to 65.2.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9a20692df..5844ae94b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==5.0.9 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==65.1.0 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==65.2.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.3 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.10 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From cf375e934bca545604a3c0e1257c98bf1ef21548 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 9 Nov 2024 02:23:39 +0000 Subject: [PATCH 55/85] Release 2024.11.08 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 952afd187..bb2cb8eb4 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.11.08 + + +### Updated + +- Update ruff pre-commit hook to 0.7.3 ([#5522](https://github.com/cookiecutter/cookiecutter-django/pull/5522)) + ## 2024.11.07 diff --git a/pyproject.toml b/pyproject.toml index 9200c65e4..9f73f3741 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.07" +version = "2024.11.08" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 555872e1c93591d6594c6e6d9d0c41e16a573cb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:04:53 +0000 Subject: [PATCH 56/85] Bump amazon/aws-cli from 2.19.0 to 2.20.0 (#5527) --- {{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 5a6be94da..b7b6ba534 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.19.0 +FROM docker.io/amazon/aws-cli:2.20.0 # Clear entrypoint from the base image, otherwise it's always calling the aws CLI ENTRYPOINT [] From 73f41e2425fac16506e3d1aa033d80f459d1fde6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 13 Nov 2024 02:05:52 -0800 Subject: [PATCH 57/85] Update ruff to 0.7.3 (#5521) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index f742b7ae5..2d84c6071 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.7.2 + rev: v0.7.3 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 326d09d56..82eac45a3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.7.2 # https://github.com/astral-sh/ruff +ruff==0.7.3 # https://github.com/astral-sh/ruff coverage==7.6.4 # https://github.com/nedbat/coveragepy djlint==1.36.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From c5988b5c3c1a908a4e54b16957c0310e8db80488 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 13 Nov 2024 02:38:33 -0800 Subject: [PATCH 58/85] Update werkzeug to 3.1.3 (#5524) --- {{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 82eac45a3..f6885618b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r production.txt -Werkzeug[watchdog]==3.0.6 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==3.1.3 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg From 08ba595f87d2caeb67fc6ec7e6fe7303685422e1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Nov 2024 02:28:06 +0000 Subject: [PATCH 59/85] Release 2024.11.13 --- CHANGELOG.md | 13 +++++++++++++ pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb2cb8eb4..75f8b2183 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.11.13 + + +### Updated + +- Update werkzeug to 3.1.3 ([#5524](https://github.com/cookiecutter/cookiecutter-django/pull/5524)) + +- Update ruff to 0.7.3 ([#5521](https://github.com/cookiecutter/cookiecutter-django/pull/5521)) + +- Bump amazon/aws-cli from 2.19.0 to 2.20.0 ([#5527](https://github.com/cookiecutter/cookiecutter-django/pull/5527)) + +- Update django-allauth to 65.2.0 ([#5523](https://github.com/cookiecutter/cookiecutter-django/pull/5523)) + ## 2024.11.08 diff --git a/pyproject.toml b/pyproject.toml index 9f73f3741..e713f269a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.08" +version = "2024.11.13" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From e03b0b0c7ee5c4b5d938e2198218bfcdf30c8e8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 07:56:59 +0000 Subject: [PATCH 60/85] Bump amazon/aws-cli (#5528) --- {{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 b7b6ba534..6d8e38e24 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.20.0 +FROM docker.io/amazon/aws-cli:2.21.0 # Clear entrypoint from the base image, otherwise it's always calling the aws CLI ENTRYPOINT [] From d3ffe31bd02b51be4441fab154ed7decbbe4616c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 15 Nov 2024 02:30:57 +0000 Subject: [PATCH 61/85] Release 2024.11.14 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75f8b2183..f9a6616aa 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.11.14 + + +### Updated + +- Bump amazon/aws-cli from 2.20.0 to 2.21.0 ([#5528](https://github.com/cookiecutter/cookiecutter-django/pull/5528)) + ## 2024.11.13 diff --git a/pyproject.toml b/pyproject.toml index e713f269a..6e28aff8c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.13" +version = "2024.11.14" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 1b9f3e7a4805f210919f21d126b68cacfc3927df Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 15 Nov 2024 01:46:37 -0800 Subject: [PATCH 62/85] Update coverage to 7.6.5 (#5529) --- {{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 f6885618b..29b1e940b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.7.3 # https://github.com/astral-sh/ruff -coverage==7.6.4 # https://github.com/nedbat/coveragepy +coverage==7.6.5 # https://github.com/nedbat/coveragepy djlint==1.36.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From 0bb37a3f1f8a5bfa11a4328c626148d43bc334a7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 16 Nov 2024 02:29:26 +0000 Subject: [PATCH 63/85] Release 2024.11.15 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a6616aa..d8c666954 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.11.15 + + +### Updated + +- Update coverage to 7.6.5 ([#5529](https://github.com/cookiecutter/cookiecutter-django/pull/5529)) + ## 2024.11.14 diff --git a/pyproject.toml b/pyproject.toml index 6e28aff8c..70a94b113 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.14" +version = "2024.11.15" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From c357d9ef330122b1e574b8770ca9c7c59c816beb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 16 Nov 2024 03:00:01 -0800 Subject: [PATCH 64/85] Update ruff to 0.7.4 (#5531) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 2d84c6071..90f2bda19 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.7.3 + rev: v0.7.4 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 29b1e940b..ba1136660 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.7.3 # https://github.com/astral-sh/ruff +ruff==0.7.4 # https://github.com/astral-sh/ruff coverage==7.6.5 # https://github.com/nedbat/coveragepy djlint==1.36.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From 3b490ffd2fd2e0f6d0bc99264c10c3d696914aa5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 17 Nov 2024 02:31:56 +0000 Subject: [PATCH 65/85] Release 2024.11.16 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8c666954..f3e0da814 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.11.16 + + +### Updated + +- Update ruff to 0.7.4 ([#5531](https://github.com/cookiecutter/cookiecutter-django/pull/5531)) + ## 2024.11.15 diff --git a/pyproject.toml b/pyproject.toml index 70a94b113..6461fe041 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.15" +version = "2024.11.16" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 28ec06556165e5dc99743162e91fab926e7289fe Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 19 Nov 2024 07:42:58 +0000 Subject: [PATCH 66/85] Fix broken links in README Fix #5535 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3b42a5e1b..a46f214b4 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Powered by [Cookiecutter](https://github.com/cookiecutter/cookiecutter), Cookiec production-ready Django projects quickly. - Documentation: -- See [Troubleshooting](https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html) for common errors and obstacles +- See [Troubleshooting](https://cookiecutter-django.readthedocs.io/en/latest/5-help/troubleshooting.html) for common errors and obstacles - If you have problems with Cookiecutter Django, please open [issues](https://github.com/cookiecutter/cookiecutter-django/issues/new) don't send emails to the maintainers. @@ -94,7 +94,7 @@ You'll be prompted for some values. Provide them, then a Django project will be **Warning**: After this point, change 'Daniel Greenfeld', 'pydanny', etc to your own information. -Answer the prompts with your own desired [options](http://cookiecutter-django.readthedocs.io/en/latest/project-generation-options.html). For example: +Answer the prompts with your own desired [options](http://cookiecutter-django.readthedocs.io/en/latest/1-getting-started/project-generation-options.html). For example: Cloning into 'cookiecutter-django'... remote: Counting objects: 550, done. From c97df5f755cfe8ea29188d146225bb1f865995ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 08:50:57 +0000 Subject: [PATCH 67/85] Bump amazon/aws-cli (#5537) --- {{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 6d8e38e24..b63e486fb 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.21.0 +FROM docker.io/amazon/aws-cli:2.22.1 # Clear entrypoint from the base image, otherwise it's always calling the aws CLI ENTRYPOINT [] From f440144fde5599e6babf390f9203f0a590df0ad7 Mon Sep 17 00:00:00 2001 From: Denis Darii Date: Wed, 20 Nov 2024 17:25:04 +0100 Subject: [PATCH 68/85] Fix typos in translation instructions in README (#5538) --- {{cookiecutter.project_slug}}/locale/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/locale/README.md b/{{cookiecutter.project_slug}}/locale/README.md index 7cb6876ad..9ee59d3ef 100644 --- a/{{cookiecutter.project_slug}}/locale/README.md +++ b/{{cookiecutter.project_slug}}/locale/README.md @@ -1,6 +1,6 @@ # Translations -Start by configuring the `LANGUAGES` settings in `base.py`, by uncommenting languages you are willing to support. Then, translations strings will be placed in this folder when running: +Start by configuring the `LANGUAGES` settings in `base.py`, by uncommenting languages you are willing to support. Then, translation strings will be placed in this folder when running: ```bash {% if cookiecutter.use_docker == 'y' %}docker compose -f docker-compose.local.yml run --rm django {% endif %}python manage.py makemessages --all --no-location @@ -19,7 +19,7 @@ Once all translations are done, they need to be compiled into `.mo` files (stand {% if cookiecutter.use_docker == 'y' %}docker compose -f docker-compose.local.yml run --rm django {% endif %}python manage.py compilemessages ``` -Note that the `.po` files are NOT used by the application directly, so if the `.mo` files are out of dates, the content won't appear as translated even if the `.po` files are up-to-date. +Note that the `.po` files are NOT used by the application directly, so if the `.mo` files are out of date, the content won't appear as translated even if the `.po` files are up-to-date. ## Production From 6215f1738280d48f32b47588e83e11f2a610d924 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 20 Nov 2024 16:25:27 +0000 Subject: [PATCH 69/85] 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 569eec231..ff72490df 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1663,5 +1663,10 @@ "name": "Christian Jensen", "github_login": "jensenbox", "twitter_username": "cjensen" + }, + { + "name": "Denis Darii", + "github_login": "DNX", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 278cc0ead..2824ae73b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -733,6 +733,13 @@ Listed in alphabetical order. + + Denis Darii + + DNX + + + Denis Orehovsky From b1de740dff3e82eb0d0370d7e60cccb40814f254 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 21 Nov 2024 02:30:23 +0000 Subject: [PATCH 70/85] Release 2024.11.20 --- CHANGELOG.md | 11 +++++++++++ pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3e0da814..f60f6bd56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.11.20 + + +### Fixed + +- Fix typos in translation instructions in README ([#5538](https://github.com/cookiecutter/cookiecutter-django/pull/5538)) + +### Updated + +- Bump amazon/aws-cli from 2.21.0 to 2.22.1 ([#5537](https://github.com/cookiecutter/cookiecutter-django/pull/5537)) + ## 2024.11.16 diff --git a/pyproject.toml b/pyproject.toml index 6461fe041..2d57bdc47 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.16" +version = "2024.11.20" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From dc8a470a8f978391af88bfeb3ae51b992918a238 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 12:29:07 +0000 Subject: [PATCH 71/85] Bump traefik from 3.2.0 to 3.2.1 (#5541) --- .../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 9ff5c95cb..1849971da 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/traefik:3.2.0 +FROM docker.io/traefik:3.2.1 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From d00cd42e6cb9dc39527533e8064b18d15a2cbcd1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Nov 2024 04:29:46 -0800 Subject: [PATCH 72/85] Update uvicorn to 0.32.1 (#5539) --- {{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 5844ae94b..056f960c2 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.32.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.32.1 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From 7fc33c2a23bd162fd027ff3a9de7f24844fb8742 Mon Sep 17 00:00:00 2001 From: qwerrrqw Date: Thu, 21 Nov 2024 21:54:50 +0900 Subject: [PATCH 73/85] Add support for secure Redis (TLS support) (#5526) --- docs/3-deployment/deployment-on-heroku.rst | 1 + uv.lock | 6 +++--- {{cookiecutter.project_slug}}/config/settings/base.py | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/3-deployment/deployment-on-heroku.rst b/docs/3-deployment/deployment-on-heroku.rst index 75bf76936..292946ba3 100644 --- a/docs/3-deployment/deployment-on-heroku.rst +++ b/docs/3-deployment/deployment-on-heroku.rst @@ -14,6 +14,7 @@ Run these commands to deploy the project to Heroku: # Note: this is not a free plan heroku addons:create heroku-postgresql:essential-0 + # On Windows use double quotes for the time zone, e.g. # heroku pg:backups schedule --at "02:00 America/Los_Angeles" DATABASE_URL heroku pg:backups schedule --at '02:00 America/Los_Angeles' DATABASE_URL diff --git a/uv.lock b/uv.lock index c6944c41d..cbd2fe272 100644 --- a/uv.lock +++ b/uv.lock @@ -181,7 +181,7 @@ wheels = [ [[package]] name = "cookiecutter-django" -version = "2024.10.24" +version = "2024.11.20" source = { virtual = "." } dependencies = [ { name = "binaryornot" }, @@ -204,7 +204,7 @@ dependencies = [ { name = "tox-uv" }, ] -[package.dependency-groups] +[package.dev-dependencies] docs = [ { name = "myst-parser" }, { name = "sphinx" }, @@ -234,7 +234,7 @@ requires-dist = [ { name = "tox-uv", specifier = ">=1.11.2" }, ] -[package.metadata.dependency-groups] +[package.metadata.requires-dev] docs = [ { name = "myst-parser", specifier = ">=4" }, { name = "sphinx", specifier = ">=8.0.2" }, diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 97a4c42b9..ed34a90ea 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -1,6 +1,9 @@ # ruff: noqa: ERA001, E501 """Base settings to build other settings files upon.""" +{% if cookiecutter.use_celery == 'y' -%} +import ssl +{%- endif %} from pathlib import Path import environ @@ -283,6 +286,7 @@ LOGGING = { } REDIS_URL = env("REDIS_URL", default="redis://{% if cookiecutter.use_docker == 'y' %}redis{%else%}localhost{% endif %}:6379/0") +REDIS_SSL = REDIS_URL.startswith("rediss://") {% if cookiecutter.use_celery == 'y' -%} # Celery @@ -292,8 +296,12 @@ if USE_TZ: CELERY_TIMEZONE = TIME_ZONE # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-broker_url CELERY_BROKER_URL = REDIS_URL +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#redis-backend-use-ssl +CELERY_BROKER_USE_SSL = {"ssl_cert_reqs": ssl.CERT_NONE} if REDIS_SSL else None # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend CELERY_RESULT_BACKEND = REDIS_URL +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#redis-backend-use-ssl +CELERY_REDIS_BACKEND_USE_SSL = CELERY_BROKER_USE_SSL # https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended CELERY_RESULT_EXTENDED = True # https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-backend-always-retry From cbead91fdc6272dbb425317eea94519678325ce5 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 21 Nov 2024 12:55:15 +0000 Subject: [PATCH 74/85] 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 ff72490df..c3e1e4687 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1668,5 +1668,10 @@ "name": "Denis Darii", "github_login": "DNX", "twitter_username": "" + }, + { + "name": "qwerrrqw", + "github_login": "qwerrrqw", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 2824ae73b..d2dde0bf9 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1895,6 +1895,13 @@ Listed in alphabetical order. + + qwerrrqw + + qwerrrqw + + + Raony Guimarães Corrêa From aca580df0095bd46bf048b967b522a704bab6e00 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Nov 2024 10:16:44 -0800 Subject: [PATCH 75/85] Update sentry-sdk to 2.19.0 (#5543) --- {{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 bf2bc3fe1..74ff33fc3 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.18.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.19.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py From be2fdb2984313e821672452951e7ba897260d39a Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 22 Nov 2024 02:30:53 +0000 Subject: [PATCH 76/85] Release 2024.11.21 --- CHANGELOG.md | 15 +++++++++++++++ pyproject.toml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f60f6bd56..7fcfb4839 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.11.21 + + +### Changed + +- Add support for secure Redis (TLS support) ([#5526](https://github.com/cookiecutter/cookiecutter-django/pull/5526)) + +### Updated + +- Update sentry-sdk to 2.19.0 ([#5543](https://github.com/cookiecutter/cookiecutter-django/pull/5543)) + +- Update uvicorn to 0.32.1 ([#5539](https://github.com/cookiecutter/cookiecutter-django/pull/5539)) + +- Bump traefik from 3.2.0 to 3.2.1 ([#5541](https://github.com/cookiecutter/cookiecutter-django/pull/5541)) + ## 2024.11.20 diff --git a/pyproject.toml b/pyproject.toml index 2d57bdc47..db24cbcd1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.20" +version = "2024.11.21" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From b09ee5be8a8b562f86d76a1cf364cdcc1f021d7d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 22 Nov 2024 04:48:20 -0800 Subject: [PATCH 77/85] Update ruff to 0.8.0 (#5545) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 90f2bda19..8ad68029a 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.7.4 + rev: v0.8.0 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index ba1136660..c9a517d48 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.7.4 # https://github.com/astral-sh/ruff +ruff==0.8.0 # https://github.com/astral-sh/ruff coverage==7.6.5 # https://github.com/nedbat/coveragepy djlint==1.36.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From 4617cd2212feea453f16cd3e4b89343d22f3b8ad Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 23 Nov 2024 02:28:37 +0000 Subject: [PATCH 78/85] Release 2024.11.22 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fcfb4839..8bd0d0e4c 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.11.22 + + +### Updated + +- Update ruff to 0.8.0 ([#5545](https://github.com/cookiecutter/cookiecutter-django/pull/5545)) + ## 2024.11.21 diff --git a/pyproject.toml b/pyproject.toml index db24cbcd1..4402046fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.21" +version = "2024.11.22" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 575d4c38093a90ec9f311eeb570cdda33121738e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:47:25 +0000 Subject: [PATCH 79/85] Bump astral-sh/setup-uv from 3 to 4 (#5549) --- .github/workflows/ci.yml | 6 +++--- .github/workflows/dependabot-uv-lock.yml | 2 +- .github/workflows/django-issue-checker.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44e31e598..0c269fa1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install uv - uses: astral-sh/setup-uv@v3 + uses: astral-sh/setup-uv@v4 with: enable-cache: "true" - name: Install dependencies @@ -55,7 +55,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install uv - uses: astral-sh/setup-uv@v3 + uses: astral-sh/setup-uv@v4 with: enable-cache: "true" - name: Install dependencies @@ -102,7 +102,7 @@ jobs: with: python-version: "3.12" - name: Install uv - uses: astral-sh/setup-uv@v3 + uses: astral-sh/setup-uv@v4 with: enable-cache: "true" - name: Install dependencies diff --git a/.github/workflows/dependabot-uv-lock.yml b/.github/workflows/dependabot-uv-lock.yml index 73fb88130..fe627f0b7 100644 --- a/.github/workflows/dependabot-uv-lock.yml +++ b/.github/workflows/dependabot-uv-lock.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 if: ${{ env.GH_PAT == '' }} - - uses: astral-sh/setup-uv@v3 + - uses: astral-sh/setup-uv@v4 with: enable-cache: true - run: uv lock diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml index 1d6de4332..971f8d811 100644 --- a/.github/workflows/django-issue-checker.yml +++ b/.github/workflows/django-issue-checker.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install uv - uses: astral-sh/setup-uv@v3 + uses: astral-sh/setup-uv@v4 with: enable-cache: "true" - name: Create Django Major Issue diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 7ba569380..4788fc692 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install uv - uses: astral-sh/setup-uv@v3 + uses: astral-sh/setup-uv@v4 with: enable-cache: "true" - name: Set git details diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 1073fa4be..fc4e6dc8a 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install uv - uses: astral-sh/setup-uv@v3 + uses: astral-sh/setup-uv@v4 with: enable-cache: "true" - name: Update list From c05770a4dc6eb1b3cbfe3d30adc52358fc146ca2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 26 Nov 2024 09:51:57 -0800 Subject: [PATCH 80/85] Update watchfiles to 1.0.0 (#5548) --- {{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 c9a517d48..0a165de02 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.3 # https://github.com/psycopg/psycopg psycopg[binary]==3.2.3 # https://github.com/psycopg/psycopg {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.24.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==1.0.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From 07061b6e2f5ebd93ac82ed34a66d63d4e712118b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 26 Nov 2024 09:52:16 -0800 Subject: [PATCH 81/85] Update coverage to 7.6.8 (#5547) --- {{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 0a165de02..966a0768d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.8.0 # https://github.com/astral-sh/ruff -coverage==7.6.5 # https://github.com/nedbat/coveragepy +coverage==7.6.8 # https://github.com/nedbat/coveragepy djlint==1.36.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==4.0.1 # https://github.com/pre-commit/pre-commit From c02a16d6bfe2e6d5e6baba2381bcd0d1bf130004 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Nov 2024 02:32:12 +0000 Subject: [PATCH 82/85] Release 2024.11.26 --- CHANGELOG.md | 9 +++++++++ pyproject.toml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bd0d0e4c..1b79f5a0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.11.26 + + +### Updated + +- Update coverage to 7.6.8 ([#5547](https://github.com/cookiecutter/cookiecutter-django/pull/5547)) + +- Update watchfiles to 1.0.0 ([#5548](https://github.com/cookiecutter/cookiecutter-django/pull/5548)) + ## 2024.11.22 diff --git a/pyproject.toml b/pyproject.toml index 4402046fc..c0d490b68 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.11.22" +version = "2024.11.26" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 0de4a2f6eb9ac2abc4b3d467a341ed9463c0f2b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:27:50 +0000 Subject: [PATCH 83/85] Bump gulp from 4.0.2 to 5.0.0 (#4949) --- hooks/post_gen_project.py | 4 +- .../{gulpfile.js => gulpfile.mjs} | 61 ++++++++++--------- {{cookiecutter.project_slug}}/package.json | 2 +- 3 files changed, 36 insertions(+), 31 deletions(-) rename {{cookiecutter.project_slug}}/{gulpfile.js => gulpfile.mjs} (77%) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 081e806c5..ca1ffad32 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -114,7 +114,7 @@ def remove_sass_files(): def remove_gulp_files(): - file_names = ["gulpfile.js"] + file_names = ["gulpfile.mjs"] for file_name in file_names: os.remove(file_name) @@ -179,7 +179,7 @@ def handle_js_runner(choice, use_docker, use_async): remove_keys=["babel"], scripts={ "dev": "gulp", - "build": "gulp generate-assets", + "build": "gulp build", }, ) remove_webpack_files() diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.mjs similarity index 77% rename from {{cookiecutter.project_slug}}/gulpfile.js rename to {{cookiecutter.project_slug}}/gulpfile.mjs index ee6e70282..8fee32dc7 100644 --- a/{{cookiecutter.project_slug}}/gulpfile.js +++ b/{{cookiecutter.project_slug}}/gulpfile.mjs @@ -3,28 +3,33 @@ //////////////////////////////// // Gulp and package -const { src, dest, parallel, series, watch } = require('gulp'); -const pjson = require('./package.json'); +import { src, dest, parallel, series, task, watch } from 'gulp'; +import pjson from './package.json' with {type: 'json'}; // Plugins -const autoprefixer = require('autoprefixer'); -const browserSync = require('browser-sync').create(); -const concat = require('gulp-concat'); -const tildeImporter = require('node-sass-tilde-importer'); -const cssnano = require('cssnano'); -const imagemin = require('gulp-imagemin'); -const pixrem = require('pixrem'); -const plumber = require('gulp-plumber'); -const postcss = require('gulp-postcss'); +import autoprefixer from 'autoprefixer'; +import browserSyncLib from 'browser-sync'; +import concat from 'gulp-concat'; +import tildeImporter from 'node-sass-tilde-importer'; +import cssnano from 'cssnano'; +import imagemin from 'gulp-imagemin'; +import pixrem from 'pixrem'; +import plumber from 'gulp-plumber'; +import postcss from 'gulp-postcss'; +import rename from 'gulp-rename'; +import gulpSass from 'gulp-sass'; +import * as dartSass from 'sass'; +import gulUglifyES from 'gulp-uglify-es'; +import { spawn } from 'node:child_process'; + +const browserSync = browserSyncLib.create(); const reload = browserSync.reload; -const rename = require('gulp-rename'); -const sass = require('gulp-sass')(require('sass')); -const spawn = require('child_process').spawn; -const uglify = require('gulp-uglify-es').default; +const sass = gulpSass(dartSass); +const uglify = gulUglifyES.default; // Relative paths function -function pathsConfig(appName) { - this.app = `./${pjson.name}`; +function pathsConfig() { + const appName = `./${pjson.name}`; const vendorsRoot = 'node_modules'; return { @@ -32,13 +37,13 @@ function pathsConfig(appName) { `${vendorsRoot}/@popperjs/core/dist/umd/popper.js`, `${vendorsRoot}/bootstrap/dist/js/bootstrap.js`, ], - app: this.app, - templates: `${this.app}/templates`, - css: `${this.app}/static/css`, - sass: `${this.app}/static/sass`, - fonts: `${this.app}/static/fonts`, - images: `${this.app}/static/images`, - js: `${this.app}/static/js`, + app: appName, + templates: `${appName}/templates`, + css: `${appName}/static/css`, + sass: `${appName}/static/sass`, + fonts: `${appName}/static/fonts`, + images: `${appName}/static/images`, + js: `${appName}/static/js`, }; } @@ -163,7 +168,7 @@ function watchPaths() { } // Generate all assets -const generateAssets = parallel(styles, scripts, vendorScripts, imgCompression); +const build = parallel(styles, scripts, vendorScripts, imgCompression); // Set up dev environment {%- if cookiecutter.use_docker == 'n' %} @@ -176,6 +181,6 @@ const dev = parallel(runServer, initBrowserSync, watchPaths); const dev = parallel(initBrowserSync, watchPaths); {%- endif %} -exports.default = series(generateAssets, dev); -exports['generate-assets'] = generateAssets; -exports['dev'] = dev; +task('default', series(build, dev)); +task('build', build); +task('dev', dev); diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 94861c4eb..1a1fb4a44 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -13,7 +13,7 @@ "gulp-concat": "^2.6.1", "concurrently": "^9.0.0", "cssnano": "^7.0.0", - "gulp": "^4.0.2", + "gulp": "^5.0.0", "gulp-imagemin": "^7.1.0", "gulp-plumber": "^1.2.1", "gulp-postcss": "^10.0.0", From 88ba893524e209dad4c93ba55cc6b052197b1da2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:37:39 +0000 Subject: [PATCH 84/85] Bump gulp-imagemin from 7.1.0 to 9.1.0 (#5052) --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 1a1fb4a44..d490729cd 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -14,7 +14,7 @@ "concurrently": "^9.0.0", "cssnano": "^7.0.0", "gulp": "^5.0.0", - "gulp-imagemin": "^7.1.0", + "gulp-imagemin": "^9.1.0", "gulp-plumber": "^1.2.1", "gulp-postcss": "^10.0.0", "gulp-rename": "^2.0.0", From 6a526ac633ce89acfc16895b8d2ea796a33a4765 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 27 Nov 2024 21:18:33 +0000 Subject: [PATCH 85/85] Pin dart-sass to 1.77.6 to avoid deprecation warnings (#5552) https://github.com/twbs/bootstrap/issues/40962 https://github.com/twbs/bootstrap/issues/40849 --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index d490729cd..d0410f554 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -26,7 +26,7 @@ "postcss": "^8.3.11", "postcss-loader": "^8.0.0", "postcss-preset-env": "^10.0.3", - "sass": "^1.43.4", + "sass": "1.77.6", "sass-loader": "^16.0.1", "webpack": "^5.65.0", "webpack-bundle-tracker": "^3.0.1",