Merge branch 'master' into lint-format-template-with-ruff

Author: browniebroke

.github/contributors.json

@@ -1688,5 +1688,10 @@
     "name": "Ed Morley",
     "github_login": "edmorley",
     "twitter_username": ""
+  },
+  {
+    "name": "Alan Cyment",
+    "github_login": "acyment",
+    "twitter_username": ""
   }
 ]

.github/workflows/ruff-version.yml .github/workflows/align-versions.yml

@@ -1,19 +1,33 @@
-name: ruff
+name: align versions
 
 on:
   pull_request:
     paths:
       - "{{cookiecutter.project_slug}}/requirements/local.txt"
+      - "{{cookiecutter.project_slug}}/compose/local/node/Dockerfile"
+  # Manual trigger
+  workflow_dispatch:
 
 permissions:
   contents: write
   pull-requests: write
 
 jobs:
-  version:
+  run:
     runs-on: ubuntu-latest
     env:
       GH_PAT: ${{ secrets.GH_PAT }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          - script: scripts/ruff_version.py
+            name: Ruff
+          - script: scripts/node_version.py
+            name: Node
+
+    name: "${{ matrix.job.name }} versions"
     steps:
       - name: Checkout with token
         uses: actions/checkout@v4
@@ -30,8 +44,8 @@ jobs:
 
       - uses: astral-sh/setup-uv@v5
 
-      - run: uv run scripts/ruff_version.py
+      - run: uv run ${{ matrix.job.script }}
 
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: Align Ruff versions
+          commit_message: Align versions

.github/workflows/ci.yml

@@ -103,6 +103,6 @@ jobs:
         run: uv sync
       - uses: actions/setup-node@v4
         with:
-          node-version: "22.13"
+          node-version: "22.14"
       - name: Bare Metal ${{ matrix.script.name }}
         run: sh tests/test_bare.sh ${{ matrix.script.args }}

.pre-commit-config.yaml

@@ -38,14 +38,6 @@ repos:
     hooks:
       - id: pyproject-fmt
 
-  - repo: local
-    hooks:
-      - id: node-version-checker
-        name: node-version-checker
-        entry: python scripts/node_version.py
-        language: python
-        files: .
-
 ci:
   autoupdate_schedule: weekly
   skip: []

CHANGELOG.md

@@ -3,6 +3,113 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2025.02.17
+
+
+### Updated
+
+- Update sentry-sdk to 2.22.0 ([#5692](https://github.com/cookiecutter/cookiecutter-django/pull/5692))
+
+- Update django-storages to 1.14.5 ([#5690](https://github.com/cookiecutter/cookiecutter-django/pull/5690))
+
+## 2025.02.14
+
+
+### Updated
+
+- Bump node from 22.13 to 22.14 ([#5688](https://github.com/cookiecutter/cookiecutter-django/pull/5688))
+
+## 2025.02.13
+
+
+### Updated
+
+- Update sentry-sdk to 2.21.0 ([#5687](https://github.com/cookiecutter/cookiecutter-django/pull/5687))
+
+## 2025.02.11
+
+
+### Updated
+
+- Update coverage to 7.6.12 ([#5686](https://github.com/cookiecutter/cookiecutter-django/pull/5686))
+
+## 2025.02.10
+
+
+### Updated
+
+- Update pytest-django to 4.10.0 ([#5684](https://github.com/cookiecutter/cookiecutter-django/pull/5684))
+
+- Update ruff to 0.9.6 ([#5683](https://github.com/cookiecutter/cookiecutter-django/pull/5683))
+
+- Bump amazon/aws-cli from 2.23.0 to 2.24.0 ([#5682](https://github.com/cookiecutter/cookiecutter-django/pull/5682))
+
+## 2025.02.08
+
+
+### Updated
+
+- Update coverage to 7.6.11 ([#5681](https://github.com/cookiecutter/cookiecutter-django/pull/5681))
+
+## 2025.02.07
+
+
+### Updated
+
+- Update mypy to 1.15.0 ([#5664](https://github.com/cookiecutter/cookiecutter-django/pull/5664))
+
+- Update django-stubs to 5.1.3 ([#5680](https://github.com/cookiecutter/cookiecutter-django/pull/5680))
+
+- Bump python from 3.12.8 to 3.12.9 in local Docker image ([#5678](https://github.com/cookiecutter/cookiecutter-django/pull/5678))
+
+- Bump python from 3.12.8 to 3.12.9 in production Docker image ([#5677](https://github.com/cookiecutter/cookiecutter-django/pull/5677))
+
+- Bump python from 3.12.8 to 3.12.9 in docs Docker image ([#5676](https://github.com/cookiecutter/cookiecutter-django/pull/5676))
+
+- Update django-allauth to 65.4.1 ([#5679](https://github.com/cookiecutter/cookiecutter-django/pull/5679))
+
+- Update django-cors-headers to 4.7.0 ([#5675](https://github.com/cookiecutter/cookiecutter-django/pull/5675))
+
+- Update whitenoise to 6.9.0 ([#5674](https://github.com/cookiecutter/cookiecutter-django/pull/5674))
+
+## 2025.02.06
+
+
+### Fixed
+
+- Bump node version in production Dockerfile from 20 to 22.13 ([#5672](https://github.com/cookiecutter/cookiecutter-django/pull/5672))
+
+### Updated
+
+- Update ruff to 0.9.5 ([#5673](https://github.com/cookiecutter/cookiecutter-django/pull/5673))
+
+## 2025.02.05
+
+
+### Changed
+
+- Add missing trailing slash in test `MEDIA_URL` ([#5666](https://github.com/cookiecutter/cookiecutter-django/pull/5666))
+
+### Updated
+
+- Update django to 5.0.12 ([#5667](https://github.com/cookiecutter/cookiecutter-django/pull/5667))
+
+## 2025.02.03
+
+
+### Updated
+
+- Bump traefik from 3.3.2 to 3.3.3 ([#5660](https://github.com/cookiecutter/cookiecutter-django/pull/5660))
+
+- Update factory-boy to 3.3.2 ([#5661](https://github.com/cookiecutter/cookiecutter-django/pull/5661))
+
+## 2025.01.30
+
+
+### Updated
+
+- Update ruff to 0.9.4 ([#5659](https://github.com/cookiecutter/cookiecutter-django/pull/5659))
+
 ## 2025.01.26
 
 

CONTRIBUTORS.md

@@ -201,6 +201,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Alan Cyment</td>
+    <td>
+      <a href="https://github.com/acyment">acyment</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Alberto Sanchez</td>
     <td>

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cookiecutter-django"
-version = "2025.01.26"
+version = "2025.02.17"
 description = "A Cookiecutter template for creating production-ready Django projects quickly."
 readme = "README.md"
 keywords = [
@@ -43,7 +43,7 @@ dependencies = [
   "pytest-xdist==3.6.1",
   "pyyaml==6.0.2",
   "requests==2.32.3",
-  "ruff==0.9.3",
+  "ruff==0.9.6",
   "sh==2.1; sys_platform!='win23'",
   "tox==4.23.2",
   "tox-uv>=1.17",

scripts/node_version.py

@@ -1,27 +1,26 @@
+from __future__ import annotations
+
 import json
 from pathlib import Path
 
 ROOT = Path(__file__).parent.parent
 TEMPLATED_ROOT = ROOT / "{{cookiecutter.project_slug}}"
 DOCKERFILE = TEMPLATED_ROOT / "compose" / "local" / "node" / "Dockerfile"
+PROD_DOCKERFILE = TEMPLATED_ROOT / "compose" / "production" / "django" / "Dockerfile"
 PACKAGE_JSON = TEMPLATED_ROOT / "package.json"
 CI_YML = ROOT / ".github" / "workflows" / "ci.yml"
 
 
-class VersionNotFoundError(RuntimeError):
-    def __init__(self):
-        super().__init__("Could not find version in Dockerfile")
-
-
-def main():
+def main() -> None:
     new_version = get_version_from_dockerfile()
     old_version = get_version_from_package_json()
     if old_version != new_version:
         update_package_json_version(old_version, new_version)
         update_ci_node_version(old_version, new_version)
+        update_production_node_version(old_version, new_version)
 
 
-def get_version_from_dockerfile():
+def get_version_from_dockerfile() -> str:
     # Extract version out of base image name:
     # FROM docker.io/node:22.13-bookworm-slim
     # -> 22.13
@@ -31,15 +30,15 @@ def get_version_from_dockerfile():
                 _, _, docker_tag = line.partition(":")
                 version_str, _, _ = docker_tag.partition("-")
                 return version_str
-    raise VersionNotFoundError
+    raise RuntimeError("Could not find version in Dockerfile")  # noqa: TRY003
 
 
-def get_version_from_package_json():
+def get_version_from_package_json() -> str:
     package_json = json.loads(PACKAGE_JSON.read_text())
     return package_json["engines"]["node"]
 
 
-def update_package_json_version(old_version, new_version):
+def update_package_json_version(old_version: str, new_version: str) -> None:
     package_json_text = PACKAGE_JSON.read_text()
     package_json_text = package_json_text.replace(
         f'"node": "{old_version}"',
@@ -48,7 +47,7 @@ def update_package_json_version(old_version, new_version):
     PACKAGE_JSON.write_text(package_json_text)
 
 
-def update_ci_node_version(old_version, new_version):
+def update_ci_node_version(old_version: str, new_version: str) -> None:
     yml_content = CI_YML.read_text()
     yml_content = yml_content.replace(
         f'node-version: "{old_version}"',
@@ -57,5 +56,14 @@ def update_ci_node_version(old_version, new_version):
     CI_YML.write_text(yml_content)
 
 
+def update_production_node_version(old_version: str, new_version: str) -> None:
+    dockerfile_content = PROD_DOCKERFILE.read_text()
+    dockerfile_content = dockerfile_content.replace(
+        f"FROM docker.io/node:{old_version}",
+        f"FROM docker.io/node:{new_version}",
+    )
+    PROD_DOCKERFILE.write_text(dockerfile_content)
+
+
 if __name__ == "__main__":
     main()

scripts/ruff_version.py

@@ -10,11 +10,6 @@
 PYPROJECT_TOML = ROOT / "pyproject.toml"
 
 
-class VersionNotFoundError(RuntimeError):
-    def __init__(self, filename):
-        super().__init__(f"Could not find version in {filename}")
-
-
 def main():
     new_version = get_requirements_txt_version()
     old_version = get_pyproject_toml_version()
@@ -38,7 +33,7 @@ def get_pyproject_toml_version():
     for dependency in data["project"]["dependencies"]:
         if dependency.startswith("ruff=="):
             return dependency.split("==")[1]
-    raise VersionNotFoundError("pyproject.toml")
+    raise RuntimeError("Could not find version in pyproject.toml")  # noqa: TRY003
 
 
 def update_ruff_version(old_version, new_version):