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

Author: browniebroke

.github/contributors.json

@@ -1683,5 +1683,10 @@
     "name": "Hana Belay",
     "github_login": "earthcomfy",
     "twitter_username": ""
+  },
+  {
+    "name": "Ed Morley",
+    "github_login": "edmorley",
+    "twitter_username": ""
   }
 ]

CHANGELOG.md

@@ -3,6 +3,44 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2025.01.26
+
+
+### Changed
+
+- Migrate generated project from `runtime.txt` to `.python-version` ([#5652](https://github.com/cookiecutter/cookiecutter-django/pull/5652))
+
+### Documentation
+
+- Update Heroku deployment guide ([#5656](https://github.com/cookiecutter/cookiecutter-django/pull/5656))
+
+## 2025.01.24
+
+
+### Updated
+
+- Update ruff to 0.9.3 ([#5654](https://github.com/cookiecutter/cookiecutter-django/pull/5654))
+
+## 2025.01.21
+
+
+### Changed
+
+- Update linter error code from TCH to TC ([#5651](https://github.com/cookiecutter/cookiecutter-django/pull/5651))
+
+### Updated
+
+- Update pre-commit to 4.1.0 ([#5650](https://github.com/cookiecutter/cookiecutter-django/pull/5650))
+
+## 2025.01.20
+
+
+### Changed
+
+- Group all API tests under a `tests.api` namespace ([#5615](https://github.com/cookiecutter/cookiecutter-django/pull/5615))
+
+- Migrate post-generation hook to pathlib ([#5648](https://github.com/cookiecutter/cookiecutter-django/pull/5648))
+
 ## 2025.01.16
 
 

CONTRIBUTORS.md

@@ -803,6 +803,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Ed Morley</td>
+    <td>
+      <a href="https://github.com/edmorley">edmorley</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Emanuel Calso</td>
     <td>

docs/3-deployment/deployment-on-heroku.rst

@@ -25,10 +25,6 @@ Run these commands to deploy the project to Heroku:
     # Assuming you chose Mailgun as mail service (see below for others)
     heroku addons:create mailgun:starter
 
-    heroku config:set PYTHONHASHSEED=random
-
-    heroku config:set WEB_CONCURRENCY=4
-
     heroku config:set DJANGO_DEBUG=False
     heroku config:set DJANGO_SETTINGS_MODULE=config.settings.production
     heroku config:set DJANGO_SECRET_KEY="$(openssl rand -base64 64)"

hooks/post_gen_project.py

@@ -77,7 +77,7 @@ def remove_utility_files():
 
 
 def remove_heroku_files():
-    file_names = ["Procfile", "runtime.txt", "requirements.txt"]
+    file_names = ["Procfile", "requirements.txt"]
     for file_name in file_names:
         if file_name == "requirements.txt" and "{{ cookiecutter.ci_tool }}".lower() == "travis":
             # Don't remove the file if we are using Travis CI but not using Heroku

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cookiecutter-django"
-version = "2025.01.16"
+version = "2025.01.26"
 description = "A Cookiecutter template for creating production-ready Django projects quickly."
 readme = "README.md"
 keywords = [
@@ -35,15 +35,15 @@ dependencies = [
   "djlint==1.36.4",
   "gitpython==3.1.43",
   "jinja2==3.1.5",
-  "pre-commit==3.8",
+  "pre-commit==4.1.0",
   "pygithub==2.5",
   "pytest==8.3.4",
   "pytest-cookies==0.7",
   "pytest-instafail==0.5",
   "pytest-xdist==3.6.1",
   "pyyaml==6.0.2",
   "requests==2.32.3",
-  "ruff==0.9.2",
+  "ruff==0.9.3",
   "sh==2.1; sys_platform!='win23'",
   "tox==4.23.2",
   "tox-uv>=1.17",

uv.lock

@@ -98,7 +98,7 @@ updates:
   # Enable version updates for Python/Pip - Production
   - package-ecosystem: 'pip'
     # Look for a `requirements.txt` in the `root` directory
-    # also 'setup.cfg', 'runtime.txt' and 'requirements/*.txt'
+    # also 'setup.cfg', '.python-version' and 'requirements/*.txt'
     directory: '/'
     # Every weekday
     schedule:

{{cookiecutter.project_slug}}/.github/dependabot.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version-file: '.python-version'
 
       {%- if cookiecutter.open_source_license != 'Not open source' %}
       # Consider using pre-commit.ci for open source project
@@ -88,9 +88,9 @@ jobs:
       {%- else %}
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version-file: '.python-version'
           cache: pip
           cache-dependency-path: |
             requirements/base.txt

{{cookiecutter.project_slug}}/.github/workflows/ci.yml

@@ -59,9 +59,6 @@ docs/_build/
 # PyBuilder
 target/
 
-# pyenv
-.python-version
-
 {% if cookiecutter.use_celery == 'y' -%}
 # celery beat schedule file
 celerybeat-schedule

{{cookiecutter.project_slug}}/.gitignore

@@ -36,7 +36,7 @@ repos:
 
   # Run the Ruff linter.
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.2
+    rev: v0.9.3
     hooks:
       # Linter
       - id: ruff

{{cookiecutter.project_slug}}/.pre-commit-config.yaml

@@ -0,0 +1 @@
+3.12

{{cookiecutter.project_slug}}/.python-version

@@ -106,7 +106,7 @@ select = [
   "SLOT",
   "SIM",
   "TID",
-  "TCH",
+  "TC",
   "INT",
   # "ARG", # Unused function argument
   "PTH",

{{cookiecutter.project_slug}}/pyproject.toml

@@ -28,10 +28,10 @@ sphinx-autobuild==2024.10.3 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.9.2  # https://github.com/astral-sh/ruff
+ruff==0.9.3  # https://github.com/astral-sh/ruff
 coverage==7.6.10  # https://github.com/nedbat/coveragepy
 djlint==1.36.4  # https://github.com/Riverside-Healthcare/djLint
-pre-commit==4.0.1  # https://github.com/pre-commit/pre-commit
+pre-commit==4.1.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------