Merge branch 'cookiecutter:master' into main

CHANGELOG.md

@@ -3,6 +3,42 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.06.02
+
+### Updated
+- Update coverage to 6.4.1 ([#3729](https://github.com/cookiecutter/cookiecutter-django/pull/3729))
+- Update redis to 4.3.3 ([#3728](https://github.com/cookiecutter/cookiecutter-django/pull/3728))
+
+## 2022.06.01
+
+### Updated
+- Update redis to 4.3.2 ([#3726](https://github.com/cookiecutter/cookiecutter-django/pull/3726))
+
+## 2022.05.24
+
+### Updated
+- Update coverage to 6.4 ([#3716](https://github.com/cookiecutter/cookiecutter-django/pull/3716))
+
+## 2022.05.18
+
+### Updated
+- Update pillow to 9.1.1 ([#3714](https://github.com/cookiecutter/cookiecutter-django/pull/3714))
+
+## 2022.05.16
+
+### Changed
+- Update postgres versions ([#3712](https://github.com/cookiecutter/cookiecutter-django/pull/3712))
+### Updated
+- Update django-anymail to 8.6 ([#3713](https://github.com/cookiecutter/cookiecutter-django/pull/3713))
+
+## 2022.05.14
+
+### Updated
+- Update coverage to 6.3.3 ([#3709](https://github.com/cookiecutter/cookiecutter-django/pull/3709))
+- Update whitenoise to 6.1.0 ([#3707](https://github.com/cookiecutter/cookiecutter-django/pull/3707))
+- Update sentry-sdk to 1.5.12 ([#3706](https://github.com/cookiecutter/cookiecutter-django/pull/3706))
+- Update redis to 4.3.1 ([#3704](https://github.com/cookiecutter/cookiecutter-django/pull/3704))
+
 ## 2022.05.07
 
 ### Changed

docs/project-generation-options.rst

@@ -55,11 +55,11 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 14.1
+    1. 14
-    2. 13.5
+    2. 13
-    3. 12.9
+    3. 12
-    4. 11.14
+    4. 11
-    5. 10.19
+    5. 10
 
 cloud_provider:
     Select a cloud provider for static & media files. The choices are:

docs/requirements.txt

@@ -1,2 +1,2 @@
-sphinx==4.5.0
+sphinx==5.0.1
 sphinx-rtd-theme==1.0.0

setup.py

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

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

@@ -1,6 +1,6 @@
 pytz==2022.1  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
-Pillow==9.1.0  # https://github.com/python-pillow/Pillow
+Pillow==9.1.1  # 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
@@ -10,15 +10,15 @@ rcssmin==1.1.0  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==6.0.0  # https://github.com/evansd/whitenoise
+whitenoise==6.1.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.2.2  # https://github.com/redis/redis-py
+redis==4.3.3  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.2.6  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
-django-celery-beat==2.2.1  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.3.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
@@ -42,7 +42,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.12.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
 drf-spectacular==0.22.1  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

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

@@ -14,23 +14,23 @@ watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.950  # https://github.com/python/mypy
-django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.11.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==1.6.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==4.5.0  # https://github.com/sphinx-doc/sphinx
+sphinx==5.0.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.3.2  # https://github.com/nedbat/coveragepy
+coverage==6.4.1  # https://github.com/nedbat/coveragepy
 black==22.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

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

@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.11  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.12  # 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
@@ -22,21 +22,21 @@ django-storages[boto3]==1.12.3  # https://github.com/jschneier/django-storages
 django-storages[google]==1.12.3  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==8.5  # https://github.com/anymail/django-anymail
+django-anymail==8.6  # https://github.com/anymail/django-anymail
 {%- endif %}

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py

@@ -63,7 +63,7 @@ class TestUserUpdateView:
 
         # Initialize the form
         form = UserAdminChangeForm()
-        form.cleaned_data = []
+        form.cleaned_data = {}
         view.form_valid(form)
 
         messages_sent = [m.message for m in messages.get_messages(request)]