Merge branch 'refs/heads/master' into replace-deprecated-uvicorn-workers

# Conflicts:
#	{{cookiecutter.project_slug}}/requirements/base.txt

CHANGELOG.md

@@ -3,6 +3,42 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.06.06
+
+
+### Updated
+
+- Update sentry-sdk to 2.5.0 ([#5126](https://github.com/cookiecutter/cookiecutter-django/pull/5126))
+
+- Update ruff to 0.4.8 ([#5122](https://github.com/cookiecutter/cookiecutter-django/pull/5122))
+
+- Update redis to 5.0.5 ([#5125](https://github.com/cookiecutter/cookiecutter-django/pull/5125))
+
+## 2024.06.04
+
+
+### Updated
+
+- Update pytest to 8.2.2 ([#5120](https://github.com/cookiecutter/cookiecutter-django/pull/5120))
+
+- Update sh to 2.0.7 ([#5114](https://github.com/cookiecutter/cookiecutter-django/pull/5114))
+
+- Update sentry-sdk to 2.4.0 ([#5119](https://github.com/cookiecutter/cookiecutter-django/pull/5119))
+
+## 2024.06.02
+
+
+### Updated
+
+- Update uvicorn to 0.30.1 ([#5115](https://github.com/cookiecutter/cookiecutter-django/pull/5115))
+
+## 2024.06.01
+
+
+### Updated
+
+- Update ruff to 0.4.7 ([#5112](https://github.com/cookiecutter/cookiecutter-django/pull/5112))
+
 ## 2024.05.30
 
 

requirements.txt

@@ -1,18 +1,18 @@
 cookiecutter==2.6.0
-sh==2.0.6; sys_platform != "win32"
+sh==2.0.7; sys_platform != "win32"
 binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.4.6
+ruff==0.4.8
 django-upgrade==1.18.0
 djlint==1.34.1
 pre-commit==3.7.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.15.0
+tox==4.15.1
-pytest==8.2.1
+pytest==8.2.2
 pytest-xdist==3.6.1
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0

setup.py

@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.05.30"
+version = "2024.06.06"
 
 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.6
+    rev: v0.4.8
     hooks:
       # Linter
       - id: ruff

{{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.4  # https://github.com/redis/redis-py
+redis==5.0.5  # 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 %}
@@ -23,8 +23,8 @@ flower==2.0.1  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.30.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.30.1  # https://github.com/encode/uvicorn
-uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker
+uvicorn-worker==0.2.0  # https://github.com/Kludex/uvicorn-worker
 {%- endif %}
 
 # Django

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

@@ -15,7 +15,7 @@ watchfiles==0.22.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.10.0  # https://github.com/python/mypy
 django-stubs[compatible-mypy]==5.0.2  # https://github.com/typeddjango/django-stubs
-pytest==8.2.1  # https://github.com/pytest-dev/pytest
+pytest==8.2.2  # 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.15.0  # https://github.com/typeddjango/djangorestframework-stubs
@@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.4.6  # https://github.com/astral-sh/ruff
+ruff==0.4.8  # https://github.com/astral-sh/ruff
 coverage==7.5.3  # https://github.com/nedbat/coveragepy
 djlint==1.34.1  # https://github.com/Riverside-Healthcare/djLint
 pre-commit==3.7.1  # https://github.com/pre-commit/pre-commit

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

@@ -8,7 +8,7 @@ psycopg[c]==3.1.19  # https://github.com/psycopg/psycopg
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==2.3.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==2.5.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.3.2  # https://github.com/redis/hiredis-py