Merge branch 'master' into upgrade/django-4.0

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

.github/contributors.json

@@ -1292,5 +1292,10 @@
     "name": "Brandon Rumiser",
     "github_login": "brumiser1550",
     "twitter_username": ""
+  },
+  {
+    "name": "krati yadav",
+    "github_login": "krati5",
+    "twitter_username": ""
   }
 ]

.github/workflows/update-contributors.yml

@@ -31,7 +31,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.15.0
+        uses: stefanzweifel/git-auto-commit-action@v4.15.1
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

.pre-commit-config.yaml

@@ -9,14 +9,14 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.2
+    rev: v3.1.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
 

CHANGELOG.md

@@ -3,6 +3,51 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.10.13
+
+### Updated
+- Update pygithub to 1.56 ([#3904](https://github.com/cookiecutter/cookiecutter-django/pull/3904))
+
+## 2022.10.11
+
+### Updated
+- Auto-update pre-commit hooks ([#3899](https://github.com/cookiecutter/cookiecutter-django/pull/3899))
+- Update flake8-isort to 5.0.0 ([#3901](https://github.com/cookiecutter/cookiecutter-django/pull/3901))
+- Update gitpython to 3.1.29 ([#3902](https://github.com/cookiecutter/cookiecutter-django/pull/3902))
+- Update psycopg2 to 2.9.4 ([#3896](https://github.com/cookiecutter/cookiecutter-django/pull/3896))
+- Bump stefanzweifel/git-auto-commit-action from 4.15.0 to 4.15.1 ([#3903](https://github.com/cookiecutter/cookiecutter-django/pull/3903))
+- Update black to 22.10.0 ([#3898](https://github.com/cookiecutter/cookiecutter-django/pull/3898))
+
+## 2022.10.04
+
+### Updated
+- Update django to 3.2.16 ([#3895](https://github.com/cookiecutter/cookiecutter-django/pull/3895))
+- Update mypy to 0.982 ([#3893](https://github.com/cookiecutter/cookiecutter-django/pull/3893))
+- Auto-update pre-commit hooks ([#3894](https://github.com/cookiecutter/cookiecutter-django/pull/3894))
+
+## 2022.10.03
+
+### Updated
+- Update sentry-sdk to 1.9.10 ([#3892](https://github.com/cookiecutter/cookiecutter-django/pull/3892))
+
+## 2022.10.02
+
+### Updated
+- Update pytz to 2022.4 ([#3891](https://github.com/cookiecutter/cookiecutter-django/pull/3891))
+
+## 2022.09.30
+
+### Updated
+- Update coverage to 6.5.0 ([#3890](https://github.com/cookiecutter/cookiecutter-django/pull/3890))
+- Update mypy to 0.981 ([#3889](https://github.com/cookiecutter/cookiecutter-django/pull/3889))
+- Update sentry-sdk to 1.9.9 ([#3888](https://github.com/cookiecutter/cookiecutter-django/pull/3888))
+- Update sphinx to 5.2.3 ([#3887](https://github.com/cookiecutter/cookiecutter-django/pull/3887))
+
+## 2022.09.29
+
+### Changed
+- Remove outdated &amp; optional Sendgrid settings from production config ([#3885](https://github.com/cookiecutter/cookiecutter-django/pull/3885))
+
 ## 2022.09.27
 
 ### Updated

CONTRIBUTORS.md

@@ -1104,6 +1104,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>krati yadav</td>
+    <td>
+      <a href="https://github.com/krati5">krati5</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Krzysztof Szumny</td>
     <td>

docs/requirements.txt

@@ -1,2 +1,2 @@
-sphinx==5.2.2
+sphinx==5.3.0
 sphinx-rtd-theme==1.0.0

requirements.txt

@@ -4,10 +4,10 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==22.8.0
+black==22.10.0
 isort==5.10.1
 flake8==5.0.4
-flake8-isort==4.2.0
+flake8-isort==5.0.0
 pre-commit==2.20.0
 
 # Testing
@@ -20,7 +20,7 @@ pyyaml==6.0
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.55
-gitpython==3.1.27
+PyGithub==1.56
+gitpython==3.1.29
 jinja2==3.1.2
 requests==2.28.1

setup.py

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

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

@@ -10,13 +10,13 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.2
+    rev: v3.1.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
 
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
 

{{cookiecutter.project_slug}}/config/settings/production.py

@@ -189,8 +189,6 @@ ANYMAIL = {
 EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend"
 ANYMAIL = {
     "SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
-    "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
-    "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
     "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"),
 }
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

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

@@ -1,4 +1,4 @@
-pytz==2022.2.1  # https://github.com/stub42/pytz
+pytz==2022.5  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
 Pillow==9.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
@@ -18,7 +18,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
-django-celery-beat==2.3.0  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.4.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}

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

@@ -3,17 +3,17 @@
 Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.4  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchfiles==0.17.0  # https://github.com/samuelcolvin/watchfiles
+watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
 {%- endif %}
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.971  # https://github.com/python/mypy
+mypy==0.982  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
@@ -23,15 +23,15 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.2.2  # https://github.com/sphinx-doc/sphinx
+sphinx==5.3.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==5.0.4  # https://github.com/PyCQA/flake8
-flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
-coverage==6.4.4  # https://github.com/nedbat/coveragepy
-black==22.8.0  # https://github.com/psf/black
+flake8-isort==5.0.0  # https://github.com/gforcada/flake8-isort
+coverage==6.5.0  # https://github.com/nedbat/coveragepy
+black==22.10.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

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

@@ -3,12 +3,12 @@
 -r base.txt
 
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.8  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.10  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py