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

.github/contributors.json

@@ -1222,5 +1222,10 @@
     "name": "Vikas Yadav",
     "github_login": "vik-y",
     "twitter_username": ""
+  },
+  {
+    "name": "Abdullah Adeel",
+    "github_login": "mabdullahadeel",
+    "twitter_username": "abdadeel_"
   }
 ]

CHANGELOG.md

@@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.27
+
+### Updated
+- Update redis to 4.1.2 ([#3551](https://github.com/cookiecutter/cookiecutter-django/pull/3551))
+
+## 2022.01.26
+
+### Updated
+- Update coverage to 6.3 ([#3550](https://github.com/cookiecutter/cookiecutter-django/pull/3550))
+- Update sentry-sdk to 1.5.4 ([#3549](https://github.com/cookiecutter/cookiecutter-django/pull/3549))
+- Update django-crispy-forms to 1.14.0 ([#3548](https://github.com/cookiecutter/cookiecutter-django/pull/3548))
+- Update uvicorn to 0.17.0.post1 ([#3547](https://github.com/cookiecutter/cookiecutter-django/pull/3547))
+
+## 2022.01.21
+
+### Changed
+- mysql support link ([#3544](https://github.com/cookiecutter/cookiecutter-django/pull/3544))
+### Updated
+- Update sentry-sdk to 1.5.3 ([#3543](https://github.com/cookiecutter/cookiecutter-django/pull/3543))
+- Update django-anymail to 8.5 ([#3542](https://github.com/cookiecutter/cookiecutter-django/pull/3542))
+
 ## 2022.01.19
 
 ### Changed

CONTRIBUTORS.md

@@ -131,6 +131,13 @@ Listed in alphabetical order.
     </td>
     <td>Qoyyuum</td>
   </tr>
+  <tr>
+    <td>Abdullah Adeel</td>
+    <td>
+      <a href="https://github.com/mabdullahadeel">mabdullahadeel</a>
+    </td>
+    <td>abdadeel_</td>
+  </tr>
   <tr>
     <td>Adam Bogdał</td>
     <td>

README.md

@@ -50,6 +50,7 @@ _These features can be enabled during initial project setup._
 ## Constraints
 
 - Only maintained 3rd party libraries are used.
+- Uses PostgreSQL everywhere: 10.19 - 14.1 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
 - Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 ## Support this Project!
@@ -204,6 +205,11 @@ If you are using [PyUp](https://pyup.io) to keep your dependencies updated and s
 
 Scattered throughout the Python and HTML of this project are places marked with "your stuff". This is where third-party libraries are to be integrated with your project.
 
+## For MySQL users
+
+To get full MySQL support in addition to the default Postgresql, you can use this fork of the cookiecutter-django:
+https://github.com/mabdullahadeel/cookiecutter-django-mysql
+
 ## Releases
 
 Need a stable release? You can find them at <https://github.com/cookiecutter/cookiecutter-django/releases>

setup.py

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

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

@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.1.1  # https://github.com/redis/redis-py
+redis==4.1.2  # 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 %}
@@ -24,7 +24,7 @@ flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.17.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.17.0.post1  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django
@@ -33,7 +33,7 @@ django==3.2.11  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.47.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==3.1  # https://github.com/django-compressor/django-compressor

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

@@ -35,7 +35,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.2  # https://github.com/nedbat/coveragepy
+coverage==6.3  # https://github.com/nedbat/coveragepy
 black==21.12b0  # https://github.com/psf/black
 pylint-django==2.5.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

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

@@ -12,7 +12,7 @@ mysqlclient==2.1.0 # https://github.com/PyMySQL/mysqlclient
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.4  # 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
@@ -26,21 +26,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.4  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==8.4  # https://github.com/anymail/django-anymail
+django-anymail==8.5  # https://github.com/anymail/django-anymail
 {%- endif %}