From d6f18f04a9a2f3c0b7c85b783b8f360fbcb453e5 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Fri, 6 Sep 2024 17:30:55 +0200 Subject: [PATCH 01/25] Remove empty setup.py and references to it (#5355) --- scripts/update_changelog.py | 2 +- setup.py | 0 tox.ini | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 setup.py diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py index 9909b1eee..988370e43 100644 --- a/scripts/update_changelog.py +++ b/scripts/update_changelog.py @@ -124,7 +124,7 @@ def write_changelog(file_path: Path, release: str, content: str) -> None: def update_version(file_path: Path, release: str) -> None: - """Update template version in setup.py.""" + """Update template version in pyproject.toml.""" old_content = file_path.read_text() updated_content = re.sub( r'\nversion = "\d+\.\d+\.\d+"\n', diff --git a/setup.py b/setup.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tox.ini b/tox.ini index 3b7a95088..a1034eb3d 100644 --- a/tox.ini +++ b/tox.ini @@ -9,4 +9,4 @@ commands = pytest -n auto {posargs:./tests} [testenv:black-template] deps = black -commands = black --check hooks tests setup.py docs scripts +commands = black --check hooks tests docs scripts From 1a2bcc5c47378d721af65d12aa59a1f8a8f6b1b5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 7 Sep 2024 02:21:48 +0000 Subject: [PATCH 02/25] Release 2024.09.06 --- CHANGELOG.md | 11 +++++++++++ pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8ba79a48..174214506 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.09.06 + + +### Updated + +- Update ruff to 0.6.4 ([#5354](https://github.com/cookiecutter/cookiecutter-django/pull/5354)) + +- Update django-allauth to 64.2.1 ([#5352](https://github.com/cookiecutter/cookiecutter-django/pull/5352)) + +- Auto-update pre-commit hooks ([#5353](https://github.com/cookiecutter/cookiecutter-django/pull/5353)) + ## 2024.09.05 diff --git a/pyproject.toml b/pyproject.toml index 04d40a217..93b367947 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.05" +version = "2024.09.06" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From ab84c2181acf5fb0dc1329cb8749a108f23256a5 Mon Sep 17 00:00:00 2001 From: rxm7706 <95496360+rxm7706@users.noreply.github.com> Date: Sat, 7 Sep 2024 18:44:46 -0500 Subject: [PATCH 03/25] Fix Requires Python to allow minor versions (#5360) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 93b367947..73a67e3fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ license = { text = "BSD" } authors = [ { name = "Daniel Roy Greenfeld", email = "pydanny@gmail.com" }, ] -requires-python = "==3.12" +requires-python = ">=3.12" classifiers = [ "Development Status :: 4 - Beta", "Environment :: Console", From e956b831a5e9b0ed32e072af6b69cd92543a4973 Mon Sep 17 00:00:00 2001 From: foarsitter Date: Sat, 7 Sep 2024 23:45:21 +0000 Subject: [PATCH 04/25] 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 15e7b84ba..21284ce93 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1628,5 +1628,10 @@ "name": "Will", "github_login": "novucs", "twitter_username": "" + }, + { + "name": "rxm7706", + "github_login": "rxm7706", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 75f2d832d..df7293128 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1923,6 +1923,13 @@ Listed in alphabetical order. + + rxm7706 + + rxm7706 + + + Ryan Fitch From a437e493b1bfae987a2b546174e14086002fe220 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 8 Sep 2024 02:27:07 +0000 Subject: [PATCH 05/25] Release 2024.09.07 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 174214506..78051652e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.09.07 + + +### Changed + +- Fix Requires Python to allow minor versions ([#5360](https://github.com/cookiecutter/cookiecutter-django/pull/5360)) + ## 2024.09.06 diff --git a/pyproject.toml b/pyproject.toml index 73a67e3fe..04ca2f22a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.06" +version = "2024.09.07" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 66ebc4ecaa460e2fd810532bfbc46703c9eaa02c Mon Sep 17 00:00:00 2001 From: Marlon Castillo Date: Sun, 8 Sep 2024 15:22:16 +0000 Subject: [PATCH 06/25] Remove storages from `INSTALLED_APPS` (#5361) "storages" does not need to be added to INSTALLED_APPS: https://github.com/jschneier/django-storages/pull/547 --- {{cookiecutter.project_slug}}/config/settings/production.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 706d04e0a..034d588e0 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -78,12 +78,6 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool( default=True, ) -{% if cookiecutter.cloud_provider != 'None' -%} -# STORAGES -# ------------------------------------------------------------------------------ -# https://django-storages.readthedocs.io/en/latest/#installation -INSTALLED_APPS += ["storages"] -{%- endif -%} {% if cookiecutter.cloud_provider == 'AWS' %} # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings AWS_ACCESS_KEY_ID = env("DJANGO_AWS_ACCESS_KEY_ID") From ef53145219e948d132619a08a7faddd62c9142c4 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 8 Sep 2024 15:22:51 +0000 Subject: [PATCH 07/25] 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 21284ce93..b135fe90f 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1633,5 +1633,10 @@ "name": "rxm7706", "github_login": "rxm7706", "twitter_username": "" + }, + { + "name": "Marlon Castillo", + "github_login": "mcastle", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index df7293128..b913b67f3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1468,6 +1468,13 @@ Listed in alphabetical order. + + Marlon Castillo + + mcastle + + + Martin Blech From 1f7fa64df575329297f5dd83b0adfd94237dd00b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 8 Sep 2024 09:28:06 -0700 Subject: [PATCH 08/25] Update tox from 4.18.0 to 4.18.1 (#5358) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 67e61da56..e3fa7a89c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ -tox==4.18.0 +tox==4.18.1 pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From 8559078fd4e055932355ea73a368cd735b557d54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 17:28:34 +0100 Subject: [PATCH 09/25] Auto-update pre-commit hooks (#5357) --- .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 06c073565..39b8802aa 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.0.4" + rev: "2.2.1" hooks: - id: pyproject-fmt From 2c90ff55a3beb9cd9c09b3d1cd07c1d95ce8c159 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 9 Sep 2024 02:26:25 +0000 Subject: [PATCH 10/25] Release 2024.09.08 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78051652e..315e050b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.09.08 + + +### Changed + +- Remove "storages" from `INSTALLED_APPS` ([#5361](https://github.com/cookiecutter/cookiecutter-django/pull/5361)) + ## 2024.09.07 diff --git a/pyproject.toml b/pyproject.toml index 04ca2f22a..17822d88d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.07" +version = "2024.09.08" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 3e253ccb1a0139be7d0aef7863170300ab378527 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:12:09 +0100 Subject: [PATCH 11/25] Auto-update pre-commit hooks (#5362) 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 39b8802aa..21b4ff216 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.2.1" + rev: "2.2.3" hooks: - id: pyproject-fmt From ab36a6112e6c92f7966ec6ef0d82066cc6cdd6e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:27:35 +0100 Subject: [PATCH 12/25] Bump tiangolo/issue-manager from 0.5.0 to 0.5.1 (#5364) --- .github/workflows/issue-manager.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml index 103612cfe..42579d06e 100644 --- a/.github/workflows/issue-manager.yml +++ b/.github/workflows/issue-manager.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: tiangolo/issue-manager@0.5.0 + - uses: tiangolo/issue-manager@0.5.1 with: token: ${{ secrets.GITHUB_TOKEN }} config: > From 8f8f87df51767b58f67697dc5c9091fce6df3341 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 9 Sep 2024 07:54:22 -0700 Subject: [PATCH 13/25] Update sentry-sdk to 2.14.0 (#5365) --- {{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 824927ca6..ce52c2e01 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.13.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.14.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 50a8c2b498f33ee3f8236d229aefa784e098f302 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 10 Sep 2024 02:24:49 +0000 Subject: [PATCH 14/25] Release 2024.09.09 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 315e050b3..aedb99d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.09.09 + + +### Updated + +- Update sentry-sdk to 2.14.0 ([#5365](https://github.com/cookiecutter/cookiecutter-django/pull/5365)) + ## 2024.09.08 diff --git a/pyproject.toml b/pyproject.toml index 17822d88d..70e15a616 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.08" +version = "2024.09.09" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 9f1037ab1844b1e789dcb869ff6658e5a5808b08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:04:37 +0100 Subject: [PATCH 15/25] Bump python to 3.12.6 in docs Docker image (#5369) --- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 49e25cba9..ed1b1dd2a 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.5-slim-bookworm AS python +FROM docker.io/python:3.12.6-slim-bookworm AS python # Python build stage From 40de2dea1d9734c49f20c80a2272d8c550f9c265 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:04:55 +0100 Subject: [PATCH 16/25] Bump python to 3.12.6 in production Docker (#5367) --- .../compose/production/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 3e0859c24..86aae67d5 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -25,7 +25,7 @@ RUN npm run build {%- endif %} # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.5-slim-bookworm AS python +FROM docker.io/python:3.12.6-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From 4865e056c552400331e903b9498022ccbd14a13b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:05:08 +0100 Subject: [PATCH 17/25] Bump python to 3.12.6 in local Docker (#5370) --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index ddec2d4e7..fbb62e239 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.5-slim-bookworm AS python +FROM docker.io/python:3.12.6-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From d841c79d48a7e956b81d48a13b6bc4dfcc5bba94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:07:45 +0100 Subject: [PATCH 18/25] Bump concurrently from 8.2.2 to 9.0.0 (#5363) --- {{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 a93b3fa5f..915e29b78 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -11,7 +11,7 @@ "browser-sync": "^3.0.2", "css-loader": "^7.1.2", "gulp-concat": "^2.6.1", - "concurrently": "^8.0.1", + "concurrently": "^9.0.0", "cssnano": "^7.0.0", "gulp": "^4.0.2", "gulp-imagemin": "^7.1.0", From e567d058b319dcce73805abf076d3887534863a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:09:16 +0100 Subject: [PATCH 19/25] Bump postcss-preset-env from 9.6.0 to 10.0.3 (#5368) --- {{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 915e29b78..94861c4eb 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -25,7 +25,7 @@ "pixrem": "^5.0.0", "postcss": "^8.3.11", "postcss-loader": "^8.0.0", - "postcss-preset-env": "^9.0.0", + "postcss-preset-env": "^10.0.3", "sass": "^1.43.4", "sass-loader": "^16.0.1", "webpack": "^5.65.0", From 69be07f387e256a5946bfb537b740f0be06d9de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Wed, 4 Sep 2024 20:28:57 -0300 Subject: [PATCH 20/25] Add nginx container to dependabot --- .github/dependabot.yml | 9 ++++++++- {{cookiecutter.project_slug}}/.github/dependabot.yml | 12 +++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3582a2125..c5856a6ab 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,5 @@ # Config for Dependabot updates. See Documentation here: -# https://docs.github.com/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates +# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file version: 2 updates: @@ -96,6 +96,13 @@ updates: labels: - "update" + - package-ecosystem: "docker" + directory: "{{cookiecutter.project_slug}}/compose/production/nginx/" + schedule: + interval: "daily" + labels: + - "update" + - package-ecosystem: "docker" directory: "{{cookiecutter.project_slug}}/compose/production/traefik/" schedule: diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml index be52c68d5..4b8973558 100644 --- a/{{cookiecutter.project_slug}}/.github/dependabot.yml +++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml @@ -1,5 +1,5 @@ # Config for Dependabot updates. See Documentation here: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file version: 2 updates: @@ -83,6 +83,16 @@ updates: schedule: interval: 'daily' +{%- if cookiecutter.cloud_provider == 'None' %} + + - package-ecosystem: 'docker' + # Look for a `Dockerfile` in the `compose/production/nginx` directory + directory: 'compose/production/nginx/' + # Every weekday + schedule: + interval: 'daily' +{%- endif %} + {%- endif %} # Enable version updates for Python/Pip - Production From a882f4067664b20c6079b104faab189b9ad0c955 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 10 Sep 2024 13:18:30 -0700 Subject: [PATCH 21/25] Update pytest to 8.3.3 (#5371) * Update pytest from 8.3.2 to 8.3.3 * Update pytest from 8.3.2 to 8.3.3 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e3fa7a89c..1aafc7064 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ tox==4.18.1 -pytest==8.3.2 +pytest==8.3.3 pytest-xdist==3.6.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6fd60ca39..346db4bd7 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -16,7 +16,7 @@ watchfiles==0.24.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.11.2 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-stubs -pytest==8.3.2 # https://github.com/pytest-dev/pytest +pytest==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" %} djangorestframework-stubs==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs From 0c11f9c602be13837b33c85c28729c80ae2dc3b4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Sep 2024 02:23:46 +0000 Subject: [PATCH 22/25] Release 2024.09.10 --- CHANGELOG.md | 21 +++++++++++++++++++++ pyproject.toml | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aedb99d90..420517c2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.09.10 + + +### Changed + +- Add nginx container to dependabot automation ([#5345](https://github.com/cookiecutter/cookiecutter-django/pull/5345)) + +### Updated + +- Update pytest to 8.3.3 ([#5371](https://github.com/cookiecutter/cookiecutter-django/pull/5371)) + +- Bump postcss-preset-env from 9.6.0 to 10.0.3 ([#5368](https://github.com/cookiecutter/cookiecutter-django/pull/5368)) + +- Bump concurrently from 8.2.2 to 9.0.0 ([#5363](https://github.com/cookiecutter/cookiecutter-django/pull/5363)) + +- Bump python to 3.12.6 in local Docker ([#5370](https://github.com/cookiecutter/cookiecutter-django/pull/5370)) + +- Bump python to 3.12.6 in production Docker ([#5367](https://github.com/cookiecutter/cookiecutter-django/pull/5367)) + +- Bump python to 3.12.6 in docs Docker image ([#5369](https://github.com/cookiecutter/cookiecutter-django/pull/5369)) + ## 2024.09.09 diff --git a/pyproject.toml b/pyproject.toml index 70e15a616..c893f6169 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.09" +version = "2024.09.10" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 043ecd7bcb85e01e2d9a3070ea61be4aae9f555c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 11 Sep 2024 08:38:10 -0700 Subject: [PATCH 23/25] Update django-anymail to 12.0 (#5366) --- .../requirements/production.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index ce52c2e01..f65a4b29e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,21 +24,21 @@ django-storages[google]==1.14.4 # https://github.com/jschneier/django-storages django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==11.1 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==12.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon-ses]==11.1 # https://github.com/anymail/django-anymail +django-anymail[amazon-ses]==12.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==11.1 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==12.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==11.1 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==12.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==11.1 # https://github.com/anymail/django-anymail +django-anymail[postmark]==12.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==11.1 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==12.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} -django-anymail[brevo]==11.1 # https://github.com/anymail/django-anymail +django-anymail[brevo]==12.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==11.1 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==12.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==11.1 # https://github.com/anymail/django-anymail +django-anymail==12.0 # https://github.com/anymail/django-anymail {%- endif %} From f3133629078612610dbc7c49a3cae40499c61911 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 11 Sep 2024 16:34:54 -0700 Subject: [PATCH 24/25] Update djangorestframework-stubs from 3.15.0 to 3.15.1 (#5372) --- {{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 346db4bd7..cc7f28b50 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -19,7 +19,7 @@ django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-st 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" %} -djangorestframework-stubs==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==3.15.1 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From 1f6b8b47910a9e1861b1af8a2c49711c70243fff Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 12 Sep 2024 02:24:35 +0000 Subject: [PATCH 25/25] Release 2024.09.11 --- CHANGELOG.md | 9 +++++++++ pyproject.toml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 420517c2c..3c5eacfc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.09.11 + + +### Updated + +- Update djangorestframework-stubs to 3.15.1 ([#5372](https://github.com/cookiecutter/cookiecutter-django/pull/5372)) + +- Update django-anymail to 12.0 ([#5366](https://github.com/cookiecutter/cookiecutter-django/pull/5366)) + ## 2024.09.10 diff --git a/pyproject.toml b/pyproject.toml index c893f6169..f3790af07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.10" +version = "2024.09.11" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [