Merge branch 'master' of https://github.com/cookiecutter/cookiecutter-django into cookiecutter-master

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.10.0
     hooks:
       - id: black
 

CHANGELOG.md

@@ -3,6 +3,28 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.10.17
+
+
+### Updated
+
+- Auto-update pre-commit hooks ([#4633](https://github.com/cookiecutter/cookiecutter-django/pull/4633))
+
+- Update black to 23.10.0 ([#4632](https://github.com/cookiecutter/cookiecutter-django/pull/4632))
+
+- Update pillow to 10.1.0 ([#4630](https://github.com/cookiecutter/cookiecutter-django/pull/4630))
+
+- Update django-crispy-forms to 2.1 ([#4629](https://github.com/cookiecutter/cookiecutter-django/pull/4629))
+
+## 2023.10.13
+
+
+### Updated
+
+- Update pre-commit to 3.5.0 ([#4628](https://github.com/cookiecutter/cookiecutter-django/pull/4628))
+
+- Update watchfiles to 0.21.0 ([#4627](https://github.com/cookiecutter/cookiecutter-django/pull/4627))
+
 ## 2023.10.12
 
 

requirements.txt

@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==23.9.1
+black==23.10.0
 isort==5.12.0
 flake8==6.1.0
 django-upgrade==1.15.0
@@ -23,6 +23,6 @@ pyyaml==6.0.1
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==2.1.1
-gitpython==3.1.37
+gitpython==3.1.38
 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.10.12"
+version = "2023.10.17"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

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

@@ -41,7 +41,7 @@ repos:
         args: [--py311-plus]
 
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.10.0
     hooks:
       - id: black
 

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

@@ -1,5 +1,5 @@
 python-slugify==8.0.1  # https://github.com/un33k/python-slugify
-Pillow==10.0.1  # https://github.com/python-pillow/Pillow
+Pillow==10.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin
@@ -32,7 +32,7 @@ django==4.2.6  # pyup: < 5.0  # https://www.djangoproject.com/
 django-environ==0.11.2  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.57.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==2.0  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==2.1  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 django-compressor==4.4  # https://github.com/django-compressor/django-compressor

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

@@ -32,7 +32,7 @@ sphinx-rtd-theme==1.3.0 # https://pypi.org/project/sphinx-rtd-theme/
 flake8==6.1.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.1.0  # https://github.com/gforcada/flake8-isort
 coverage==7.3.2  # https://github.com/nedbat/coveragepy
-black==23.9.1  # https://github.com/psf/black
+black==23.10.0  # https://github.com/psf/black
 djlint==1.34.0  # https://github.com/Riverside-Healthcare/djLint
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}