From 54247e783e4a13634de882abf4d90056d9175fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Fri, 11 Oct 2024 10:50:02 -0300 Subject: [PATCH 1/7] Update Nginx dependabot versioning-strategy as a way to fix #5345 and #5344 --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c5856a6abf..a24abcfefb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -100,6 +100,7 @@ updates: directory: "{{cookiecutter.project_slug}}/compose/production/nginx/" schedule: interval: "daily" + versioning-strategy: increase labels: - "update" From 209b54a628888409278061c18d3905f36d62a119 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 12 Oct 2024 01:41:04 +0100 Subject: [PATCH 2/7] Update sphinx from 8.0.2 to 8.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 b52da80d1c..a1d38aeb0c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -24,7 +24,7 @@ djangorestframework-stubs==3.15.1 # https://github.com/typeddjango/djangorestfr # Documentation # ------------------------------------------------------------------------------ -sphinx==8.0.2 # https://github.com/sphinx-doc/sphinx +sphinx==8.1.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 92cf1daaf48909e424424ecb1b56dc2a9e7f77db Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Oct 2024 02:25:39 +0000 Subject: [PATCH 3/7] Release 2024.10.11 --- CHANGELOG.md | 13 +++++++++++++ pyproject.toml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 561c6ca822..da585328fe 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.11 + + +### Changed + +- Update README.md broken links ([#5454](https://github.com/cookiecutter/cookiecutter-django/pull/5454)) + +- wait-for-it as dependency in the run stage ([#5452](https://github.com/cookiecutter/cookiecutter-django/pull/5452)) + +### Updated + +- Auto-update pre-commit hooks ([#5450](https://github.com/cookiecutter/cookiecutter-django/pull/5450)) + ## 2024.10.10 diff --git a/pyproject.toml b/pyproject.toml index c670c9508a..65452e0bcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.10" +version = "2024.10.11" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 3f2155ab6efa73498f7514121faec3b659290dca Mon Sep 17 00:00:00 2001 From: browniebroke <861044+browniebroke@users.noreply.github.com> Date: Sat, 12 Oct 2024 02:36:29 +0000 Subject: [PATCH 4/7] Auto-update pre-commit hooks --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index edeee2d337..b667b30b87 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.17.0 + rev: v3.18.0 hooks: - id: pyupgrade args: [--py312-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 1ed3e55b05..e055b7f3aa 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/adamchainz/django-upgrade - rev: '1.22.0' + rev: '1.22.1' hooks: - id: django-upgrade args: ['--target-version', '5.0'] From abfc6b0ee20d44d1d791f44a40de9b96caefcbc5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 12 Oct 2024 10:59:48 +0100 Subject: [PATCH 5/7] Update django-cors-headers from 4.4.0 to 4.5.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 8f6c99b10d..b98450a6ff 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.4.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==4.5.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 931e300b63ba7bd31f52b5654ac721574343d1b5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 12 Oct 2024 17:46:45 +0100 Subject: [PATCH 6/7] Pin Python version to 3.12 (#5456) * Pin Python version to 3.12 * Add back actions/setup-python to bare metal tests * Revert "Add back actions/setup-python to bare metal tests" This reverts commit cdee7e2da7e158b7caa318d7f2571f56ac87210a. * Update test_bare.sh to run commands via uv * Skip uv lock on PRs from forks * Revert "Update test_bare.sh to run commands via uv" This reverts commit 56f839e2b475b44b856a32ccf1437ae20e0a5404. * Add back actions/setup-python to bare metal tests * Only run uv lock workflow on dependabot PRs --- .github/workflows/ci.yml | 3 +++ .github/workflows/dependabot-uv-lock.yml | 1 + pyproject.toml | 3 +-- uv.lock | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da4a6575be..a2ef936fc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,6 +98,9 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: "3.12" - name: Install uv uses: astral-sh/setup-uv@v3 with: diff --git a/.github/workflows/dependabot-uv-lock.yml b/.github/workflows/dependabot-uv-lock.yml index 7f8e864054..73fb88130c 100644 --- a/.github/workflows/dependabot-uv-lock.yml +++ b/.github/workflows/dependabot-uv-lock.yml @@ -11,6 +11,7 @@ permissions: jobs: lock: + if: ${{ github.actor == 'dependabot[bot]' }} runs-on: ubuntu-latest env: GH_PAT: ${{ secrets.GH_PAT }} diff --git a/pyproject.toml b/pyproject.toml index 65452e0bcb..f11948a401 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,<3.13" classifiers = [ "Development Status :: 4 - Beta", "Environment :: Console", @@ -25,7 +25,6 @@ classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development", ] diff --git a/uv.lock b/uv.lock index ed47daeff0..84927f1573 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -requires-python = ">=3.12" +requires-python = "==3.12.*" [[package]] name = "alabaster" From a0c8863a9c2bbfb47d9154ae40f3198587b7b12b Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 13 Oct 2024 02:30:03 +0000 Subject: [PATCH 7/7] Release 2024.10.12 --- CHANGELOG.md | 15 +++++++++++++++ pyproject.toml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da585328fe..1c9fea6511 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.12 + + +### Changed + +- Pin Python version to 3.12 ([#5456](https://github.com/cookiecutter/cookiecutter-django/pull/5456)) + +### Updated + +- Update sphinx to 8.1.1 ([#5457](https://github.com/cookiecutter/cookiecutter-django/pull/5457)) + +- Auto-update pre-commit hooks ([#5458](https://github.com/cookiecutter/cookiecutter-django/pull/5458)) + +- Update django-cors-headers to 4.5.0 ([#5459](https://github.com/cookiecutter/cookiecutter-django/pull/5459)) + ## 2024.10.11 diff --git a/pyproject.toml b/pyproject.toml index f11948a401..0d49d03651 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.10.11" +version = "2024.10.12" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [