Merge pull request #59 from mabdullahadeel/cookiecutter-master-2022.09.01

mabdullahadeel · web-flow · commit 7483c6d553a0 · 2022-09-03T01:21:50.000+05:00
update to upstream v`2022.09.01`
diff --git a/.github/contributors.json b/.github/contributors.json
@@ -1282,5 +1282,10 @@
     "name": "monosans",
     "github_login": "monosans",
     "twitter_username": ""
+  },
+  {
+    "name": "Marcio Mazza",
+    "github_login": "marciomazza",
+    "twitter_username": "marciomazza"
   }
 ]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
     hooks:
       - id: black
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,31 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.09.01
+
+### Changed
+- Add article to README about how to use a hosted DB ([#3844](https://github.com/cookiecutter/cookiecutter-django/pull/3844))
+### Updated
+- Update sentry-sdk to 1.9.6 ([#3856](https://github.com/cookiecutter/cookiecutter-django/pull/3856))
+- Auto-update pre-commit hooks ([#3858](https://github.com/cookiecutter/cookiecutter-django/pull/3858))
+- Update black to 22.8.0 ([#3857](https://github.com/cookiecutter/cookiecutter-django/pull/3857))
+
+## 2022.08.26
+
+### Changed
+- Fix formatting in docs ([#3850](https://github.com/cookiecutter/cookiecutter-django/pull/3850))
+
+## 2022.08.24
+
+### Updated
+- Update django-debug-toolbar to 3.6.0 ([#3847](https://github.com/cookiecutter/cookiecutter-django/pull/3847))
+- Update werkzeug to 2.2.2 ([#3846](https://github.com/cookiecutter/cookiecutter-django/pull/3846))
+- Update coverage to 6.4.4 ([#3842](https://github.com/cookiecutter/cookiecutter-django/pull/3842))
+- Update uvicorn to 0.18.3 ([#3845](https://github.com/cookiecutter/cookiecutter-django/pull/3845))
+- Update sentry-sdk to 1.9.5 ([#3841](https://github.com/cookiecutter/cookiecutter-django/pull/3841))
+- Update flower to 1.2.0 ([#3836](https://github.com/cookiecutter/cookiecutter-django/pull/3836))
+- Update django-storages to 1.13.1 ([#3833](https://github.com/cookiecutter/cookiecutter-django/pull/3833))
+
 ## 2022.08.15
 
 ### Updated
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1209,6 +1209,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Marcio Mazza</td>
+    <td>
+      <a href="https://github.com/marciomazza">marciomazza</a>
+    </td>
+    <td>marciomazza</td>
+  </tr>
   <tr>
     <td>Martin Blech</td>
     <td>
diff --git a/README.md b/README.md
@@ -235,6 +235,7 @@ experience better.
 
 ## Articles
 
+- [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021
 - [Using cookiecutter-django with Google Cloud Storage](https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html) - Mar. 12, 2019
 - [cookiecutter-django with Nginx, Route 53 and ELB](https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/) - Feb. 12, 2018
 - [cookiecutter-django and Amazon RDS](https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/) - Feb. 7, 2018
diff --git a/docs/faq.rst b/docs/faq.rst
@@ -6,7 +6,7 @@ FAQ
 Why is there a django.contrib.sites directory in Cookiecutter Django?
 ---------------------------------------------------------------------
 
-It is there to add a migration so you don't have to manually change the ``sites.Site`` record from ``example.com`` to whatever your domain is. Instead, your ``{{cookiecutter.domain_name}}`` and {{cookiecutter.project_name}} value is placed by **Cookiecutter** in the domain and name fields respectively.
+It is there to add a migration so you don't have to manually change the ``sites.Site`` record from ``example.com`` to whatever your domain is. Instead, your ``{{cookiecutter.domain_name}}`` and ``{{cookiecutter.project_name}}`` value is placed by **Cookiecutter** in the domain and name fields respectively.
 
 See `0003_set_site_domain_and_name.py`_.
 
diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==22.6.0
+black==22.8.0
 isort==5.10.1
 flake8==5.0.4
 flake8-isort==4.2.0
@@ -13,7 +13,7 @@ pre-commit==2.20.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.25.1
-pytest==7.1.2
+pytest==7.1.3
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.08.15"
+version = "2022.09.01"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         args: [--py39-plus]
 
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -20,11 +20,11 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 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
 {%- if cookiecutter.use_docker == 'y' %}
-flower==1.1.0  # https://github.com/mher/flower
+flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.18.2  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.18.3  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.2.1 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.database_engine == "postgresql" %}
 {%- if cookiecutter.use_docker == 'y' %}
@@ -20,7 +20,7 @@ watchfiles==0.16.1  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==0.971  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
-pytest==7.1.2  # https://github.com/pytest-dev/pytest
+pytest==7.1.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs
@@ -35,8 +35,8 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==5.0.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
-coverage==6.4.3  # https://github.com/nedbat/coveragepy
-black==22.6.0  # https://github.com/psf/black
+coverage==6.4.4  # https://github.com/nedbat/coveragepy
+black==22.8.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
@@ -47,7 +47,7 @@ pre-commit==2.20.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.5.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.6.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.0  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{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.9.4  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.7  # 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
@@ -21,9 +21,9 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.12.3  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.13.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.12.3  # https://github.com/jschneier/django-storages
+django-storages[google]==1.13.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.6  # https://github.com/anymail/django-anymail
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.9.9
+python-3.9.13

Original file line number	Diff line number	Diff line change
`@@ -1282,5 +1282,10 @@`
`1282`	`1282`	`"name": "monosans",`
`1283`	`1283`	`"github_login": "monosans",`
`1284`	`1284`	`"twitter_username": ""`
	`1285`	`+ },`
	`1286`	`+ {`
	`1287`	`+ "name": "Marcio Mazza",`
	`1288`	`+ "github_login": "marciomazza",`
	`1289`	`+ "twitter_username": "marciomazza"`
`1285`	`1290`	`}`
`1286`	`1291`	`]`