Merge branch 'cookiecutter:master' into master

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
         args: ["--tab-width", "2"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.11.1
+    rev: v3.12.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]

CHANGELOG.md

@@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.09.23
+
+
+### Updated
+
+- Update psycopg to 3.1.11 ([#4595](https://github.com/cookiecutter/cookiecutter-django/pull/4595))
+
+- Auto-update pre-commit hooks ([#4591](https://github.com/cookiecutter/cookiecutter-django/pull/4591))
+
+- Update drf-spectacular to 0.26.5 ([#4594](https://github.com/cookiecutter/cookiecutter-django/pull/4594))
+
 ## 2023.09.21
 
 

requirements.txt

@@ -1,4 +1,4 @@
-cookiecutter==2.3.0
+cookiecutter==2.3.1
 sh==2.0.6; sys_platform != "win32"
 binaryornot==0.4.4
 
@@ -23,6 +23,6 @@ pyyaml==6.0.1
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.59.1
-gitpython==3.1.36
+gitpython==3.1.37
 jinja2==3.1.2
 requests==2.31.0

setup.py

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

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

@@ -31,7 +31,7 @@ repos:
         args: ['--target-version', '4.2']
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.11.1
+    rev: v3.12.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]

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

@@ -43,7 +43,7 @@ django-redis==5.3.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==4.2.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.26.4  # https://github.com/tfranzel/drf-spectacular
+drf-spectacular==0.26.5  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
 django-webpack-loader==2.0.1  # https://github.com/django-webpack/django-webpack-loader

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

@@ -3,9 +3,9 @@
 Werkzeug[watchdog]==2.3.7 # https://github.com/pallets/werkzeug
 ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg[c]==3.1.9  # https://github.com/psycopg/psycopg
+psycopg[c]==3.1.11  # https://github.com/psycopg/psycopg
 {%- else %}
-psycopg[binary]==3.1.9  # https://github.com/psycopg/psycopg
+psycopg[binary]==3.1.11  # https://github.com/psycopg/psycopg
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchfiles==0.20.0  # https://github.com/samuelcolvin/watchfiles

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

@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==21.2.0  # https://github.com/benoitc/gunicorn
-psycopg[c]==3.1.9  # https://github.com/psycopg/psycopg
+psycopg[c]==3.1.11  # https://github.com/psycopg/psycopg
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}