Merge branch 'master' into upgrade/django-4.0

2025-08-16 01:44:51 +03:00 · 2022-09-28 22:23:01 +01:00 · 2022-09-28 22:23:01 +01:00 · 5cb8cf9d28
commit 5cb8cf9d28
parent ba80ce1e4a cd5d279050
18 changed files with 110 additions and 24 deletions
--- a/.github/contributors.json
+++ b/.github/contributors.json
@ -1282,5 +1282,15 @@
    "name": "monosans",
    "github_login": "monosans",
    "twitter_username": ""
+  },
+  {
+    "name": "Marcio Mazza",
+    "github_login": "marciomazza",
+    "twitter_username": "marciomazza"
+  },
+  {
+    "name": "Brandon Rumiser",
+    "github_login": "brumiser1550",
+    "twitter_username": ""
  }
 ]
--- 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
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -9,14 +9,14 @@ repos:
      - id: check-yaml

  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v2.38.2
    hooks:
      - id: pyupgrade
        args: [--py39-plus]
        exclude: hooks/

  - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
    hooks:
      - id: black

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,68 @@ All enhancements and patches to Cookiecutter Django will be documented in this f

 <!-- GENERATOR_PLACEHOLDER -->

+## 2022.09.27
+
+### Updated
+- Update sphinx to 5.2.2 ([#3884](https://github.com/cookiecutter/cookiecutter-django/pull/3884))
+
+## 2022.09.26
+
+### Updated
+- Update drf-spectacular to 0.24.2 ([#3882](https://github.com/cookiecutter/cookiecutter-django/pull/3882))
+- Update djangorestframework to 3.14.0 ([#3881](https://github.com/cookiecutter/cookiecutter-django/pull/3881))
+- Update django-debug-toolbar to 3.7.0 ([#3878](https://github.com/cookiecutter/cookiecutter-django/pull/3878))
+- Auto-update pre-commit hooks ([#3877](https://github.com/cookiecutter/cookiecutter-django/pull/3877))
+- Bump stefanzweifel/git-auto-commit-action from 4.14.1 to 4.15.0 ([#3880](https://github.com/cookiecutter/cookiecutter-django/pull/3880))
+- Update sphinx to 5.2.1 ([#3879](https://github.com/cookiecutter/cookiecutter-django/pull/3879))
+
+## 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
+- Update sentry-sdk to 1.9.8 ([#3861](https://github.com/cookiecutter/cookiecutter-django/pull/3861))
+
+## 2022.09.02
+
+### Updated
+- Update pytest to 7.1.3 ([#3860](https://github.com/cookiecutter/cookiecutter-django/pull/3860))
+- Update sentry-sdk to 1.9.7 ([#3859](https://github.com/cookiecutter/cookiecutter-django/pull/3859))
+
+## 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
--- 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>
@ -1209,6 +1216,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>
--- a/README.md
+++ b/README.md
@ -232,6 +232,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
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@ -82,7 +82,7 @@ First things first.

 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/
 .. _Redis: https://redis.io/download
--- 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`_.

--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@ -1,2 +1,2 @@
-sphinx==5.1.1
+sphinx==5.2.2
 sphinx-rtd-theme==1.0.0
--- 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
@ -12,8 +12,8 @@ pre-commit==2.20.0

 # Testing
 # ------------------------------------------------------------------------------
-tox==3.25.1
-pytest==7.1.2
+tox==3.26.0
+pytest==7.1.3
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
--- a/setup.py
+++ b/setup.py
@ -5,7 +5,7 @@ except ImportError:
    from distutils.core import setup

 # We use calendar versioning
-version = "2022.08.24"
+version = "2022.09.27"

 with open("README.rst") as readme_file:
    long_description = readme_file.read()
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@ -10,13 +10,13 @@ repos:
      - id: check-yaml

  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v2.38.2
    hooks:
      - id: pyupgrade
        args: [--py39-plus]

  - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
    hooks:
      - id: black

--- 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 %}
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@ -22,7 +22,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

--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@ -167,7 +167,6 @@ EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
 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/
--- 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 %}
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@ -8,14 +8,14 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
 {%- 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
 # ------------------------------------------------------------------------------
 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
@ -23,7 +23,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.2  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild

 # Code quality
@ -31,7 +31,7 @@ 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.4  # https://github.com/nedbat/coveragepy
-black==22.6.0  # https://github.com/psf/black
+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
@ -42,7 +42,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
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{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.9.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.8  # 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