Merge remote-tracking branch 'upstream/master'

Author: Tim Santor

.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 24.4.0
+    rev: 24.4.2
     hooks:
       - id: black
 

CHANGELOG.md

@@ -3,6 +3,106 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.05.07
+
+
+### Updated
+
+- Update django to 4.2.13 ([#5058](https://github.com/cookiecutter/cookiecutter-django/pull/5058))
+
+## 2024.05.06
+
+
+### Fixed
+
+- Fix nginx image name in production.yml ([#5053](https://github.com/cookiecutter/cookiecutter-django/pull/5053))
+
+### Updated
+
+- Update django-model-utils to 4.5.1 ([#5044](https://github.com/cookiecutter/cookiecutter-django/pull/5044))
+
+- Update django to 4.2.12 ([#5056](https://github.com/cookiecutter/cookiecutter-django/pull/5056))
+
+- Update sentry-sdk to 2.1.1 ([#5055](https://github.com/cookiecutter/cookiecutter-django/pull/5055))
+
+- Update ruff to 0.4.3 ([#5049](https://github.com/cookiecutter/cookiecutter-django/pull/5049))
+
+## 2024.05.05
+
+
+### Updated
+
+- Auto-update pre-commit hooks ([#5046](https://github.com/cookiecutter/cookiecutter-django/pull/5046))
+
+- Update django-storages to 1.14.3 ([#5047](https://github.com/cookiecutter/cookiecutter-django/pull/5047))
+
+- Update coverage to 7.5.1 ([#5048](https://github.com/cookiecutter/cookiecutter-django/pull/5048))
+
+## 2024.04.28
+
+
+### Updated
+
+- Update pytest to 8.2.0 ([#5034](https://github.com/cookiecutter/cookiecutter-django/pull/5034))
+
+## 2024.04.27
+
+
+### Updated
+
+- Update sentry-sdk to 2.0.1 ([#5030](https://github.com/cookiecutter/cookiecutter-django/pull/5030))
+
+## 2024.04.26
+
+
+### Updated
+
+- Auto-update pre-commit hooks ([#5029](https://github.com/cookiecutter/cookiecutter-django/pull/5029))
+
+- Update ruff to 0.4.2 ([#5028](https://github.com/cookiecutter/cookiecutter-django/pull/5028))
+
+## 2024.04.25
+
+
+### Updated
+
+- Update coverage to 7.5.0 ([#5025](https://github.com/cookiecutter/cookiecutter-django/pull/5025))
+
+- Bump cssnano from 6.1.2 to 7.0.0 ([#5024](https://github.com/cookiecutter/cookiecutter-django/pull/5024))
+
+- Auto-update pre-commit hooks ([#5023](https://github.com/cookiecutter/cookiecutter-django/pull/5023))
+
+## 2024.04.24
+
+
+### Changed
+
+- Disable UP038 Ruff rule to avoid introducing slower code ([#5020](https://github.com/cookiecutter/cookiecutter-django/pull/5020))
+
+### Updated
+
+- Update django-allauth to 0.62.1 ([#5021](https://github.com/cookiecutter/cookiecutter-django/pull/5021))
+
+## 2024.04.23
+
+
+### Changed
+
+- Update link to djlint on pyproject.toml ([#5019](https://github.com/cookiecutter/cookiecutter-django/pull/5019))
+
+### Updated
+
+- Update redis to 5.0.4 ([#5018](https://github.com/cookiecutter/cookiecutter-django/pull/5018))
+
+- Update django-allauth to 0.62.0 ([#5016](https://github.com/cookiecutter/cookiecutter-django/pull/5016))
+
+## 2024.04.22
+
+
+### Fixed
+
+- Fix broken link for sphinx-doc in generated docs ([#5015](https://github.com/cookiecutter/cookiecutter-django/pull/5015))
+
 ## 2024.04.20
 
 

docs/requirements.txt

@@ -1,3 +1,3 @@
 sphinx==7.3.7
 sphinx-rtd-theme==2.0.0
-myst-parser==2.0.0
+myst-parser==3.0.1

requirements.txt

@@ -5,16 +5,16 @@ watchdog[watchmedo]==4.0.0
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.4.1
+ruff==0.4.3
 django-upgrade==1.16.0
 djlint==1.34.1
 pre-commit==3.7.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.14.2
-pytest==8.1.1
-pytest-xdist==3.6.0
+tox==4.15.0
+pytest==8.2.0
+pytest-xdist==3.6.1
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
 pyyaml==6.0.1
@@ -23,5 +23,5 @@ pyyaml==6.0.1
 # ------------------------------------------------------------------------------
 pygithub==2.3.0
 gitpython==3.1.43
-jinja2==3.1.3
+jinja2==3.1.4
 requests==2.31.0

setup.py

@@ -5,7 +5,7 @@
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.04.20"
+version = "2024.05.07"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

{{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.4.1
+    rev: v0.4.3
     hooks:
       # Linter
       - id: ruff

{{cookiecutter.project_slug}}/package.json

@@ -12,7 +12,7 @@
     "css-loader": "^6.5.1",
     "gulp-concat": "^2.6.1",
     "concurrently": "^8.0.1",
-    "cssnano": "^6.0.0",
+    "cssnano": "^7.0.0",
     "gulp": "^4.0.2",
     "gulp-imagemin": "^7.1.0",
     "gulp-plumber": "^1.2.1",

{{cookiecutter.project_slug}}/pyproject.toml

@@ -46,7 +46,7 @@ blank_line_after_tag = "load,extends"
 close_void_tags = true
 format_css = true
 format_js = true
-# TODO: remove T002 when fixed https://github.com/Riverside-Healthcare/djLint/issues/687
+# TODO: remove T002 when fixed https://github.com/djlint/djLint/issues/687
 ignore = "H006,H030,H031,T002"
 include = "H017,H035"
 indent = 2
@@ -151,11 +151,20 @@ select = [
 ignore = [
   "S101", # Use of assert detected https://docs.astral.sh/ruff/rules/assert/
   "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
-  "SIM102" # sometimes it's better to nest
+  "SIM102", # sometimes it's better to nest
+  "UP038" # Checks for uses of isinstance/issubclass that take a tuple 
+          # of types for comparison.
+          # Deactivated because it can make the code slow: 
+          # https://github.com/astral-sh/ruff/issues/7871
 ]
 # Allow fix for all enabled rules (when `--fix`) is provided.
 fixable = ["ALL"]
 unfixable = []
+# The fixes in extend-unsafe-fixes will require 
+# provide the `--unsafe-fixes` flag when fixing.
+extend-unsafe-fixes = [
+    "UP038"
+]
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 

{{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.6.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==5.0.3  # https://github.com/redis/redis-py
+redis==5.0.4  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.3.2  # https://github.com/redis/hiredis-py
 {%- endif %}
@@ -28,10 +28,10 @@ uvicorn[standard]==0.29.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==4.2.11  # pyup: < 5.0  # https://www.djangoproject.com/
+django==4.2.13  # pyup: < 5.0  # https://www.djangoproject.com/
 django-environ==0.11.2  # https://github.com/joke2k/django-environ
-django-model-utils==4.5.0  # https://github.com/jazzband/django-model-utils
-django-allauth[mfa]==0.61.1  # https://github.com/pennersr/django-allauth
+django-model-utils==4.5.1  # https://github.com/jazzband/django-model-utils
+django-allauth[mfa]==0.62.1  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.1  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==2024.2  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

{{cookiecutter.project_slug}}/requirements/local.txt

@@ -15,7 +15,7 @@ watchfiles==0.21.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.7.1  # https://github.com/python/mypy
 django-stubs[compatible-mypy]==4.2.7  # https://github.com/typeddjango/django-stubs
-pytest==8.1.1  # https://github.com/pytest-dev/pytest
+pytest==8.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==1.0.0  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs[compatible-mypy]==3.14.5  # https://github.com/typeddjango/djangorestframework-stubs
@@ -28,8 +28,8 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.4.1  # https://github.com/astral-sh/ruff
-coverage==7.4.4  # https://github.com/nedbat/coveragepy
+ruff==0.4.3  # https://github.com/astral-sh/ruff
+coverage==7.5.1  # https://github.com/nedbat/coveragepy
 djlint==1.34.1  # https://github.com/Riverside-Healthcare/djLint
 pre-commit==3.7.0  # https://github.com/pre-commit/pre-commit