Merge branch 'cookiecutter:master' into master

mabdullahadeel · web-flow · commit a00e504c3c82 · 2022-09-27T01:50:22.000+05:00
diff --git a/.github/contributors.json b/.github/contributors.json
@@ -1287,5 +1287,10 @@
     "name": "Marcio Mazza",
     "github_login": "marciomazza",
     "twitter_username": "marciomazza"
+  },
+  {
+    "name": "Brandon Rumiser",
+    "github_login": "brumiser1550",
+    "twitter_username": ""
   }
 ]
diff --git a/.github/workflows/update-contributors.yml b/.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.14.1
+        uses: stefanzweifel/git-auto-commit-action@v4.15.0
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v2.38.2
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,28 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.09.24
+
+### Fixed
+- Remove `--no-deps` in pip wheels command of docs Dockerfile ([#3875](https://github.com/cookiecutter/cookiecutter-django/pull/3875))
+
+## 2022.09.23
+
+### Changed
+- Reload uvicorn on html file change ([#3866](https://github.com/cookiecutter/cookiecutter-django/pull/3866))
+- Mailjet default api url does not work out of the box ([#3871](https://github.com/cookiecutter/cookiecutter-django/pull/3871))
+### Updated
+- Auto-update pre-commit hooks ([#3872](https://github.com/cookiecutter/cookiecutter-django/pull/3872))
+- Update django-extensions to 3.2.1 ([#3867](https://github.com/cookiecutter/cookiecutter-django/pull/3867))
+- Update tox to 3.26.0 ([#3864](https://github.com/cookiecutter/cookiecutter-django/pull/3864))
+- Update drf-spectacular to 0.24.1 ([#3874](https://github.com/cookiecutter/cookiecutter-django/pull/3874))
+
+## 2022.09.15
+
+### Updated
+- Update watchfiles to 0.17.0 ([#3869](https://github.com/cookiecutter/cookiecutter-django/pull/3869))
+- Update drf-spectacular to 0.24.0 ([#3870](https://github.com/cookiecutter/cookiecutter-django/pull/3870))
+
 ## 2022.09.05
 
 ### Updated
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -376,6 +376,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Brandon Rumiser</td>
+    <td>
+      <a href="https://github.com/brumiser1550">brumiser1550</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Brent Payne</td>
     <td>
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
@@ -108,7 +108,7 @@ Setup with MySQL_
 
 or if you're running asynchronously: ::
 
-    $ uvicorn config.asgi:application --host 0.0.0.0 --reload
+    $ uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
 
 .. _PostgreSQL: https://www.postgresql.org/download/
 .. _MySQL: https://dev.mysql.com/downloads/
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.1.1
+sphinx==5.2.1
 sphinx-rtd-theme==1.0.0
diff --git a/requirements.txt b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.25.1
+tox==3.26.0
 pytest==7.1.3
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.05"
+version = "2022.09.24"
 
 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
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v2.38.2
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -7,7 +7,7 @@ set -o nounset
 
 python manage.py migrate
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn config.asgi:application --host 0.0.0.0 --reload
+uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
 {%- else %}
 python manage.py runserver_plus 0.0.0.0:8000
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 COPY ./requirements /requirements
 
 # create python dependency wheels
-RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels  \
+RUN pip wheel --no-cache-dir --wheel-dir /usr/src/app/wheels  \
   -r /requirements/local.txt -r /requirements/production.txt \
   && rm -rf /requirements
 
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -167,7 +167,6 @@
 ANYMAIL = {
     "MAILJET_API_KEY": env("MAILJET_API_KEY"),
     "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
-    "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"),
 }
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 # https://anymail.readthedocs.io/en/stable/esps/mandrill/
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,8 +41,8 @@ django-compressor==4.1  # https://github.com/django-compressor/django-compressor
 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
+djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.23.1  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.24.2  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
 mysqlclient==2.1.0 # https://github.com/PyMySQL/mysqlclient
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchfiles==0.16.1  # https://github.com/samuelcolvin/watchfiles
+watchfiles==0.17.0  # https://github.com/samuelcolvin/watchfiles
 {%- endif %}
 
 # Testing
@@ -28,7 +28,7 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.1.1  # https://github.com/sphinx-doc/sphinx
+sphinx==5.2.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
@@ -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.6.0  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.2.0  # https://github.com/django-extensions/django-extensions
+django-debug-toolbar==3.7.0  # https://github.com/jazzband/django-debug-toolbar
+django-extensions==3.2.1  # 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

Original file line number	Diff line number	Diff line change
`@@ -1287,5 +1287,10 @@`
`1287`	`1287`	`"name": "Marcio Mazza",`
`1288`	`1288`	`"github_login": "marciomazza",`
`1289`	`1289`	`"twitter_username": "marciomazza"`
	`1290`	`+ },`
	`1291`	`+ {`
	`1292`	`+ "name": "Brandon Rumiser",`
	`1293`	`+ "github_login": "brumiser1550",`
	`1294`	`+ "twitter_username": ""`
`1290`	`1295`	`}`
`1291`	`1296`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-sphinx==5.1.1`
	`1`	`+sphinx==5.2.1`
`2`	`2`	`sphinx-rtd-theme==1.0.0`