From 87897f22ff90d9123ba0028800fca7b9684cfbc6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 15 Sep 2022 03:10:12 -0500 Subject: [PATCH 001/205] Update drf-spectacular to 0.24.0 (#3870) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 966075655..8d7243c91 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -44,5 +44,5 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis djangorestframework==3.13.1 # 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.0 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 638bbd5f5191b3377254728a4e1ee898b9c3a6ec Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 15 Sep 2022 03:10:34 -0500 Subject: [PATCH 002/205] Update watchfiles to 0.17.0 (#3869) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 1c0dacd38..dae689706 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ 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 From 8bcfcc764d39898a151ae2c7f9f22c7ff2c42a92 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Sep 2022 03:01:32 +0000 Subject: [PATCH 003/205] Release 2022.09.15 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 193ef9228..a3e281f2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 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/setup.py b/setup.py index a10b51e7f..48068adfd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.05" +version = "2022.09.15" with open("README.rst") as readme_file: long_description = readme_file.read() From c6a12fae8bd80041fa445fe9c8b625e5ede1d04e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 16 Sep 2022 03:17:49 +0000 Subject: [PATCH 004/205] Auto-update pre-commit hooks --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4bed79641..82ba2f231 100644 --- 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.0 hooks: - id: pyupgrade args: [--py39-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index ec386b17e..e055b3cf8 100644 --- 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.0 hooks: - id: pyupgrade args: [--py39-plus] From 84ec3e2f6f2c5281864cb0c69808876127fd5c32 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 23 Sep 2022 03:47:54 -0500 Subject: [PATCH 005/205] Update drf-spectacular from 0.24.0 to 0.24.1 (#3874) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8d7243c91..58b2c6520 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -44,5 +44,5 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis djangorestframework==3.13.1 # 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.24.0 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.24.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 18f7488c3c66eabc0f5351cd7580244f6f1dc823 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 23 Sep 2022 03:48:18 -0500 Subject: [PATCH 006/205] Update tox from 3.25.1 to 3.26.0 (#3864) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4151bff95..c8b7cf9a0 100644 --- 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 From 944bd491eae52678aa60847cf3ec9dbd1290be7c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 23 Sep 2022 03:48:48 -0500 Subject: [PATCH 007/205] Update django-extensions from 3.2.0 to 3.2.1 (#3867) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index dae689706..7910ce6d8 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -43,6 +43,6 @@ 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-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 From e944a5ffe117c887661dcd8a5ac3ef9e9cb119a6 Mon Sep 17 00:00:00 2001 From: Brandon Rumiser Date: Fri, 23 Sep 2022 15:51:05 -0400 Subject: [PATCH 008/205] Mailjet default api url does not work out of the box (#3871) --- {{cookiecutter.project_slug}}/config/settings/production.py | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index b792e5448..046f5e4a0 100644 --- 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/ From 96dcbae247331466454a2ec70d5576880c2759a6 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 23 Sep 2022 19:51:49 +0000 Subject: [PATCH 009/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 15d481a4d..8a391f657 100644 --- 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": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0dd360bd3..05443098b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -376,6 +376,13 @@ Listed in alphabetical order. + + Brandon Rumiser + + brumiser1550 + + + Brent Payne From 9cf280d34365ebf6fb6bea4a4c7330bb463d324c Mon Sep 17 00:00:00 2001 From: monosans Date: Fri, 23 Sep 2022 20:28:11 +0000 Subject: [PATCH 010/205] Reload uvicorn on html file change (#3866) --- docs/developing-locally.rst | 2 +- {{cookiecutter.project_slug}}/compose/local/django/start | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 23bb7b9a8..77c8a5206 100644 --- 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 diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start index 9cbb6c897..3fe547357 100644 --- 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 %} From 92c790df8326d4a71d24e4af0343b2a3b7d6d8f9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 24 Sep 2022 03:00:13 +0000 Subject: [PATCH 011/205] Release 2022.09.23 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e281f2e..1cab789ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 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 diff --git a/setup.py b/setup.py index 48068adfd..52e998a8d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.15" +version = "2022.09.23" with open("README.rst") as readme_file: long_description = readme_file.read() From 88c063f7ff975d7e23ff32a8eb55a04bdadf8558 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 24 Sep 2022 14:37:12 +0100 Subject: [PATCH 012/205] Remove `--no-deps` in pip wheels command of docs Dockerfile (#3875) --- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 6f1bb8b5e..0ba192b10 100644 --- 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 From 012fb2b56f0723c2d8806f32c476ee0eb002a825 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 25 Sep 2022 03:00:16 +0000 Subject: [PATCH 013/205] Release 2022.09.24 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cab789ac..404417a5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 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 diff --git a/setup.py b/setup.py index 52e998a8d..94c3f40fd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.23" +version = "2022.09.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 928836ee8904c93305b1c98e5425103334e20960 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Sep 2022 08:11:30 -0500 Subject: [PATCH 014/205] Update sphinx to 5.2.1 (#3879) --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index dc8f4c6e9..371755c3f 100644 --- 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/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7910ce6d8..ed3eb15db 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -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.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From a8c7900b48cbdf4571884c37e7d72b4eeb7b2515 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:11:57 +0100 Subject: [PATCH 015/205] Bump stefanzweifel/git-auto-commit-action from 4.14.1 to 4.15.0 (#3880) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 6ecf8af90..78a4ef9ed 100644 --- 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 From e7ab32e794c5cbebccb89474081f04f91b9ad690 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:12:18 +0100 Subject: [PATCH 016/205] Auto-update pre-commit hooks (#3877) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 82ba2f231..f74f410ea 100644 --- 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.38.0 + rev: v2.38.2 hooks: - id: pyupgrade args: [--py39-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index e055b3cf8..d64af3bf3 100644 --- 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.38.0 + rev: v2.38.2 hooks: - id: pyupgrade args: [--py39-plus] From d189be03708a35bd89385f724a1848109fa333b5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Sep 2022 08:12:57 -0500 Subject: [PATCH 017/205] Update django-debug-toolbar to 3.7.0 (#3878) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index ed3eb15db..7b9cac4b3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -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-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 From 94292f1aa9761776c403611f158f67977c6aef01 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Sep 2022 10:03:39 -0500 Subject: [PATCH 018/205] Update djangorestframework to 3.14.0 (#3881) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 58b2c6520..23375fab5 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,7 +41,7 @@ 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.24.1 # https://github.com/tfranzel/drf-spectacular From 6202d26fe82b8d002c3456acc04a1248e4bec482 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 26 Sep 2022 08:58:07 -0700 Subject: [PATCH 019/205] Update drf-spectacular from 0.24.1 to 0.24.2 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 23375fab5..7d664a39b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -44,5 +44,5 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis 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.24.1 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.24.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 7a1dedaffe072ed782ef08621b4153a08cf6e7b3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Sep 2022 02:58:00 +0000 Subject: [PATCH 020/205] Release 2022.09.26 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 404417a5e..6886d71f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 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 diff --git a/setup.py b/setup.py index 94c3f40fd..9bff976f9 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.24" +version = "2022.09.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 68f21b6028bd531d5108e7454a83ad8473e466a5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 27 Sep 2022 16:07:21 -0500 Subject: [PATCH 021/205] Update sphinx to 5.2.2 (#3884) * Update sphinx from 5.2.1 to 5.2.2 * Update sphinx from 5.2.1 to 5.2.2 --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 371755c3f..14fb7fd49 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.2.1 +sphinx==5.2.2 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7b9cac4b3..53340a9c4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==5.2.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 From cd5d2790503e8f557747b8c736521acda04a3209 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Sep 2022 02:59:08 +0000 Subject: [PATCH 022/205] Release 2022.09.27 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6886d71f4..f0cb88010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.09.27 + +### Updated +- Update sphinx to 5.2.2 ([#3884](https://github.com/cookiecutter/cookiecutter-django/pull/3884)) + ## 2022.09.26 ### Updated diff --git a/setup.py b/setup.py index 9bff976f9..a4f23da25 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.26" +version = "2022.09.27" with open("README.rst") as readme_file: long_description = readme_file.read() From 3b05e02aa091cb629de00c378319ec70d310dc88 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Sep 2022 12:55:37 -0700 Subject: [PATCH 023/205] Update crispy-bootstrap5 from 0.6 to 0.7 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 7d664a39b..a1aee1c8b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -34,7 +34,7 @@ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth 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 +crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} django-compressor==4.1 # https://github.com/django-compressor/django-compressor {%- endif %} From f1ef4f85ff2f34e58ba2779bd047a7232e68dfce Mon Sep 17 00:00:00 2001 From: krati yadav Date: Fri, 30 Sep 2022 03:37:49 +0530 Subject: [PATCH 024/205] Removed SENDGRID_MERGE_FIELD_FORMAT from production.py (#3885) --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 046f5e4a0..4115eacee 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -189,8 +189,6 @@ ANYMAIL = { EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend" ANYMAIL = { "SENDGRID_API_KEY": env("SENDGRID_API_KEY"), - "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"), - "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"), "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"), } {%- elif cookiecutter.mail_service == 'SendinBlue' %} From 71d4a52d11b8d76b0bbab5ed2478afdb94708078 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 29 Sep 2022 22:08:27 +0000 Subject: [PATCH 025/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 8a391f657..2467ed3e1 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1292,5 +1292,10 @@ "name": "Brandon Rumiser", "github_login": "brumiser1550", "twitter_username": "" + }, + { + "name": "krati yadav", + "github_login": "krati5", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 05443098b..669e9d772 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1104,6 +1104,13 @@ Listed in alphabetical order. + + krati yadav + + krati5 + + + Krzysztof Szumny From 5e3397a972744e5c4b464fc15019a40d7ca92452 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 30 Sep 2022 03:02:52 +0000 Subject: [PATCH 026/205] Release 2022.09.29 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0cb88010..5d5af52e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.09.29 + +### Changed +- Remove outdated & optional Sendgrid settings from production config ([#3885](https://github.com/cookiecutter/cookiecutter-django/pull/3885)) + ## 2022.09.27 ### Updated diff --git a/setup.py b/setup.py index a4f23da25..5e8a0926a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.27" +version = "2022.09.29" with open("README.rst") as readme_file: long_description = readme_file.read() From 4edbc804f6053e0c9572f701cfe306fd7bc71199 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Sep 2022 14:23:33 -0500 Subject: [PATCH 027/205] Update sphinx to 5.2.3 (#3887) --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 14fb7fd49..113d073e3 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.2.2 +sphinx==5.2.3 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 53340a9c4..f014ac9cf 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==5.2.2 # https://github.com/sphinx-doc/sphinx +sphinx==5.2.3 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From fd8aa73d313d8e3520f8292613444d59701fb613 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Sep 2022 14:25:08 -0500 Subject: [PATCH 028/205] Update sentry-sdk to 1.9.9 (#3888) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 371f81cbc..c58861083 100644 --- 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.8 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.9 # 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 From 25ffbb00813b7072993c512c1f958e91686674d7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Sep 2022 14:26:01 -0500 Subject: [PATCH 029/205] Update mypy to 0.981 (#3889) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index f014ac9cf..4a38d7953 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==0.971 # https://github.com/python/mypy +mypy==0.981 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.1.3 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar From 7fcfc0154192560cd4e45f1aca8599ba9d3d8989 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Sep 2022 14:32:52 -0500 Subject: [PATCH 030/205] Update coverage to 6.5.0 (#3890) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4a38d7953..ec038f618 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,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 +coverage==6.5.0 # 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' %} From 15487a1ac7a54222e825a2cc2dd297f58449328c Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 1 Oct 2022 03:01:43 +0000 Subject: [PATCH 031/205] Release 2022.09.30 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d5af52e4..4b21b5ca3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.09.30 + +### Updated +- Update coverage to 6.5.0 ([#3890](https://github.com/cookiecutter/cookiecutter-django/pull/3890)) +- Update mypy to 0.981 ([#3889](https://github.com/cookiecutter/cookiecutter-django/pull/3889)) +- Update sentry-sdk to 1.9.9 ([#3888](https://github.com/cookiecutter/cookiecutter-django/pull/3888)) +- Update sphinx to 5.2.3 ([#3887](https://github.com/cookiecutter/cookiecutter-django/pull/3887)) + ## 2022.09.29 ### Changed diff --git a/setup.py b/setup.py index 5e8a0926a..3ecf541fe 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.29" +version = "2022.09.30" with open("README.rst") as readme_file: long_description = readme_file.read() From 544cbef0ca08c05d0e2cab4698781bdc1b1bc1b3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 2 Oct 2022 04:17:44 -0500 Subject: [PATCH 032/205] Update pytz from 2022.2.1 to 2022.4 (#3891) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 7d664a39b..ff2e606f8 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.2.1 # https://github.com/stub42/pytz +pytz==2022.4 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify Pillow==9.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From ad28f471b610bdbf3f7e95040fafa967189e0ef0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 3 Oct 2022 02:45:53 +0000 Subject: [PATCH 033/205] Release 2022.10.02 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b21b5ca3..0240994f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.02 + +### Updated +- Update pytz to 2022.4 ([#3891](https://github.com/cookiecutter/cookiecutter-django/pull/3891)) + ## 2022.09.30 ### Updated diff --git a/setup.py b/setup.py index 3ecf541fe..3a6ae26a5 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.30" +version = "2022.10.02" with open("README.rst") as readme_file: long_description = readme_file.read() From 712c48582621ddb7ae35b4005ac3de6ec3a2f4d6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 3 Oct 2022 16:52:34 -0500 Subject: [PATCH 034/205] Update sentry-sdk from 1.9.9 to 1.9.10 (#3892) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index c58861083..df34af5e5 100644 --- 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.9 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.10 # 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 From 31c38c9566e0a1a300bc728bc51fb973f2c50e9a Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 4 Oct 2022 02:50:00 +0000 Subject: [PATCH 035/205] Release 2022.10.03 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0240994f4..490c15c19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.03 + +### Updated +- Update sentry-sdk to 1.9.10 ([#3892](https://github.com/cookiecutter/cookiecutter-django/pull/3892)) + ## 2022.10.02 ### Updated diff --git a/setup.py b/setup.py index 3a6ae26a5..76481dcef 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.02" +version = "2022.10.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 9e69de4a6a09390084ddbf4028e43904d82f135a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 08:19:35 +0100 Subject: [PATCH 036/205] Auto-update pre-commit hooks (#3894) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f74f410ea..e57cbf3cb 100644 --- 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.38.2 + rev: v3.0.0 hooks: - id: pyupgrade args: [--py39-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index d64af3bf3..b40b8717d 100644 --- 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.38.2 + rev: v3.0.0 hooks: - id: pyupgrade args: [--py39-plus] From 942a0bc3a9bbba6dfc3116d020ada143c1d25f27 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 4 Oct 2022 06:30:18 -0500 Subject: [PATCH 037/205] Update mypy to 0.982 (#3893) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index ec038f618..6144e64ed 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==0.981 # https://github.com/python/mypy +mypy==0.982 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.1.3 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar From 1ac727931a2766ee4e3d304cf6098fa55a91a6e5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 4 Oct 2022 10:23:16 -0500 Subject: [PATCH 038/205] Update django to 3.2.16 (#3895) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index ff2e606f8..e533275a6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.18.3 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.2.15 # pyup: < 4.0 # https://www.djangoproject.com/ +django==3.2.16 # pyup: < 4.0 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth From 4c9d7c663bb4dbaec42000b6c740e8974bf7ea4e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Oct 2022 02:49:42 +0000 Subject: [PATCH 039/205] Release 2022.10.04 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 490c15c19..de62415b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.04 + +### Updated +- Update django to 3.2.16 ([#3895](https://github.com/cookiecutter/cookiecutter-django/pull/3895)) +- Update mypy to 0.982 ([#3893](https://github.com/cookiecutter/cookiecutter-django/pull/3893)) +- Auto-update pre-commit hooks ([#3894](https://github.com/cookiecutter/cookiecutter-django/pull/3894)) + ## 2022.10.03 ### Updated diff --git a/setup.py b/setup.py index 76481dcef..81c0f86ed 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.03" +version = "2022.10.04" with open("README.rst") as readme_file: long_description = readme_file.read() From 4eaa833a9011ec362faa51a520ab2d1bea17442a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 11 Oct 2022 06:35:40 -0500 Subject: [PATCH 040/205] Update black to 22.10.0 (#3898) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c8b7cf9a0..f95f4e5eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==22.8.0 +black==22.10.0 isort==5.10.1 flake8==5.0.4 flake8-isort==4.2.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6144e64ed..1f9fe4df1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -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.5.0 # https://github.com/nedbat/coveragepy -black==22.8.0 # https://github.com/psf/black +black==22.10.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 From 790cf7e3797a4e0145078c156457466f241c2c4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 13:11:05 +0100 Subject: [PATCH 041/205] Bump stefanzweifel/git-auto-commit-action from 4.15.0 to 4.15.1 (#3903) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 78a4ef9ed..31fd3a2e0 100644 --- 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.15.0 + uses: stefanzweifel/git-auto-commit-action@v4.15.1 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From ebe1a3dc4cd744ac2becad7d2b000a617f6c1f03 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 11 Oct 2022 12:22:29 -0500 Subject: [PATCH 042/205] Update psycopg2 to 2.9.4 (#3896) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++-- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 1f9fe4df1..718c1df7d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,9 +3,9 @@ Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug ipdb==0.13.9 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 {%- else %} -psycopg2-binary==2.9.3 # https://github.com/psycopg/psycopg2 +psycopg2-binary==2.9.4 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index df34af5e5..bfbf02023 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==20.1.0 # https://github.com/benoitc/gunicorn -psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From ac1c5c7cbd768e3db2e2d398dd1af6cae3e0fc27 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 11 Oct 2022 12:23:15 -0500 Subject: [PATCH 043/205] Update gitpython to 3.1.29 (#3902) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f95f4e5eb..7ce718451 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.55 -gitpython==3.1.27 +gitpython==3.1.29 jinja2==3.1.2 requests==2.28.1 From be5cf566a58ee6597d56b9f3eced755a8879e087 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 11 Oct 2022 12:23:37 -0500 Subject: [PATCH 044/205] Update flake8-isort to 5.0.0 (#3901) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7ce718451..2e8e46fe3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==22.10.0 isort==5.10.1 flake8==5.0.4 -flake8-isort==4.2.0 +flake8-isort==5.0.0 pre-commit==2.20.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 718c1df7d..73d16a08e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ flake8==5.0.4 # https://github.com/PyCQA/flake8 -flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort +flake8-isort==5.0.0 # https://github.com/gforcada/flake8-isort coverage==6.5.0 # https://github.com/nedbat/coveragepy black==22.10.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 7eca9be8d287cc0c334df6abebcded7dec0ffc8d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 18:23:58 +0100 Subject: [PATCH 045/205] Auto-update pre-commit hooks (#3899) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 4 ++-- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e57cbf3cb..aa9d6f4eb 100644 --- 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: v3.0.0 + rev: v3.1.0 hooks: - id: pyupgrade args: [--py39-plus] exclude: hooks/ - repo: https://github.com/psf/black - rev: 22.8.0 + rev: 22.10.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index b40b8717d..1b68d8858 100644 --- 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: v3.0.0 + rev: v3.1.0 hooks: - id: pyupgrade args: [--py39-plus] - repo: https://github.com/psf/black - rev: 22.8.0 + rev: 22.10.0 hooks: - id: black From 507854158d6f134a91aaa4f3b1e40abba784eebd Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Oct 2022 02:59:21 +0000 Subject: [PATCH 046/205] Release 2022.10.11 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de62415b1..e01f9c35f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.11 + +### Updated +- Auto-update pre-commit hooks ([#3899](https://github.com/cookiecutter/cookiecutter-django/pull/3899)) +- Update flake8-isort to 5.0.0 ([#3901](https://github.com/cookiecutter/cookiecutter-django/pull/3901)) +- Update gitpython to 3.1.29 ([#3902](https://github.com/cookiecutter/cookiecutter-django/pull/3902)) +- Update psycopg2 to 2.9.4 ([#3896](https://github.com/cookiecutter/cookiecutter-django/pull/3896)) +- Bump stefanzweifel/git-auto-commit-action from 4.15.0 to 4.15.1 ([#3903](https://github.com/cookiecutter/cookiecutter-django/pull/3903)) +- Update black to 22.10.0 ([#3898](https://github.com/cookiecutter/cookiecutter-django/pull/3898)) + ## 2022.10.04 ### Updated diff --git a/setup.py b/setup.py index 81c0f86ed..8b7bfda00 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.04" +version = "2022.10.11" with open("README.rst") as readme_file: long_description = readme_file.read() From 985decdceca7e25b9b1c333b81dafd85ee177df2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 13 Oct 2022 02:47:29 -0500 Subject: [PATCH 047/205] Update pygithub from 1.55 to 1.56 (#3904) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2e8e46fe3..b72480ba4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.55 +PyGithub==1.56 gitpython==3.1.29 jinja2==3.1.2 requests==2.28.1 From b6039b00de8cab2f64b56d9981d51547e922b9ab Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 14 Oct 2022 03:01:59 +0000 Subject: [PATCH 048/205] Release 2022.10.13 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e01f9c35f..55c855859 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.13 + +### Updated +- Update pygithub to 1.56 ([#3904](https://github.com/cookiecutter/cookiecutter-django/pull/3904)) + ## 2022.10.11 ### Updated diff --git a/setup.py b/setup.py index 8b7bfda00..1954ecd4e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.11" +version = "2022.10.13" with open("README.rst") as readme_file: long_description = readme_file.read() From e002389c3576b772186ca3e0ba617248cbb573e7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Oct 2022 13:47:52 -0500 Subject: [PATCH 049/205] Update watchfiles to 0.18.0 (#3907) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 73d16a08e..c034aace0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 psycopg2-binary==2.9.4 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From b87aaff263c7b82da859b47df04e846dfc489d2b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Oct 2022 13:48:22 -0500 Subject: [PATCH 050/205] Update django-celery-beat to 2.4.0 (#3908) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e533275a6..7e641fc48 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -18,7 +18,7 @@ hiredis==2.0.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} 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 +django-celery-beat==2.4.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==1.2.0 # https://github.com/mher/flower {%- endif %} From 0c98640a0bc2e30572bc1f89cd5cf51c6dff8be1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Oct 2022 13:48:41 -0500 Subject: [PATCH 051/205] Update sphinx to 5.3.0 (#3905) --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 113d073e3..c3b371b13 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.2.3 +sphinx==5.3.0 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index c034aace0..b935093d7 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==5.2.3 # https://github.com/sphinx-doc/sphinx +sphinx==5.3.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 56d9a5e9fafab6a4deb98fd817d2638177d7d57a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Oct 2022 13:48:56 -0500 Subject: [PATCH 052/205] Update pytz to 2022.5 (#3906) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 7e641fc48..9f40fd2df 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.4 # https://github.com/stub42/pytz +pytz==2022.5 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify Pillow==9.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 9db27525981efb1de8cb80e2458c4388fb79042e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 19 Oct 2022 20:01:43 +0100 Subject: [PATCH 053/205] Upgrade to Django 4.0 (#3848) --- README.md | 2 +- setup.py | 2 +- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- .../users/migrations/0001_initial.py | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7059e07d2..149227e03 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ production-ready Django projects quickly. ## Features -- For Django 3.2 +- For Django 4.0 - Works with Python 3.9 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 diff --git a/setup.py b/setup.py index 1954ecd4e..f3fa55b07 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( classifiers=[ "Development Status :: 4 - Beta", "Environment :: Console", - "Framework :: Django :: 3.2", + "Framework :: Django :: 4.0", "Intended Audience :: Developers", "Natural Language :: English", "License :: OSI Approved :: BSD License", diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9f40fd2df..de5c61416 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.18.3 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.2.16 # pyup: < 4.0 # https://www.djangoproject.com/ +django==4.0.8 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py index 4c4d6954c..acd18512f 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py @@ -1,4 +1,3 @@ -# Generated by Django 3.2.9 on 2021-11-20 11:23 import django.contrib.auth.models import django.contrib.auth.validators from django.db import migrations, models From bdc4c323f914dc38be412f437ffe3df168aa4fcb Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 19 Oct 2022 20:14:03 +0100 Subject: [PATCH 054/205] Don't treat current version as newer --- scripts/create_django_issue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py index 262618531..5809f393d 100644 --- a/scripts/create_django_issue.py +++ b/scripts/create_django_issue.py @@ -108,7 +108,7 @@ def get_all_latest_django_versions( current_minor_version = DjVersion.parse(current_version_str) newer_versions: set[DjVersion] = set() for django_version in get_django_versions(): - if _django_max_version >= django_version >= current_minor_version: + if current_minor_version < django_version <= _django_max_version: newer_versions.add(django_version) return current_minor_version, sorted(newer_versions, reverse=True) From b623c0f956ed73bd237edd0b4b10f47f52387c09 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 19 Oct 2022 22:15:25 +0300 Subject: [PATCH 055/205] Set AWS_S3_MAX_MEMORY_SIZE (#3810) Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- docs/settings.rst | 1 + {{cookiecutter.project_slug}}/config/settings/production.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/docs/settings.rst b/docs/settings.rst index 7563f50d2..b8c6d448e 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -46,6 +46,7 @@ DJANGO_AWS_SECRET_ACCESS_KEY AWS_SECRET_ACCESS_KEY n/a DJANGO_AWS_STORAGE_BUCKET_NAME AWS_STORAGE_BUCKET_NAME n/a raises error DJANGO_AWS_S3_REGION_NAME AWS_S3_REGION_NAME n/a None DJANGO_AWS_S3_CUSTOM_DOMAIN AWS_S3_CUSTOM_DOMAIN n/a None +DJANGO_AWS_S3_MAX_MEMORY_SIZE AWS_S3_MAX_MEMORY_SIZE n/a 100_000_000 DJANGO_GCP_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error GOOGLE_APPLICATION_CREDENTIALS n/a n/a raises error SENTRY_DSN SENTRY_DSN n/a raises error diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 4115eacee..8eed5a805 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -88,6 +88,11 @@ AWS_S3_OBJECT_PARAMETERS = { "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate" } # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings +AWS_S3_MAX_MEMORY_SIZE = env.int( + "DJANGO_AWS_S3_MAX_MEMORY_SIZE", + default=100_000_000, # 100MB +) +# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None) # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront AWS_S3_CUSTOM_DOMAIN = env("DJANGO_AWS_S3_CUSTOM_DOMAIN", default=None) From 7fca0e9d9890f82cf015b6ff387c393a1875da1e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 20 Oct 2022 03:00:16 +0000 Subject: [PATCH 056/205] Release 2022.10.19 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55c855859..ece2b518d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.19 + +### Changed +- Set AWS_S3_MAX_MEMORY_SIZE ([#3810](https://github.com/cookiecutter/cookiecutter-django/pull/3810)) +- Upgrade to Django 4.0 ([#3848](https://github.com/cookiecutter/cookiecutter-django/pull/3848)) +### Updated +- Update pytz to 2022.5 ([#3906](https://github.com/cookiecutter/cookiecutter-django/pull/3906)) +- Update sphinx to 5.3.0 ([#3905](https://github.com/cookiecutter/cookiecutter-django/pull/3905)) +- Update django-celery-beat to 2.4.0 ([#3908](https://github.com/cookiecutter/cookiecutter-django/pull/3908)) +- Update watchfiles to 0.18.0 ([#3907](https://github.com/cookiecutter/cookiecutter-django/pull/3907)) + ## 2022.10.13 ### Updated diff --git a/setup.py b/setup.py index f3fa55b07..2b4640013 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.13" +version = "2022.10.19" with open("README.rst") as readme_file: long_description = readme_file.read() From 4ea0e98f3f1dafe31f3505644a9d141e1fc66746 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Mon, 24 Oct 2022 22:41:00 +0200 Subject: [PATCH 057/205] Upgrade Python version from 3.9 to 3.10 (#3913) --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/django-issue-checker.yml | 2 +- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- .pre-commit-config.yaml | 2 +- CONTRIBUTING.md | 2 +- README.md | 2 +- docs/deployment-on-pythonanywhere.rst | 2 +- docs/developing-locally.rst | 4 ++-- hooks/pre_gen_project.py | 2 +- setup.py | 2 +- tox.ini | 2 +- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 4 ++-- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 4 ++-- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.readthedocs.yml | 2 +- {{cookiecutter.project_slug}}/.travis.yml | 4 ++-- .../compose/local/django/Dockerfile | 2 +- .../compose/local/docs/Dockerfile | 2 +- .../compose/production/django/Dockerfile | 2 +- {{cookiecutter.project_slug}}/runtime.txt | 2 +- {{cookiecutter.project_slug}}/setup.cfg | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fa5add0d..d466f4032 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" cache: pip - name: Run pre-commit uses: pre-commit/action@v3.0.0 @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" cache: pip - name: Install dependencies run: pip install -r requirements.txt @@ -62,7 +62,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" cache: pip - name: Install dependencies run: pip install -r requirements.txt @@ -102,7 +102,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" cache: pip cache-dependency-path: | requirements.txt diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml index 26f57c51f..fd250604f 100644 --- a/.github/workflows/django-issue-checker.yml +++ b/.github/workflows/django-issue-checker.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index e51b4cbdc..1708e8b82 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Install pre-commit run: pip install pre-commit diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 14c590e59..27113a89f 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 31fd3a2e0..e9e994093 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index aa9d6f4eb..6d22c2e84 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: rev: v3.1.0 hooks: - id: pyupgrade - args: [--py39-plus] + args: [--py310-plus] exclude: hooks/ - repo: https://github.com/psf/black diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a9d5b088f..28bb81e38 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ To run all tests using various versions of python in virtualenvs defined in tox. It is possible to test with a specific version of python. To do this, the command is: - $ tox -e py39 + $ tox -e py310 This will run pytest with the python3.9 interpreter, for example. diff --git a/README.md b/README.md index 149227e03..9f2af6d37 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ production-ready Django projects quickly. ## Features - For Django 4.0 -- Works with Python 3.9 +- Works with Python 3.10 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 - [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ) diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst index f7bff12a4..7984d7b5e 100644 --- a/docs/deployment-on-pythonanywhere.rst +++ b/docs/deployment-on-pythonanywhere.rst @@ -34,7 +34,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o git clone # you can also use hg cd my-project-name - mkvirtualenv --python=/usr/bin/python3.9 my-project-name + mkvirtualenv --python=/usr/bin/python3.10 my-project-name pip install -r requirements/production.txt # may take a few minutes diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 77c8a5206..c9d28ff73 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -9,7 +9,7 @@ Setting Up Development Environment Make sure to have the following on your host: -* Python 3.9 +* Python 3.10 * PostgreSQL_. * Redis_, if using Celery * Cookiecutter_ @@ -18,7 +18,7 @@ First things first. #. Create a virtualenv: :: - $ python3.9 -m venv + $ python3.10 -m venv #. Activate the virtualenv you have just created: :: diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index 3fd4131c8..2845f012c 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -36,7 +36,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n": if python_major_version == 2: print( WARNING + "You're running cookiecutter under Python 2, but the generated " - "project requires Python 3.9+. Do you want to proceed (y/n)? " + TERMINATOR + "project requires Python 3.10+. Do you want to proceed (y/n)? " + TERMINATOR ) yes_options, no_options = frozenset(["y"]), frozenset(["n"]) while True: diff --git a/setup.py b/setup.py index 2b4640013..cf99cfa35 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ setup( "License :: OSI Approved :: BSD License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development", ], diff --git a/tox.ini b/tox.ini index 0afe3931d..0400e4f91 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = true -envlist = py39,black-template +envlist = py310,black-template [testenv] deps = -rrequirements.txt diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 20dd0d2f3..0790187bd 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: "3.9" + python-version: "3.10" cache: pip cache-dependency-path: | requirements/base.txt @@ -87,7 +87,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: "3.9" + python-version: "3.10" cache: pip cache-dependency-path: | requirements/base.txt diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index fb82ec5d5..dbb65fb73 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -13,7 +13,7 @@ variables: flake8: stage: lint - image: python:3.9-alpine + image: python:3.10-alpine before_script: - pip install -q flake8 script: @@ -35,7 +35,7 @@ pytest: script: - docker-compose -f local.yml run django pytest {%- else -%} - image: python:3.9 + image: python:3.10 tags: - python services: diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 1b68d8858..ebcc5989c 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: rev: v3.1.0 hooks: - id: pyupgrade - args: [--py39-plus] + args: [--py310-plus] - repo: https://github.com/psf/black rev: 22.10.0 diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml index b4cf0c080..e943a5fa9 100644 --- a/{{cookiecutter.project_slug}}/.readthedocs.yml +++ b/{{cookiecutter.project_slug}}/.readthedocs.yml @@ -7,6 +7,6 @@ build: image: testing python: - version: 3.9 + version: 3.10 install: - requirements: requirements/local.txt diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml index a684da225..326d78392 100644 --- a/{{cookiecutter.project_slug}}/.travis.yml +++ b/{{cookiecutter.project_slug}}/.travis.yml @@ -2,7 +2,7 @@ dist: focal language: python python: - - "3.9" + - "3.10" services: - {% if cookiecutter.use_docker == 'y' %}docker{% else %}postgresql{% endif %} @@ -37,7 +37,7 @@ jobs: - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm language: python python: - - "3.9" + - "3.10" install: - pip install -r requirements/local.txt script: diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 044ef4a74..3ea6b2d4c 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.9-slim-bullseye +ARG PYTHON_VERSION=3.10-slim-bullseye # define an alias for the specfic python version used in this file. FROM python:${PYTHON_VERSION} as python diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 0ba192b10..c45d18c95 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.9-slim-bullseye +ARG PYTHON_VERSION=3.10-slim-bullseye # define an alias for the specfic python version used in this file. FROM python:${PYTHON_VERSION} as python diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 86f4ac18a..4652f0898 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.9-slim-bullseye +ARG PYTHON_VERSION=3.10-slim-bullseye {% if cookiecutter.frontend_pipeline == 'Gulp' -%} FROM node:16-bullseye-slim as client-builder diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index c6f7782f6..69b0ccfc8 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.9.13 +python-3.10.8 diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index dad64e1fa..3bec1fbee 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -18,7 +18,7 @@ force_grid_wrap = 0 use_parentheses = true [mypy] -python_version = 3.9 +python_version = 3.10 check_untyped_defs = True ignore_missing_imports = True warn_unused_ignores = True From 2321c8a47c9202dd09b88fa10ec8ee7520798cd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 21:45:46 +0100 Subject: [PATCH 058/205] Bump stefanzweifel/git-auto-commit-action from 4.15.1 to 4.15.2 (#3914) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index e9e994093..75dc2c3e0 100644 --- 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.15.1 + uses: stefanzweifel/git-auto-commit-action@v4.15.2 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 0cd240598b3021ca2565d0c857fa272df9b499e5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 24 Oct 2022 15:46:56 -0500 Subject: [PATCH 059/205] Update sentry-sdk to 1.10.1 (#3911) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index bfbf02023..88f6a706a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.9.10 # https://github.com/getsentry/sentry-python +sentry-sdk==1.10.1 # 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 From 06c8adc6224a488e666fb60f43c11e0957865d93 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 25 Oct 2022 03:01:24 +0000 Subject: [PATCH 060/205] Release 2022.10.24 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ece2b518d..da352847b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.24 + +### Changed +- Upgrade Python version from 3.9 to 3.10 ([#3913](https://github.com/cookiecutter/cookiecutter-django/pull/3913)) +### Updated +- Update sentry-sdk to 1.10.1 ([#3911](https://github.com/cookiecutter/cookiecutter-django/pull/3911)) +- Bump stefanzweifel/git-auto-commit-action from 4.15.1 to 4.15.2 ([#3914](https://github.com/cookiecutter/cookiecutter-django/pull/3914)) + ## 2022.10.19 ### Changed diff --git a/setup.py b/setup.py index cf99cfa35..722dc8a78 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.19" +version = "2022.10.24" with open("README.rst") as readme_file: long_description = readme_file.read() From b5528f0b72b38f4d0d961d592efce57690f88f69 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Oct 2022 09:41:33 -0500 Subject: [PATCH 061/205] Update psycopg2 to 2.9.5 (#3918) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++-- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b935093d7..f0a2bfc86 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,9 +3,9 @@ Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug ipdb==0.13.9 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 {%- else %} -psycopg2-binary==2.9.4 # https://github.com/psycopg/psycopg2 +psycopg2-binary==2.9.5 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 88f6a706a..e2c2046d2 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==20.1.0 # https://github.com/benoitc/gunicorn -psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From 4fac524c40fd087589b07dbe11880c238eb35999 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Oct 2022 09:42:37 -0500 Subject: [PATCH 062/205] Update tox from 3.26.0 to 3.27.0 (#3917) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b72480ba4..1a5d99dad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==3.26.0 +tox==3.27.0 pytest==7.1.3 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 0b17d64d4171f20e92249aa303754edd8126adb6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Oct 2022 12:38:24 -0500 Subject: [PATCH 063/205] Update pytest to 7.2.0 (#3919) * Update pytest from 7.1.3 to 7.2.0 * Update pytest from 7.1.3 to 7.2.0 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1a5d99dad..691ecf0b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ tox==3.27.0 -pytest==7.1.3 +pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 pyyaml==6.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index f0a2bfc86..df77fba4b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==0.982 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs -pytest==7.1.3 # https://github.com/pytest-dev/pytest +pytest==7.2.0 # 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 From 9f290f21c81aff37c73ddc776655974cf86ea9c8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Oct 2022 12:38:40 -0500 Subject: [PATCH 064/205] Update uvicorn from 0.18.3 to 0.19.0 (#3920) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index de5c61416..2c8f5312f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.18.3 # https://github.com/encode/uvicorn +uvicorn[standard]==0.19.0 # https://github.com/encode/uvicorn {%- endif %} # Django From 368bdad664df6cab2f758e97d65d60643800bbaf Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Oct 2022 02:49:12 +0000 Subject: [PATCH 065/205] Release 2022.10.26 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da352847b..ee49c20d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.26 + +### Updated +- Update uvicorn to 0.19.0 ([#3920](https://github.com/cookiecutter/cookiecutter-django/pull/3920)) +- Update pytest to 7.2.0 ([#3919](https://github.com/cookiecutter/cookiecutter-django/pull/3919)) +- Update tox to 3.27.0 ([#3917](https://github.com/cookiecutter/cookiecutter-django/pull/3917)) +- Update psycopg2 to 2.9.5 ([#3918](https://github.com/cookiecutter/cookiecutter-django/pull/3918)) + ## 2022.10.24 ### Changed diff --git a/setup.py b/setup.py index 722dc8a78..509a10527 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.24" +version = "2022.10.26" with open("README.rst") as readme_file: long_description = readme_file.read() From f98d50194e53e1124082c76ed6c57a8542f80eaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 09:50:30 +0200 Subject: [PATCH 066/205] Bump stefanzweifel/git-auto-commit-action from 4.15.2 to 4.15.3 (#3921) Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.15.2 to 4.15.3. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.15.2...v4.15.3) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 75dc2c3e0..ee0c547e1 100644 --- 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.15.2 + uses: stefanzweifel/git-auto-commit-action@v4.15.3 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 9c132e2095d8f454e7c4a726c7a604559d3c75d6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 29 Oct 2022 02:46:36 +0000 Subject: [PATCH 067/205] Release 2022.10.28 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee49c20d1..4ab184396 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.28 + +### Updated +- Bump stefanzweifel/git-auto-commit-action from 4.15.2 to 4.15.3 ([#3921](https://github.com/cookiecutter/cookiecutter-django/pull/3921)) + ## 2022.10.26 ### Updated diff --git a/setup.py b/setup.py index 509a10527..b87d2a54b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.26" +version = "2022.10.28" with open("README.rst") as readme_file: long_description = readme_file.read() From f51e8e88e5c4779643f2e0e961a4886a63813440 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 29 Oct 2022 10:17:18 -0700 Subject: [PATCH 068/205] Update pillow from 9.2.0 to 9.3.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 2c8f5312f..b65c228eb 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2022.5 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify -Pillow==9.2.0 # https://github.com/python-pillow/Pillow +Pillow==9.3.0 # 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 From db3edf1e70ea617552b1cc30bd79032b6ed24817 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Oct 2022 09:59:28 +0000 Subject: [PATCH 069/205] Auto-update pre-commit hooks (#3924) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6d22c2e84..10af89e41 100644 --- 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: v3.1.0 + rev: v3.2.0 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index ebcc5989c..5cf841bc3 100644 --- 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: v3.1.0 + rev: v3.2.0 hooks: - id: pyupgrade args: [--py310-plus] From 2f4bb6c1ba566af7bb73a131c75cb47352e2a215 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 31 Oct 2022 02:54:35 +0000 Subject: [PATCH 070/205] Release 2022.10.30 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ab184396..e7ef7f8f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.30 + +### Updated +- Auto-update pre-commit hooks ([#3924](https://github.com/cookiecutter/cookiecutter-django/pull/3924)) + ## 2022.10.28 ### Updated diff --git a/setup.py b/setup.py index b87d2a54b..8bc2d7a73 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.28" +version = "2022.10.30" with open("README.rst") as readme_file: long_description = readme_file.read() From 8bc9e1cabd7af41ca9f3eb76bcbb6789dc3b2663 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Oct 2022 05:19:20 -0700 Subject: [PATCH 071/205] Update django-coverage-plugin from 2.0.3 to 2.0.4 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index df77fba4b..2b40810b5 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -44,5 +44,5 @@ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy 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 +django-coverage-plugin==2.0.4 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From f4668797b937a76930ea8ac44f78fade54dc6b0e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Oct 2022 19:23:53 -0700 Subject: [PATCH 072/205] Update pytz from 2022.5 to 2022.6 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 2c8f5312f..655a65e56 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.5 # https://github.com/stub42/pytz +pytz==2022.6 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify Pillow==9.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 9cc2a202d2555d8e2844208168b7fabf7ba85666 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 Nov 2022 13:37:23 -0700 Subject: [PATCH 073/205] Update sphinx-rtd-theme from 1.0.0 to 1.1.0 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index c3b371b13..2c673d1b4 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ sphinx==5.3.0 -sphinx-rtd-theme==1.0.0 +sphinx-rtd-theme==1.1.0 From 11b8ffa93de38ebf5cc12bcf57e3fb0976420430 Mon Sep 17 00:00:00 2001 From: Abe Date: Tue, 1 Nov 2022 20:59:58 -0400 Subject: [PATCH 074/205] fix typo - closes #3931 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 28bb81e38..69bce6f2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ is: $ tox -e py310 -This will run pytest with the python3.9 interpreter, for example. +This will run pytest with the python3.10 interpreter, for example. To run a particular test with tox for against your current Python version: From ca422e9916e247f24c93b6f564e0b32dfee724c0 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Wed, 2 Nov 2022 01:14:12 +0000 Subject: [PATCH 075/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 2467ed3e1..190b81d38 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1297,5 +1297,10 @@ "name": "krati yadav", "github_login": "krati5", "twitter_username": "" + }, + { + "name": "Abe Hanoka", + "github_login": "abe-101", + "twitter_username": "abe__101" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 669e9d772..86ee9251c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -138,6 +138,13 @@ Listed in alphabetical order. abdadeel_ + + Abe Hanoka + + abe-101 + + abe__101 + Adam Bogdał From 0247ea5d37e6c3f99eee096b57a7b899b06dc5ef Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 3 Nov 2022 02:45:00 +0000 Subject: [PATCH 076/205] Release 2022.11.02 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7ef7f8f6..81a35d4b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.02 + +### Changed +- fix typo in CONTRIBUTING.md ([#3932](https://github.com/cookiecutter/cookiecutter-django/pull/3932)) +### Updated +- Update crispy-bootstrap5 to 0.7 ([#3886](https://github.com/cookiecutter/cookiecutter-django/pull/3886)) +- Update django-coverage-plugin to 2.0.4 ([#3927](https://github.com/cookiecutter/cookiecutter-django/pull/3927)) +- Update pytz to 2022.6 ([#3928](https://github.com/cookiecutter/cookiecutter-django/pull/3928)) +- Update sphinx-rtd-theme to 1.1.0 ([#3929](https://github.com/cookiecutter/cookiecutter-django/pull/3929)) +- Update pillow to 9.3.0 ([#3922](https://github.com/cookiecutter/cookiecutter-django/pull/3922)) + ## 2022.10.30 ### Updated diff --git a/setup.py b/setup.py index 8bc2d7a73..46dd4d16c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.30" +version = "2022.11.02" with open("README.rst") as readme_file: long_description = readme_file.read() From d1d6ee4dd79645e4b756640676655b1358e33995 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 06:24:07 -0500 Subject: [PATCH 077/205] Update sphinx-rtd-theme to 1.1.1 (#3935) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 2c673d1b4..2cc8302a2 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ sphinx==5.3.0 -sphinx-rtd-theme==1.1.0 +sphinx-rtd-theme==1.1.1 From 725f524b9ccad4f5df6b114ce5019d3d8edaf369 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 06:24:18 -0500 Subject: [PATCH 078/205] Update pygithub to 1.57 (#3936) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 691ecf0b4..ea9671876 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.56 +PyGithub==1.57 gitpython==3.1.29 jinja2==3.1.2 requests==2.28.1 From 76234ca9e641e8b05efab272b716dd25b493e0c9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 07:34:58 -0500 Subject: [PATCH 079/205] Update pytest-sugar to 0.9.6 (#3937) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 2b40810b5..b108431b1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -16,7 +16,7 @@ watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles mypy==0.982 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.2.0 # https://github.com/pytest-dev/pytest -pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar +pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} From 3359f6a4dfdfdab34a749bd9ffb4e12e2a59c68e Mon Sep 17 00:00:00 2001 From: Abe Hanoka Date: Sun, 6 Nov 2022 07:36:17 -0500 Subject: [PATCH 080/205] add os requirements for Ubuntu 22.04 (Jammy) (#3930) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fábio C. Barrionuevo da Luz --- .../utility/requirements-jammy.apt | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 {{cookiecutter.project_slug}}/utility/requirements-jammy.apt diff --git a/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt new file mode 100644 index 000000000..63d1587e6 --- /dev/null +++ b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt @@ -0,0 +1,23 @@ +##basic build dependencies of various Django apps for Ubuntu Jammy 22.04 +#build-essential metapackage install: make, gcc, g++, +build-essential +#required to translate +gettext +python3-dev + +##shared dependencies of: +##Pillow, pylibmc +zlib1g-dev + +##Postgresql and psycopg2 dependencies +libpq-dev + +##Pillow dependencies +libtiff5-dev +libjpeg8-dev +libfreetype6-dev +liblcms2-dev +libwebp-dev + +##django-extensions +graphviz-dev From ca82618526d8f2424c721a4bfaeb8abc54b5b030 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Sun, 6 Nov 2022 13:40:16 +0100 Subject: [PATCH 081/205] Store extended Celery task attributes in backend (#3855) --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index ad879fa72..9cd6a081b 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -283,6 +283,8 @@ if USE_TZ: CELERY_BROKER_URL = env("CELERY_BROKER_URL") # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend CELERY_RESULT_BACKEND = CELERY_BROKER_URL +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended +CELERY_RESULT_EXTENDED = True # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-accept_content CELERY_ACCEPT_CONTENT = ["json"] # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer From a22f842f16879ac9d62b19ada4c03f63b1203fbd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 7 Nov 2022 02:43:39 +0000 Subject: [PATCH 082/205] Release 2022.11.06 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a35d4b6..a253b878c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.06 + +### Changed +- Store extended Celery task attributes in backend ([#3855](https://github.com/cookiecutter/cookiecutter-django/pull/3855)) +- add os requirements for Ubuntu 22.04 (Jammy) ([#3930](https://github.com/cookiecutter/cookiecutter-django/pull/3930)) +### Updated +- Update pytest-sugar to 0.9.6 ([#3937](https://github.com/cookiecutter/cookiecutter-django/pull/3937)) +- Update pygithub to 1.57 ([#3936](https://github.com/cookiecutter/cookiecutter-django/pull/3936)) +- Update sphinx-rtd-theme to 1.1.1 ([#3935](https://github.com/cookiecutter/cookiecutter-django/pull/3935)) + ## 2022.11.02 ### Changed diff --git a/setup.py b/setup.py index 46dd4d16c..1633d385b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.02" +version = "2022.11.06" with open("README.rst") as readme_file: long_description = readme_file.read() From b74584a4673078bf22111aa431baa7a63609282c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Nov 2022 07:42:26 -0500 Subject: [PATCH 083/205] Update watchfiles to 0.18.1 (#3938) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b108431b1..130cb24cc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 psycopg2-binary==2.9.5 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From d4184cc1c68eee2c27f7b38fbc1bdf3fad6b6494 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 8 Nov 2022 02:43:08 +0000 Subject: [PATCH 084/205] Release 2022.11.07 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a253b878c..bc6394eac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.07 + +### Updated +- Update watchfiles to 0.18.1 ([#3938](https://github.com/cookiecutter/cookiecutter-django/pull/3938)) + ## 2022.11.06 ### Changed diff --git a/setup.py b/setup.py index 1633d385b..8100edc12 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.06" +version = "2022.11.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 040537a5d69ea96b245b24214105da740f8bca53 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:00:06 +0000 Subject: [PATCH 085/205] Auto-update pre-commit hooks (#3942) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 10af89e41..e31055bb1 100644 --- 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: v3.2.0 + rev: v3.2.2 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 5cf841bc3..433d97de9 100644 --- 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: v3.2.0 + rev: v3.2.2 hooks: - id: pyupgrade args: [--py310-plus] From aa6cc603e24616d6e16761e1596153b0d0f04141 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Nov 2022 02:41:33 +0000 Subject: [PATCH 086/205] Release 2022.11.11 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6394eac..88f2ab45b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.11 + +### Updated +- Auto-update pre-commit hooks ([#3942](https://github.com/cookiecutter/cookiecutter-django/pull/3942)) + ## 2022.11.07 ### Updated diff --git a/setup.py b/setup.py index 8100edc12..ea0d169e3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.07" +version = "2022.11.11" with open("README.rst") as readme_file: long_description = readme_file.read() From 27655eca7ee1a9647ff67af2eed3b419a766aff6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Nov 2022 00:51:28 -0800 Subject: [PATCH 087/205] Update tox from 3.27.0 to 3.27.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ea9671876..783edeb18 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==3.27.0 +tox==3.27.1 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 466bb798aa4b44787649bc1b9280bd4c1f9642d5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 15 Nov 2022 20:35:34 -0600 Subject: [PATCH 088/205] Update django-model-utils from 4.2.0 to 4.3.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index af9c4b52e..1a8ed77ae 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn[standard]==0.19.0 # https://github.com/encode/uvicorn # ------------------------------------------------------------------------------ django==4.0.8 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ -django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils +django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 From 7bdc6aea668464216b77d9492dd3ba7631a299fe Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 18 Nov 2022 14:21:59 -0600 Subject: [PATCH 089/205] Update python-slugify from 6.1.2 to 7.0.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index af9c4b52e..3fa109387 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2022.6 # https://github.com/stub42/pytz -python-slugify==6.1.2 # https://github.com/un33k/python-slugify +python-slugify==7.0.0 # https://github.com/un33k/python-slugify Pillow==9.3.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From 81ea9775daf987b39dc54b106884595a81cb044c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Nov 2022 07:32:12 -0600 Subject: [PATCH 090/205] Update flake8-isort from 5.0.0 to 5.0.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ea9671876..262462cda 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==22.10.0 isort==5.10.1 flake8==5.0.4 -flake8-isort==5.0.0 +flake8-isort==5.0.3 pre-commit==2.20.0 # Testing From 827e1364d1bb0df69c5b2b200ebe70128cdb1825 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Nov 2022 07:32:13 -0600 Subject: [PATCH 091/205] Update flake8-isort from 5.0.0 to 5.0.3 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 130cb24cc..e7674ce93 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ flake8==5.0.4 # https://github.com/PyCQA/flake8 -flake8-isort==5.0.0 # https://github.com/gforcada/flake8-isort +flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort coverage==6.5.0 # https://github.com/nedbat/coveragepy black==22.10.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 202da796b36afbc7f9aabc88960ba301ff3b5acd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Nov 2022 08:12:28 -0600 Subject: [PATCH 092/205] Update uvicorn from 0.19.0 to 0.20.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index af9c4b52e..3d0da64f9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.19.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.20.0 # https://github.com/encode/uvicorn {%- endif %} # Django From f70b397c8672fad1a71b1e08872625c57f1d8f62 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 22 Nov 2022 02:58:49 -0600 Subject: [PATCH 093/205] Update redis from 4.3.4 to 4.3.5 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index af9c4b52e..9073d7034 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{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==6.2.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.3.4 # https://github.com/redis/redis-py +redis==4.3.5 # 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 %} From 0e91f40969fd7a0cdcf59be2f03f8e08dc43bce5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 22 Nov 2022 07:59:10 -0600 Subject: [PATCH 094/205] Update sentry-sdk from 1.10.1 to 1.11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index e2c2046d2..275633dd4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.10.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.11.1 # 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 From 7d517dc6775a6d3cf7c231ec38468108c259b640 Mon Sep 17 00:00:00 2001 From: adinhodovic Date: Tue, 22 Nov 2022 20:08:02 +0100 Subject: [PATCH 095/205] feat(celery): Send task events for Celery by default Is useful for e.g Flower and Celery-exporter --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 9cd6a081b..b8368b6cb 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -299,6 +299,8 @@ CELERY_TASK_TIME_LIMIT = 5 * 60 CELERY_TASK_SOFT_TIME_LIMIT = 60 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#beat-scheduler CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler" +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#worker-send-task-events +CELERY_WORKER_SEND_TASK_EVENTS = True {%- endif %} # django-allauth From 65ac3d8a3f2e9ec5e66c21ba23c1e589ef7b29c7 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Tue, 22 Nov 2022 19:20:22 +0000 Subject: [PATCH 096/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 190b81d38..bdbc76158 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1302,5 +1302,10 @@ "name": "Abe Hanoka", "github_login": "abe-101", "twitter_username": "abe__101" + }, + { + "name": "Adin Hodovic", + "github_login": "adinhodovic", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 86ee9251c..29db8acb3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -166,6 +166,13 @@ Listed in alphabetical order. + + Adin Hodovic + + adinhodovic + + + Agam Dua From de48e315174fc38dd4c925528bad907c00822981 Mon Sep 17 00:00:00 2001 From: adinhodovic Date: Tue, 22 Nov 2022 20:28:52 +0100 Subject: [PATCH 097/205] feat(celery): Enable sending the sent task event by default --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index b8368b6cb..b1d11cd3d 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -301,6 +301,8 @@ CELERY_TASK_SOFT_TIME_LIMIT = 60 CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler" # https://docs.celeryq.dev/en/stable/userguide/configuration.html#worker-send-task-events CELERY_WORKER_SEND_TASK_EVENTS = True +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-task_send_sent_event +CELERY_TASK_SEND_SENT_EVENT = True {%- endif %} # django-allauth From d98aad07109fe02613cab9850378eefc9f350748 Mon Sep 17 00:00:00 2001 From: Leifur Halldor Asgeirsson Date: Tue, 22 Nov 2022 14:59:34 -0500 Subject: [PATCH 098/205] Remove platform from compose file (#3957) --- {{cookiecutter.project_slug}}/local.yml | 2 -- {{cookiecutter.project_slug}}/production.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index fb203acd6..33a8db07a 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -11,7 +11,6 @@ services: dockerfile: ./compose/local/django/Dockerfile image: {{ cookiecutter.project_slug }}_local_django container_name: {{ cookiecutter.project_slug }}_local_django - platform: linux/x86_64 depends_on: - postgres {%- if cookiecutter.use_celery == 'y' %} @@ -44,7 +43,6 @@ services: docs: image: {{ cookiecutter.project_slug }}_local_docs container_name: {{ cookiecutter.project_slug }}_local_docs - platform: linux/x86_64 build: context: . dockerfile: ./compose/local/docs/Dockerfile diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index 4c1d64c20..ea4292a0d 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -11,7 +11,6 @@ services: context: . dockerfile: ./compose/production/django/Dockerfile image: {{ cookiecutter.project_slug }}_production_django - platform: linux/x86_64 depends_on: - postgres - redis From a78b052bcce3a67ff7bc2634fcd4590cb1e0bb77 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 22 Nov 2022 19:59:59 +0000 Subject: [PATCH 099/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index bdbc76158..c8da987a2 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1307,5 +1307,10 @@ "name": "Adin Hodovic", "github_login": "adinhodovic", "twitter_username": "" + }, + { + "name": "Leifur Halldor Asgeirsson", + "github_login": "leifurhauks", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 29db8acb3..000e5fb1f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1160,6 +1160,13 @@ Listed in alphabetical order. + + Leifur Halldor Asgeirsson + + leifurhauks + + + Leo won From b5ad2fc232b136dc7d249c0a41bbf941b7247954 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Tue, 22 Nov 2022 17:51:31 -0500 Subject: [PATCH 100/205] Remove USE_L10N due to deprecation (#3960) --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index b8368b6cb..62c4b4327 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -30,8 +30,6 @@ LANGUAGE_CODE = "en-us" SITE_ID = 1 # https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n USE_I18N = True -# https://docs.djangoproject.com/en/dev/ref/settings/#use-l10n -USE_L10N = True # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz USE_TZ = True # https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths From 3e32780ccf39c1128a0ab1d2dc68d7e61b32096d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Nov 2022 02:34:55 +0000 Subject: [PATCH 101/205] Release 2022.11.22 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88f2ab45b..85a0cb793 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.22 + +### Changed +- Remove USE_L10N due to deprecation ([#3960](https://github.com/cookiecutter/cookiecutter-django/pull/3960)) +- Remove platform from compose file ([#3957](https://github.com/cookiecutter/cookiecutter-django/pull/3957)) +- feat(celery): Send task events for Celery by default ([#3959](https://github.com/cookiecutter/cookiecutter-django/pull/3959)) +### Updated +- Update python-slugify to 7.0.0 ([#3950](https://github.com/cookiecutter/cookiecutter-django/pull/3950)) +- Update redis to 4.3.5 ([#3954](https://github.com/cookiecutter/cookiecutter-django/pull/3954)) +- Update sentry-sdk to 1.11.1 ([#3955](https://github.com/cookiecutter/cookiecutter-django/pull/3955)) +- Update uvicorn to 0.20.0 ([#3953](https://github.com/cookiecutter/cookiecutter-django/pull/3953)) +- Update tox to 3.27.1 ([#3945](https://github.com/cookiecutter/cookiecutter-django/pull/3945)) + ## 2022.11.11 ### Updated diff --git a/setup.py b/setup.py index ea0d169e3..55cc3d400 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.11" +version = "2022.11.22" with open("README.rst") as readme_file: long_description = readme_file.read() From 51f4374a8ab88cffd20b13cc36be10d35cfd79b0 Mon Sep 17 00:00:00 2001 From: Chao Yang Wu Date: Wed, 23 Nov 2022 22:51:20 +0800 Subject: [PATCH 102/205] Fix graceful shutdown of local dev containers and use watchfiles for beat + flower (#3925) Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- .../compose/local/django/celery/beat/start | 2 +- .../compose/local/django/celery/flower/start | 9 +++------ .../compose/local/django/celery/worker/start | 2 +- {{cookiecutter.project_slug}}/compose/local/django/start | 4 ++-- {{cookiecutter.project_slug}}/compose/local/docs/start | 2 +- .../compose/production/django/start | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start index c04a7365e..61f83968b 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start @@ -5,4 +5,4 @@ set -o nounset rm -f './celerybeat.pid' -celery -A config.celery_app beat -l INFO +exec watchfiles celery.__main__.main --args '-A config.celery_app beat -l INFO' diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index bd3c9f2fd..8ff56d118 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -3,9 +3,6 @@ set -o errexit set -o nounset - -celery \ - -A config.celery_app \ - -b "${CELERY_BROKER_URL}" \ - flower \ - --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" +exec watchfiles celery.__.main__.main \ + --args \ + "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\"" diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start index 4ddcfa137..16341fdd1 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start @@ -4,4 +4,4 @@ set -o errexit set -o nounset -watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO' +exec watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO' diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start index 3fe547357..ec57dc8e4 100644 --- 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 --reload-include '*.html' +exec uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html' {%- else %} -python manage.py runserver_plus 0.0.0.0:8000 +exec python manage.py runserver_plus 0.0.0.0:8000 {%- endif %} diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/start b/{{cookiecutter.project_slug}}/compose/local/docs/start index fd2e0de6a..96a94f566 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/start +++ b/{{cookiecutter.project_slug}}/compose/local/docs/start @@ -4,4 +4,4 @@ set -o errexit set -o pipefail set -o nounset -make livehtml +exec make livehtml diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start index 2ba79501c..73f686bd7 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/start +++ b/{{cookiecutter.project_slug}}/compose/production/django/start @@ -28,7 +28,7 @@ if compress_enabled; then fi {%- endif %} {%- if cookiecutter.use_async == 'y' %} -/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker +exec /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker {%- else %} -/usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app +exec /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app {%- endif %} From c35a074d720c252986bae05c6da038a566ea3706 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Nov 2022 14:51:51 +0000 Subject: [PATCH 103/205] Bump stefanzweifel/git-auto-commit-action from 4.15.3 to 4.15.4 (#3940) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index ee0c547e1..571bdcd02 100644 --- 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.15.3 + uses: stefanzweifel/git-auto-commit-action@v4.15.4 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 5ad6cb48c5a7ba03e866ae0159116bd08ccf6234 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 24 Nov 2022 02:32:07 +0000 Subject: [PATCH 104/205] Release 2022.11.23 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85a0cb793..24dbdc41f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.23 + +### Changed +- Fix graceful shutdown of local dev containers and use watchfiles for beat + flower ([#3925](https://github.com/cookiecutter/cookiecutter-django/pull/3925)) +- feat(celery): Enable sending the sent task event by default ([#3961](https://github.com/cookiecutter/cookiecutter-django/pull/3961)) +### Updated +- Bump stefanzweifel/git-auto-commit-action from 4.15.3 to 4.15.4 ([#3940](https://github.com/cookiecutter/cookiecutter-django/pull/3940)) +- Update django-model-utils to 4.3.1 ([#3948](https://github.com/cookiecutter/cookiecutter-django/pull/3948)) +- Update flake8-isort to 5.0.3 ([#3952](https://github.com/cookiecutter/cookiecutter-django/pull/3952)) + ## 2022.11.22 ### Changed diff --git a/setup.py b/setup.py index 55cc3d400..d097c04e5 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.22" +version = "2022.11.23" with open("README.rst") as readme_file: long_description = readme_file.read() From b21f50e22b465bb5e01608c46738b9c022080243 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 08:17:41 +0000 Subject: [PATCH 105/205] Auto-update pre-commit hooks (#3963) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 4 ++-- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e31055bb1..df197108f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_stages: [commit] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: trailing-whitespace - id: check-yaml @@ -26,7 +26,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 433d97de9..e53422ed3 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_stages: [commit] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -26,7 +26,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 args: ["--config=setup.cfg"] From fec7ba3aa89332f1056d1835913c12e7d4d3eb1a Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 25 Nov 2022 02:33:31 +0000 Subject: [PATCH 106/205] Release 2022.11.24 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24dbdc41f..2b8be74db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.24 + +### Updated +- Auto-update pre-commit hooks ([#3963](https://github.com/cookiecutter/cookiecutter-django/pull/3963)) + ## 2022.11.23 ### Changed diff --git a/setup.py b/setup.py index d097c04e5..7a2223092 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.23" +version = "2022.11.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 77695c7c10a902b8345e75a2a4cf06fb2d8971ad Mon Sep 17 00:00:00 2001 From: David Date: Sat, 26 Nov 2022 04:08:39 -0700 Subject: [PATCH 107/205] Fix typo in flower start for watching celery (#3966) --- .../compose/local/django/celery/flower/start | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index 8ff56d118..ac3cc6b36 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -3,6 +3,6 @@ set -o errexit set -o nounset -exec watchfiles celery.__.main__.main \ +exec watchfiles celery.__main__.main \ --args \ "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\"" From fd45bb18ea992423c79a2878d02620e190b1ac2e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 26 Nov 2022 11:09:10 +0000 Subject: [PATCH 108/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index c8da987a2..3d4ec0488 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1312,5 +1312,10 @@ "name": "Leifur Halldor Asgeirsson", "github_login": "leifurhauks", "twitter_username": "" + }, + { + "name": "David", + "github_login": "buckldav", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 000e5fb1f..028ed7231 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -607,6 +607,13 @@ Listed in alphabetical order. + + David + + buckldav + + + David Díaz From 0a8b15615a51f09083ce5386c4e09c5fe2ed2757 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 27 Nov 2022 02:34:17 +0000 Subject: [PATCH 109/205] Release 2022.11.26 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b8be74db..ba72b2cf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.26 + +### Changed +- Fix typo in flower start for watching celery ([#3966](https://github.com/cookiecutter/cookiecutter-django/pull/3966)) + ## 2022.11.24 ### Updated diff --git a/setup.py b/setup.py index 7a2223092..6f2fde261 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.24" +version = "2022.11.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 5ca7ae1c4306da865acdedb0899ad35cda471d79 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 09:37:03 +0000 Subject: [PATCH 110/205] Auto-update pre-commit hooks (#3970) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df197108f..75d2409cd 100644 --- 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: v3.2.2 + rev: v3.2.3 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index e53422ed3..e8e69627d 100644 --- 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: v3.2.2 + rev: v3.2.3 hooks: - id: pyupgrade args: [--py310-plus] From 49b3bb8ffe6311b877409886ecfdb90d8b4beb15 Mon Sep 17 00:00:00 2001 From: rguptar <69279773+rguptar@users.noreply.github.com> Date: Wed, 30 Nov 2022 10:26:58 -0800 Subject: [PATCH 111/205] Add Azure Storage as an option to serve static and media files (#3967) Fix https://github.com/cookiecutter/cookiecutter-django/issues/2301 --- README.md | 4 ++-- cookiecutter.json | 1 + docs/project-generation-options.rst | 4 +++- docs/settings.rst | 3 +++ hooks/pre_gen_project.py | 7 ++----- tests/test_cookiecutter_generation.py | 14 +++++++++++++- .../.envs/.production/.django | 6 ++++++ .../config/settings/production.py | 12 +++++++++++- .../requirements/production.txt | 2 ++ .../utils/storages.py | 11 +++++++++++ 10 files changed, 54 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 9f2af6d37..27fc6e0e1 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ production-ready Django projects quickly. - Optional basic ASGI setup for Websockets - Optional custom static build using Gulp and livereload - Send emails via [Anymail](https://github.com/anymail/django-anymail) (using [Mailgun](http://www.mailgun.com/) by default or Amazon SES if AWS is selected cloud provider, but switchable) -- Media storage using Amazon S3 or Google Cloud Storage +- Media storage using Amazon S3, Google Cloud Storage or Azure Storage - Docker support using [docker-compose](https://github.com/docker/compose) for development and production (using [Traefik](https://traefik.io/) with [LetsEncrypt](https://letsencrypt.org/) support) - [Procfile](https://devcenter.heroku.com/articles/procfile) for deploying to Heroku - Instructions for deploying to [PythonAnywhere](https://www.pythonanywhere.com/) @@ -41,7 +41,7 @@ production-ready Django projects quickly. *These features can be enabled during initial project setup.* -- Serve static files from Amazon S3, Google Cloud Storage or [Whitenoise](https://whitenoise.readthedocs.io/) +- Serve static files from Amazon S3, Google Cloud Storage, Azure Storage or [Whitenoise](https://whitenoise.readthedocs.io/) - Configuration for [Celery](https://docs.celeryq.dev) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only) - Integration with [MailHog](https://github.com/mailhog/MailHog) for local email testing - Integration with [Sentry](https://sentry.io/welcome/) for error logging diff --git a/cookiecutter.json b/cookiecutter.json index 90d084b3a..970411013 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -27,6 +27,7 @@ "cloud_provider": [ "AWS", "GCP", + "Azure", "None" ], "mail_service": [ diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index 2d8103cf2..0560badd3 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -66,7 +66,8 @@ cloud_provider: 1. AWS_ 2. GCP_ - 3. None + 3. Azure_ + 4. None Note that if you choose no cloud provider, media files won't work. @@ -147,6 +148,7 @@ debug: .. _AWS: https://aws.amazon.com/s3/ .. _GCP: https://cloud.google.com/storage/ +.. _Azure: https://azure.microsoft.com/en-us/products/storage/blobs/ .. _Amazon SES: https://aws.amazon.com/ses/ .. _Mailgun: https://www.mailgun.com diff --git a/docs/settings.rst b/docs/settings.rst index b8c6d448e..4691adbbd 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -49,6 +49,9 @@ DJANGO_AWS_S3_CUSTOM_DOMAIN AWS_S3_CUSTOM_DOMAIN n/a DJANGO_AWS_S3_MAX_MEMORY_SIZE AWS_S3_MAX_MEMORY_SIZE n/a 100_000_000 DJANGO_GCP_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error GOOGLE_APPLICATION_CREDENTIALS n/a n/a raises error +DJANGO_AZURE_ACCOUNT_KEY AZURE_ACCOUNT_KEY n/a raises error +DJANGO_AZURE_ACCOUNT_NAME AZURE_ACCOUNT_NAME n/a raises error +DJANGO_AZURE_CONTAINER_NAME AZURE_CONTAINER n/a raises error SENTRY_DSN SENTRY_DSN n/a raises error SENTRY_ENVIRONMENT n/a n/a production SENTRY_TRACES_SAMPLE_RATE n/a n/a 0.0 diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index 2845f012c..c3eef1e43 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -72,11 +72,8 @@ if ( sys.exit(1) if ( - "{{ cookiecutter.cloud_provider }}" == "GCP" - and "{{ cookiecutter.mail_service }}" == "Amazon SES" -) or ( - "{{ cookiecutter.cloud_provider }}" == "None" - and "{{ cookiecutter.mail_service }}" == "Amazon SES" + "{{ cookiecutter.mail_service }}" == "Amazon SES" + and "{{ cookiecutter.cloud_provider }}" != "AWS" ): print( "You should either use AWS or select a different " diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 3a757fcb7..6219f75ef 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -56,6 +56,8 @@ SUPPORTED_COMBINATIONS = [ {"cloud_provider": "AWS", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "use_whitenoise": "y"}, {"cloud_provider": "GCP", "use_whitenoise": "n"}, + {"cloud_provider": "Azure", "use_whitenoise": "y"}, + {"cloud_provider": "Azure", "use_whitenoise": "n"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mailgun"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mailjet"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mandrill"}, @@ -82,7 +84,16 @@ SUPPORTED_COMBINATIONS = [ {"cloud_provider": "GCP", "mail_service": "SendinBlue"}, {"cloud_provider": "GCP", "mail_service": "SparkPost"}, {"cloud_provider": "GCP", "mail_service": "Other SMTP"}, - # Note: cloud_providers GCP and None with mail_service Amazon SES is not supported + {"cloud_provider": "Azure", "mail_service": "Mailgun"}, + {"cloud_provider": "Azure", "mail_service": "Mailjet"}, + {"cloud_provider": "Azure", "mail_service": "Mandrill"}, + {"cloud_provider": "Azure", "mail_service": "Postmark"}, + {"cloud_provider": "Azure", "mail_service": "Sendgrid"}, + {"cloud_provider": "Azure", "mail_service": "SendinBlue"}, + {"cloud_provider": "Azure", "mail_service": "SparkPost"}, + {"cloud_provider": "Azure", "mail_service": "Other SMTP"}, + # Note: cloud_providers GCP, Azure, and None + # with mail_service Amazon SES is not supported {"use_async": "y"}, {"use_async": "n"}, {"use_drf": "y"}, @@ -113,6 +124,7 @@ SUPPORTED_COMBINATIONS = [ UNSUPPORTED_COMBINATIONS = [ {"cloud_provider": "None", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "mail_service": "Amazon SES"}, + {"cloud_provider": "Azure", "mail_service": "Amazon SES"}, {"cloud_provider": "None", "mail_service": "Amazon SES"}, ] diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django index e7e8461c9..ad652c9ad 100644 --- a/{{cookiecutter.project_slug}}/.envs/.production/.django +++ b/{{cookiecutter.project_slug}}/.envs/.production/.django @@ -44,6 +44,12 @@ DJANGO_AWS_STORAGE_BUCKET_NAME= # ------------------------------------------------------------------------------ GOOGLE_APPLICATION_CREDENTIALS= DJANGO_GCP_STORAGE_BUCKET_NAME= +{% elif cookiecutter.cloud_provider == 'Azure' %} +# Azure +# ------------------------------------------------------------------------------ +DJANGO_AZURE_ACCOUNT_KEY= +DJANGO_AZURE_ACCOUNT_NAME= +DJANGO_AZURE_CONTAINER_NAME= {% endif %} # django-allauth # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 8eed5a805..40d3f19cc 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -100,6 +100,10 @@ aws_s3_domain = AWS_S3_CUSTOM_DOMAIN or f"{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws {% elif cookiecutter.cloud_provider == 'GCP' %} GS_BUCKET_NAME = env("DJANGO_GCP_STORAGE_BUCKET_NAME") GS_DEFAULT_ACL = "publicRead" +{% elif cookiecutter.cloud_provider == 'Azure' %} +AZURE_ACCOUNT_KEY = env("DJANGO_AZURE_ACCOUNT_KEY") +AZURE_ACCOUNT_NAME = env("DJANGO_AZURE_ACCOUNT_NAME") +AZURE_CONTAINER = env("DJANGO_AZURE_CONTAINER_NAME") {% endif -%} {% if cookiecutter.cloud_provider != 'None' or cookiecutter.use_whitenoise == 'y' -%} @@ -116,6 +120,9 @@ STATIC_URL = f"https://{aws_s3_domain}/static/" STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage" COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy" STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/" +{% elif cookiecutter.cloud_provider == 'Azure' -%} +STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootAzureStorage" +STATIC_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/static/" {% endif -%} # MEDIA @@ -126,6 +133,9 @@ MEDIA_URL = f"https://{aws_s3_domain}/media/" {%- elif cookiecutter.cloud_provider == 'GCP' %} DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage" MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/" +{%- elif cookiecutter.cloud_provider == 'Azure' %} +DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootAzureStorage" +MEDIA_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/media/" {%- endif %} # EMAIL @@ -228,7 +238,7 @@ COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True) {%- if cookiecutter.cloud_provider == 'None' %} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage" -{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %} +{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP', 'Azure') and cookiecutter.use_whitenoise == 'n' %} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE COMPRESS_STORAGE = STATICFILES_STORAGE {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 275633dd4..c9b5b88a7 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -20,6 +20,8 @@ hiredis==2.0.0 # https://github.com/redis/hiredis-py django-storages[boto3]==1.13.1 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} django-storages[google]==1.13.1 # https://github.com/jschneier/django-storages +{%- elif cookiecutter.cloud_provider == 'Azure' %} +django-storages[azure]==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}}/{{cookiecutter.project_slug}}/utils/storages.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py index b712d3239..27595ad1a 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py @@ -22,4 +22,15 @@ class StaticRootGoogleCloudStorage(GoogleCloudStorage): class MediaRootGoogleCloudStorage(GoogleCloudStorage): location = "media" file_overwrite = False +{%- elif cookiecutter.cloud_provider == 'Azure' -%} +from storages.backends.azure_storage import AzureStorage + + +class StaticRootAzureStorage(AzureStorage): + location = "static" + + +class MediaRootAzureStorage(AzureStorage): + location = "media" + file_overwrite = False {%- endif %} From 9f8e25ebbc4c6ed1b09c07fe6c36a5b5e8bb2530 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 30 Nov 2022 18:27:34 +0000 Subject: [PATCH 112/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 3d4ec0488..49ebfe4d8 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1317,5 +1317,10 @@ "name": "David", "github_login": "buckldav", "twitter_username": "" + }, + { + "name": "rguptar", + "github_login": "rguptar", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 028ed7231..d97324708 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1545,6 +1545,13 @@ Listed in alphabetical order. + + rguptar + + rguptar + + + Richard Hajdu From 431dfc94e2dd70941757221aceb4000ca2c9c022 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 1 Dec 2022 02:37:11 +0000 Subject: [PATCH 113/205] Release 2022.11.30 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba72b2cf3..45e784f8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.30 + +### Changed +- Add Azure Storage as an option to serve static and media files ([#3967](https://github.com/cookiecutter/cookiecutter-django/pull/3967)) +### Updated +- Auto-update pre-commit hooks ([#3970](https://github.com/cookiecutter/cookiecutter-django/pull/3970)) + ## 2022.11.26 ### Changed diff --git a/setup.py b/setup.py index 6f2fde261..a388c0b61 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.26" +version = "2022.11.30" with open("README.rst") as readme_file: long_description = readme_file.read() From a464856234fd9f8f68d17d72fe01f35868179790 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 2 Dec 2022 05:43:02 -0500 Subject: [PATCH 114/205] Update flake8 to 6.0.0 (#3974) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 88c8176f1..684ec91e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ binaryornot==0.4.4 # ------------------------------------------------------------------------------ black==22.10.0 isort==5.10.1 -flake8==5.0.4 +flake8==6.0.0 flake8-isort==5.0.3 pre-commit==2.20.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e7674ce93..a55b1019a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -flake8==5.0.4 # https://github.com/PyCQA/flake8 +flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort coverage==6.5.0 # https://github.com/nedbat/coveragepy black==22.10.0 # https://github.com/psf/black From 8ad762cbc654219824cc596b1eb456452b7b1b39 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 3 Dec 2022 02:21:12 +0000 Subject: [PATCH 115/205] Release 2022.12.02 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e784f8b..7a78b7cf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.02 + +### Updated +- Update flake8 to 6.0.0 ([#3974](https://github.com/cookiecutter/cookiecutter-django/pull/3974)) + ## 2022.11.30 ### Changed diff --git a/setup.py b/setup.py index a388c0b61..0fa4ba7ca 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.30" +version = "2022.12.02" with open("README.rst") as readme_file: long_description = readme_file.read() From 600783c89bd2fbb0cc459d103ca42bd8c791fb78 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 3 Dec 2022 11:36:29 +0000 Subject: [PATCH 116/205] Auto-update pre-commit hooks (#3975) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 75d2409cd..e8d055772 100644 --- 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: v3.2.3 + rev: v3.3.0 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index e8e69627d..516323b42 100644 --- 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: v3.2.3 + rev: v3.3.0 hooks: - id: pyupgrade args: [--py310-plus] From 3deb4d90f2e5884f183b1270b416f7f41cd3f5b1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 3 Dec 2022 19:12:25 -0500 Subject: [PATCH 117/205] Update django-debug-toolbar to 3.8.1 (#3976) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index a55b1019a..ba8db0339 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -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.7.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.8.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions django-coverage-plugin==2.0.4 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From b5ccdf104174edfc3ff7f55b98a2fc5ee3c093ff Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 4 Dec 2022 02:27:06 +0000 Subject: [PATCH 118/205] Release 2022.12.03 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a78b7cf4..dd8a4e0d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.03 + +### Updated +- Auto-update pre-commit hooks ([#3975](https://github.com/cookiecutter/cookiecutter-django/pull/3975)) + ## 2022.12.02 ### Updated diff --git a/setup.py b/setup.py index 0fa4ba7ca..6d0fccd46 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.02" +version = "2022.12.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 0336f08da1709b503043e902237d8e5caa12ee96 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 4 Dec 2022 09:10:58 -0500 Subject: [PATCH 119/205] Update redis to 4.4.0 (#3977) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 0817c4262..827530be9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{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==6.2.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.3.5 # https://github.com/redis/redis-py +redis==4.4.0 # 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 %} From 82e0c275f846c3996d66251dab49007d46b47945 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Dec 2022 02:26:01 +0000 Subject: [PATCH 120/205] Release 2022.12.04 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd8a4e0d1..b0e1e6690 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.04 + +### Updated +- Update redis to 4.4.0 ([#3977](https://github.com/cookiecutter/cookiecutter-django/pull/3977)) +- Update django-debug-toolbar to 3.8.1 ([#3976](https://github.com/cookiecutter/cookiecutter-django/pull/3976)) + ## 2022.12.03 ### Updated diff --git a/setup.py b/setup.py index 6d0fccd46..e187601c3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.03" +version = "2022.12.04" with open("README.rst") as readme_file: long_description = readme_file.read() From b2deb65c0dedc336e2e7259026cb5b36478e4590 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 09:41:28 +0000 Subject: [PATCH 121/205] Bump stefanzweifel/git-auto-commit-action from 4.15.4 to 4.16.0 (#3978) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 571bdcd02..952486c1b 100644 --- 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.15.4 + uses: stefanzweifel/git-auto-commit-action@v4.16.0 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From d272d9752d0c8a6ba8d0c189549355a9a1e3d2dc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 6 Dec 2022 06:37:50 -0500 Subject: [PATCH 122/205] Update django-coverage-plugin to 3.0.0 (#3979) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index ba8db0339..6082a72c8 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -44,5 +44,5 @@ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.8.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions -django-coverage-plugin==2.0.4 # https://github.com/nedbat/django_coverage_plugin +django-coverage-plugin==3.0.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From 33af8e3988067811f48f73f8a589002b136aad1a Mon Sep 17 00:00:00 2001 From: Adin Hodovic Date: Tue, 6 Dec 2022 20:04:38 +0100 Subject: [PATCH 123/205] Simplify production `DATABASES` setting to extend base definition (#3969) --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 40d3f19cc..15d3a7683 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -22,8 +22,6 @@ ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["{{ cookiecutter.domai # DATABASES # ------------------------------------------------------------------------------ -DATABASES["default"] = env.db("DATABASE_URL") # noqa F405 -DATABASES["default"]["ATOMIC_REQUESTS"] = True # noqa F405 DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60) # noqa F405 # CACHES From fc081ce1fef82d71e1f8e948821623354884b147 Mon Sep 17 00:00:00 2001 From: ghazi-git Date: Tue, 6 Dec 2022 14:26:24 -0500 Subject: [PATCH 124/205] set SERVERS in production settings instead of base settings (#3609) fixes https://github.com/cookiecutter/cookiecutter-django/issues/3593 --- {{cookiecutter.project_slug}}/config/settings/base.py | 4 ---- .../config/settings/production.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 52798146e..1989fd8cb 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -350,10 +350,6 @@ SPECTACULAR_SETTINGS = { "DESCRIPTION": "Documentation of API endpoints of {{ cookiecutter.project_name }}", "VERSION": "1.0.0", "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"], - "SERVERS": [ - {"url": "http://127.0.0.1:8000", "description": "Local Development server"}, - {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"}, - ], } {%- endif %} # Your stuff... diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 15d3a7683..5de0529e2 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -368,5 +368,15 @@ sentry_sdk.init( traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE", default=0.0), ) {% endif %} +{% if cookiecutter.use_drf == "y" -%} + +# django-rest-framework +# ------------------------------------------------------------------------------- +# Tools that generate code samples can use SERVERS to point to the correct domain +SPECTACULAR_SETTINGS["SERVERS"] = [ # noqa F405 + {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"} +] + +{%- endif %} # Your stuff... # ------------------------------------------------------------------------------ From eff4969a39876d8d30dd5232a911f4c8e9fc3ec5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 7 Dec 2022 02:50:13 +0000 Subject: [PATCH 125/205] Release 2022.12.06 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0e1e6690..5654520ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.06 + +### Changed +- Simplify production `DATABASES` setting to extend base definition ([#3969](https://github.com/cookiecutter/cookiecutter-django/pull/3969)) +### Fixed +- Only set `SERVERS` for `drf-spectacular` in production ([#3609](https://github.com/cookiecutter/cookiecutter-django/pull/3609)) +### Updated +- Update django-coverage-plugin to 3.0.0 ([#3979](https://github.com/cookiecutter/cookiecutter-django/pull/3979)) +- Bump stefanzweifel/git-auto-commit-action from 4.15.4 to 4.16.0 ([#3978](https://github.com/cookiecutter/cookiecutter-django/pull/3978)) + ## 2022.12.04 ### Updated diff --git a/setup.py b/setup.py index e187601c3..b7bc61890 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.04" +version = "2022.12.06" with open("README.rst") as readme_file: long_description = readme_file.read() From 57496c56c57659bde9d9523d532f96ee9d79fc28 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 07:48:50 +0000 Subject: [PATCH 126/205] Auto-update pre-commit hooks (#3983) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e8d055772..5669b756e 100644 --- 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: v3.3.0 + rev: v3.3.1 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 516323b42..1b0150c4a 100644 --- 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: v3.3.0 + rev: v3.3.1 hooks: - id: pyupgrade args: [--py310-plus] From aa318af1fc3cf9a74af6edfcaaaddd9e64ec4be2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 8 Dec 2022 02:45:51 +0000 Subject: [PATCH 127/205] Release 2022.12.07 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5654520ff..415ccd23f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.07 + +### Updated +- Auto-update pre-commit hooks ([#3983](https://github.com/cookiecutter/cookiecutter-django/pull/3983)) + ## 2022.12.06 ### Changed diff --git a/setup.py b/setup.py index b7bc61890..151b1e356 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.06" +version = "2022.12.07" with open("README.rst") as readme_file: long_description = readme_file.read() From d15465a5821d2565467f5a390007285dd967732b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 8 Dec 2022 08:16:33 -0500 Subject: [PATCH 128/205] Update django-stubs to 1.13.1 (#3986) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6082a72c8..bacfdbbe5 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==0.982 # https://github.com/python/mypy -django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs +django-stubs==1.13.1 # https://github.com/typeddjango/django-stubs pytest==7.2.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 585620eca732aad7bd0e67a1cba025b58003f823 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 8 Dec 2022 08:17:00 -0500 Subject: [PATCH 129/205] Update tox to 4.0.2 (#3985) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 684ec91e0..f428f623b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==3.27.1 +tox==4.0.2 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From b2d6ddbc480d791eb8bdd1bc9cf86b27759badb7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 8 Dec 2022 17:07:18 -0500 Subject: [PATCH 130/205] Update tox from 4.0.2 to 4.0.3 (#3987) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f428f623b..c35de3b6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.2 +tox==4.0.3 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From c2602032c8203d5e71fb71bc111e04b86a242af0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 9 Dec 2022 02:45:59 +0000 Subject: [PATCH 131/205] Release 2022.12.08 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 415ccd23f..132fd96fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.08 + +### Updated +- Update tox to 4.0.3 ([#3987](https://github.com/cookiecutter/cookiecutter-django/pull/3987)) +- Update tox to 4.0.2 ([#3985](https://github.com/cookiecutter/cookiecutter-django/pull/3985)) +- Update django-stubs to 1.13.1 ([#3986](https://github.com/cookiecutter/cookiecutter-django/pull/3986)) + ## 2022.12.07 ### Updated diff --git a/setup.py b/setup.py index 151b1e356..558ea522a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.07" +version = "2022.12.08" with open("README.rst") as readme_file: long_description = readme_file.read() From 2f92644fce097a64a4a47205e24d4ac653cb199c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 9 Dec 2022 22:04:12 +0000 Subject: [PATCH 132/205] Remove bind mounts for docker compose volumes (#3981) Fix #3685 --- {{cookiecutter.project_slug}}/local.yml | 4 ++-- {{cookiecutter.project_slug}}/production.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 33a8db07a..38b9d77d3 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -35,8 +35,8 @@ services: image: {{ cookiecutter.project_slug }}_production_postgres container_name: {{ cookiecutter.project_slug }}_local_postgres volumes: - - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/data:Z - - {{ cookiecutter.project_slug }}_local_postgres_data_backups:/backups:z + - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/data + - {{ cookiecutter.project_slug }}_local_postgres_data_backups:/backups env_file: - ./.envs/.local/.postgres diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index ea4292a0d..cc4c9bca1 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -25,8 +25,8 @@ services: dockerfile: ./compose/production/postgres/Dockerfile image: {{ cookiecutter.project_slug }}_production_postgres volumes: - - production_postgres_data:/var/lib/postgresql/data:Z - - production_postgres_data_backups:/backups:z + - production_postgres_data:/var/lib/postgresql/data + - production_postgres_data_backups:/backups env_file: - ./.envs/.production/.postgres @@ -38,7 +38,7 @@ services: depends_on: - django volumes: - - production_traefik:/etc/traefik/acme:z + - production_traefik:/etc/traefik/acme ports: - "0.0.0.0:80:80" - "0.0.0.0:443:443" From a9c3b56e5f6de3c9d216847e3bd404c80ae67c63 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 9 Dec 2022 17:04:36 -0500 Subject: [PATCH 133/205] Update black to 22.12.0 (#3988) * Update black from 22.10.0 to 22.12.0 * Update black from 22.10.0 to 22.12.0 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c35de3b6d..0aedb48e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==22.10.0 +black==22.12.0 isort==5.10.1 flake8==6.0.0 flake8-isort==5.0.3 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index bacfdbbe5..e02ea203e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort coverage==6.5.0 # https://github.com/nedbat/coveragepy -black==22.10.0 # https://github.com/psf/black +black==22.12.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 From 20b7ca105bbdc21d21c267427c5974515b6cba5e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 9 Dec 2022 17:18:10 -0500 Subject: [PATCH 134/205] Update djangorestframework-stubs to 1.8.0 (#3990) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e02ea203e..6b073194c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs==1.13.1 # https://github.com/typeddjango/django-stubs pytest==7.2.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==1.8.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From db048af2d34dea0b2c92d962f88453be458ede7d Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 10 Dec 2022 02:24:07 +0000 Subject: [PATCH 135/205] Release 2022.12.09 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 132fd96fb..8ae474316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.09 + +### Changed +- Remove bind option mounts for docker compose volumes ([#3981](https://github.com/cookiecutter/cookiecutter-django/pull/3981)) +### Updated +- Update djangorestframework-stubs to 1.8.0 ([#3990](https://github.com/cookiecutter/cookiecutter-django/pull/3990)) +- Update black to 22.12.0 ([#3988](https://github.com/cookiecutter/cookiecutter-django/pull/3988)) + ## 2022.12.08 ### Updated diff --git a/setup.py b/setup.py index 558ea522a..42af5a0dc 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.08" +version = "2022.12.09" with open("README.rst") as readme_file: long_description = readme_file.read() From 8b9c719a31039e200526087c0b43e289a47619dd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 10 Dec 2022 15:13:10 +0000 Subject: [PATCH 136/205] Auto-update pre-commit hooks (#3991) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5669b756e..b256f5bff 100644 --- 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.10.0 + rev: 22.12.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 1b0150c4a..18301b233 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: args: [--py310-plus] - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 22.12.0 hooks: - id: black From 8f84d146e35ba4feb131c9786cb2a5abde5fb35a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 10 Dec 2022 10:13:41 -0500 Subject: [PATCH 137/205] Update tox from 4.0.3 to 4.0.5 (#3993) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0aedb48e8..0ec11e7b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.3 +tox==4.0.5 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 026165d52ea779d507856564bd87971dd1de7301 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 11 Dec 2022 02:30:45 +0000 Subject: [PATCH 138/205] Release 2022.12.10 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ae474316..74ed1e650 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.10 + +### Updated +- Update tox to 4.0.5 ([#3993](https://github.com/cookiecutter/cookiecutter-django/pull/3993)) +- Auto-update pre-commit hooks ([#3991](https://github.com/cookiecutter/cookiecutter-django/pull/3991)) + ## 2022.12.09 ### Changed diff --git a/setup.py b/setup.py index 42af5a0dc..15ed7ce23 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.09" +version = "2022.12.10" with open("README.rst") as readme_file: long_description = readme_file.read() From 5ccf73843afd7f0af383f30f4c1f55a6605b673a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 13 Dec 2022 04:05:57 -0500 Subject: [PATCH 139/205] Update isort from 5.10.1 to 5.11.0 (#3997) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0ec11e7b5..7f53de8ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==22.12.0 -isort==5.10.1 +isort==5.11.0 flake8==6.0.0 flake8-isort==5.0.3 pre-commit==2.20.0 From 2cadf20adf25173acf8e2e95137f69953b5f4410 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 09:06:12 +0000 Subject: [PATCH 140/205] Auto-update pre-commit hooks (#3998) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b256f5bff..fedfdc47f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.11.1 hooks: - id: isort diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 18301b233..f0231004c 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.11.1 hooks: - id: isort From a04558a7d5ad31e26edd0111c20b23d48b62899a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 13 Dec 2022 04:48:21 -0500 Subject: [PATCH 141/205] Update isort from 5.11.0 to 5.11.1 (#3999) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7f53de8ca..62d71b3b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==22.12.0 -isort==5.11.0 +isort==5.11.1 flake8==6.0.0 flake8-isort==5.0.3 pre-commit==2.20.0 From ed90ead15f56493723e1fc0590c9bdb0bdccea01 Mon Sep 17 00:00:00 2001 From: Omer-5 <61422607+Omer-5@users.noreply.github.com> Date: Tue, 13 Dec 2022 23:32:57 +0200 Subject: [PATCH 142/205] Improve documentation for Getting started with Docker (#4003) Fix https://github.com/cookiecutter/cookiecutter-django/issues/3971 --- docs/developing-locally-docker.rst | 9 ++++++--- docs/developing-locally.rst | 6 +++--- docs/generate-project-block.rst | 7 +++++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 docs/generate-project-block.rst diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 4bb5d9032..a7d77e108 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -3,9 +3,6 @@ Getting Up and Running Locally With Docker .. index:: Docker -The steps below will get you up and running with a local development environment. -All of these commands assume you are in the root of your generated project. - .. note:: If you're new to Docker, please be aware that some resources are cached system-wide @@ -19,10 +16,16 @@ Prerequisites * Docker; if you don't have it yet, follow the `installation instructions`_; * Docker Compose; refer to the official documentation for the `installation guide`_. * Pre-commit; refer to the official documentation for the `pre-commit`_. +* Cookiecutter; refer to the official GitHub repository of `Cookiecutter`_ .. _`installation instructions`: https://docs.docker.com/install/#supported-platforms .. _`installation guide`: https://docs.docker.com/compose/install/ .. _`pre-commit`: https://pre-commit.com/#install +.. _`Cookiecutter`: https://github.com/cookiecutter/cookiecutter + +Before Getting Started +---------------------- +.. include:: generate-project-block.rst Build the Stack --------------- diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index c9d28ff73..e1c946268 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -24,9 +24,8 @@ First things first. $ source /bin/activate -#. Install cookiecutter-django: :: - - $ cookiecutter gh:cookiecutter/cookiecutter-django +#. + .. include:: generate-project-block.rst #. Install development requirements: :: @@ -43,6 +42,7 @@ First things first. #. Create a new PostgreSQL database using createdb_: :: $ createdb --username=postgres + ``project_slug`` is what you have entered as the project_slug at the setup stage. .. note:: diff --git a/docs/generate-project-block.rst b/docs/generate-project-block.rst new file mode 100644 index 000000000..2842b551d --- /dev/null +++ b/docs/generate-project-block.rst @@ -0,0 +1,7 @@ +Generate a new cookiecutter-django project: :: + + $ cookiecutter gh:cookiecutter/cookiecutter-django + +For more information refer to +:ref:`Project Generation Options `. + From bf9346eda57fb1ca238b7bb2569de6ec64ed6f40 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 13 Dec 2022 21:35:25 +0000 Subject: [PATCH 143/205] Fix update contributors workflow --- .github/workflows/update-contributors.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 952486c1b..83c651a46 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -29,6 +29,8 @@ jobs: pip install -r requirements.txt - name: Update list run: python scripts/update_contributors.py + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Commit changes uses: stefanzweifel/git-auto-commit-action@v4.16.0 From 7af6f69b2899d30cc977aa69838fdce64f835093 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 13 Dec 2022 21:35:58 +0000 Subject: [PATCH 144/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 49ebfe4d8..68f1b4c2d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1322,5 +1322,10 @@ "name": "rguptar", "github_login": "rguptar", "twitter_username": "" + }, + { + "name": "Omer-5", + "github_login": "Omer-5", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d97324708..d8a9d8190 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1447,6 +1447,13 @@ Listed in alphabetical order. + + Omer-5 + + Omer-5 + + + Pablo From 882f5052891c1a414386172ba1063eb309e512be Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Dec 2022 02:29:57 +0000 Subject: [PATCH 145/205] Release 2022.12.13 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74ed1e650..5ee4a4757 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.13 + +### Changed +- Improve documentation for Getting started with Docker ([#4003](https://github.com/cookiecutter/cookiecutter-django/pull/4003)) +### Updated +- Update isort to 5.11.1 ([#3999](https://github.com/cookiecutter/cookiecutter-django/pull/3999)) +- Auto-update pre-commit hooks ([#3998](https://github.com/cookiecutter/cookiecutter-django/pull/3998)) +- Update isort to 5.11.0 ([#3997](https://github.com/cookiecutter/cookiecutter-django/pull/3997)) + ## 2022.12.10 ### Updated diff --git a/setup.py b/setup.py index 15ed7ce23..680a75c09 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.10" +version = "2022.12.13" with open("README.rst") as readme_file: long_description = readme_file.read() From d3bd184aaaf326a172e719a238f9ebe14cfb3184 Mon Sep 17 00:00:00 2001 From: TAKAHASHI Shuuji Date: Wed, 21 Dec 2022 18:47:51 +0900 Subject: [PATCH 146/205] Update image URL for build status shield badge (#4018) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27fc6e0e1..eaac817a3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cookiecutter Django -[![Build Status](https://img.shields.io/github/workflow/status/cookiecutter/cookiecutter-django/CI/master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI) +[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI) [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest) [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/) [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a) From ebec4dc44db9dfd43d2cdcddb2d3aaf4d8e8ebe7 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 21 Dec 2022 09:48:24 +0000 Subject: [PATCH 147/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 68f1b4c2d..5c8b1f753 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1327,5 +1327,10 @@ "name": "Omer-5", "github_login": "Omer-5", "twitter_username": "" + }, + { + "name": "TAKAHASHI Shuuji", + "github_login": "shuuji3", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d8a9d8190..dba721de6 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1671,6 +1671,13 @@ Listed in alphabetical order. + + TAKAHASHI Shuuji + + shuuji3 + + + Tames McTigue From 9b9bc9bec175490f8ed0016ca938fca5e08c5167 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 21 Dec 2022 09:49:45 +0000 Subject: [PATCH 148/205] Update target URL for build badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eaac817a3..38724caff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cookiecutter Django -[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI) +[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)]([https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=workflow%3ACI+branch%3Amaster)) [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest) [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/) [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a) From 2c914c203220206d028b88208cf4a7a8a4d002e3 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 21 Dec 2022 09:51:17 +0000 Subject: [PATCH 149/205] Fix URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38724caff..d8fc58ec4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cookiecutter Django -[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)]([https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=workflow%3ACI+branch%3Amaster)) +[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=branch%3Amaster) [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest) [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/) [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a) From 7a6435695b82c86e6895862f5d2c0c0b5a0a57f6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 04:52:05 -0500 Subject: [PATCH 150/205] Update hiredis to 2.1.0 (#4006) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 827530be9..6aa2b6558 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -14,7 +14,7 @@ whitenoise==6.2.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.4.0 # 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 +hiredis==2.1.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index c9b5b88a7..1d199b125 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ Collectfast==2.2.0 # https://github.com/antonagestam/collectfast sentry-sdk==1.11.1 # 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 +hiredis==2.1.0 # https://github.com/redis/hiredis-py {%- endif %} # Django From 256a967087e7a1bc945be18be43cc36adfc65522 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 06:02:04 -0500 Subject: [PATCH 151/205] Update drf-spectacular to 0.25.1 (#4009) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 6aa2b6558..e5aafcd73 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -44,5 +44,5 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis 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.24.2 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.25.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} From d26fc164e7e384c6d1532c815d7d21467f8f972c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 06:16:43 -0500 Subject: [PATCH 152/205] Update isort to 5.11.3 (#4010) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 62d71b3b4..1a1688a6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==22.12.0 -isort==5.11.1 +isort==5.11.3 flake8==6.0.0 flake8-isort==5.0.3 pre-commit==2.20.0 From e101fbc5215dbe7f5571e308c043b480d8867bc0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 11:20:19 +0000 Subject: [PATCH 153/205] Auto-update pre-commit hooks (#4005) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fedfdc47f..6400b593e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: 5.11.1 + rev: v5.11.3 hooks: - id: isort diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index f0231004c..8cec23181 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: 5.11.1 + rev: v5.11.3 hooks: - id: isort From 81309a610fcf8901a736689740b3f67cbecc2cab Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 06:20:42 -0500 Subject: [PATCH 154/205] Update django-anymail to 9.0 (#4012) --- .../requirements/production.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 1d199b125..adb7dbcdf 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,21 +24,21 @@ django-storages[google]==1.13.1 # https://github.com/jschneier/django-storages django-storages[azure]==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 +django-anymail[mailgun]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==8.6 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==8.6 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==8.6 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==8.6 # https://github.com/anymail/django-anymail +django-anymail[postmark]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==8.6 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==8.6 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==8.6 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==8.6 # https://github.com/anymail/django-anymail +django-anymail==9.0 # https://github.com/anymail/django-anymail {%- endif %} From dd1f3a6d12d3e9e1a4b8fb0cb3e9d0046c38f702 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 08:57:20 -0500 Subject: [PATCH 155/205] Update coverage to 7.0.0 (#4013) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6b073194c..91994de00 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort -coverage==6.5.0 # https://github.com/nedbat/coveragepy +coverage==7.0.0 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index 3bec1fbee..b99bba644 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -34,7 +34,7 @@ django_settings_module = config.settings.test ignore_errors = True [coverage:run] -include = {{cookiecutter.project_slug}}/* +include = {{cookiecutter.project_slug}}/** omit = *migrations*, *tests* plugins = django_coverage_plugin From 31a1de9bfb9f991019b6c541daa20723b887dcdb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 08:58:04 -0500 Subject: [PATCH 156/205] Update sentry-sdk to 1.12.1 (#4014) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index adb7dbcdf..b7d73819b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.11.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.12.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.1.0 # https://github.com/redis/hiredis-py From 9bc388dd0d323a299cf786b61133d63f437ef80e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 08:58:53 -0500 Subject: [PATCH 157/205] Update tox to 4.0.16 (#4017) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1a1688a6b..3f5b0a6d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.5 +tox==4.0.16 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From e869ab7cc40da5bd482d4410b2befd2fac668263 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 09:22:37 -0500 Subject: [PATCH 158/205] Update ipdb to 0.13.11 (#4019) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 91994de00..3732a3f18 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ -r base.txt Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug -ipdb==0.13.9 # https://github.com/gotcha/ipdb +ipdb==0.13.11 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 {%- else %} From 7fc0b1d16738ad8441833c369d75c6c7f107d0f5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 09:24:02 -0500 Subject: [PATCH 159/205] Update pytz to 2022.7 (#4020) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e5aafcd73..9acae6a80 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.6 # https://github.com/stub42/pytz +pytz==2022.7 # https://github.com/stub42/pytz python-slugify==7.0.0 # https://github.com/un33k/python-slugify Pillow==9.3.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 93c0769516b7e64e8f5471bbe79f5e3dfa7cdd62 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 21 Dec 2022 15:39:54 +0100 Subject: [PATCH 160/205] Retry when trying to store a Celery result in backend (#3996) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/config/settings/base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 1989fd8cb..6bf6a6e5c 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -283,6 +283,11 @@ CELERY_BROKER_URL = env("CELERY_BROKER_URL") CELERY_RESULT_BACKEND = CELERY_BROKER_URL # https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended CELERY_RESULT_EXTENDED = True +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-backend-always-retry +# https://github.com/celery/celery/pull/6122 +CELERY_RESULT_BACKEND_ALWAYS_RETRY = True +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-backend-max-retries +CELERY_RESULT_BACKEND_MAX_RETRIES = 10 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-accept_content CELERY_ACCEPT_CONTENT = ["json"] # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer From be69fadefcba0de477d94d4695e26722bc93992a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Dec 2022 02:21:52 +0000 Subject: [PATCH 161/205] Release 2022.12.21 --- CHANGELOG.md | 17 +++++++++++++++++ setup.py | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ee4a4757..150b750b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.21 + +### Changed +- Retry when trying to store a Celery result in backend ([#3996](https://github.com/cookiecutter/cookiecutter-django/pull/3996)) +- Update image URL for build status shield badge ([#4018](https://github.com/cookiecutter/cookiecutter-django/pull/4018)) +### Updated +- Update pytz to 2022.7 ([#4020](https://github.com/cookiecutter/cookiecutter-django/pull/4020)) +- Update ipdb to 0.13.11 ([#4019](https://github.com/cookiecutter/cookiecutter-django/pull/4019)) +- Update tox to 4.0.16 ([#4017](https://github.com/cookiecutter/cookiecutter-django/pull/4017)) +- Update sentry-sdk to 1.12.1 ([#4014](https://github.com/cookiecutter/cookiecutter-django/pull/4014)) +- Update coverage to 7.0.0 ([#4013](https://github.com/cookiecutter/cookiecutter-django/pull/4013)) +- Update django-anymail to 9.0 ([#4012](https://github.com/cookiecutter/cookiecutter-django/pull/4012)) +- Auto-update pre-commit hooks ([#4005](https://github.com/cookiecutter/cookiecutter-django/pull/4005)) +- Update isort to 5.11.3 ([#4010](https://github.com/cookiecutter/cookiecutter-django/pull/4010)) +- Update drf-spectacular to 0.25.1 ([#4009](https://github.com/cookiecutter/cookiecutter-django/pull/4009)) +- Update hiredis to 2.1.0 ([#4006](https://github.com/cookiecutter/cookiecutter-django/pull/4006)) + ## 2022.12.13 ### Changed diff --git a/setup.py b/setup.py index 680a75c09..7adacfaee 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.13" +version = "2022.12.21" with open("README.rst") as readme_file: long_description = readme_file.read() From bd2d3edd314a90147dc7280781830b358a1e5616 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 24 Dec 2022 06:25:53 -0500 Subject: [PATCH 162/205] Update coverage from 7.0.0 to 7.0.1 (#4024) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 3732a3f18..adba4a0f7 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort -coverage==7.0.0 # https://github.com/nedbat/coveragepy +coverage==7.0.1 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 5e098901510b845c781bdae3e7f498898b61da9e Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 25 Dec 2022 02:24:44 +0000 Subject: [PATCH 163/205] Release 2022.12.24 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 150b750b7..17c7fffbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.24 + +### Updated +- Update coverage to 7.0.1 ([#4024](https://github.com/cookiecutter/cookiecutter-django/pull/4024)) + ## 2022.12.21 ### Changed diff --git a/setup.py b/setup.py index 7adacfaee..5bdf3eeb3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.21" +version = "2022.12.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 5c30b67df1145c4b009981e27c0a21257c26ed50 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 25 Dec 2022 09:33:59 +0000 Subject: [PATCH 164/205] Auto-update pre-commit hooks (#4021) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6400b593e..ca86e7eb5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: v5.11.3 + rev: 5.11.4 hooks: - id: isort diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 8cec23181..c1aaf0d9f 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: v5.11.3 + rev: 5.11.4 hooks: - id: isort From 88370e648849e3d4fb68f68b19450f5021bf3af2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 26 Dec 2022 02:22:40 +0000 Subject: [PATCH 165/205] Release 2022.12.25 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17c7fffbc..75cbf2ade 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.25 + +### Updated +- Auto-update pre-commit hooks ([#4021](https://github.com/cookiecutter/cookiecutter-django/pull/4021)) + ## 2022.12.24 ### Updated diff --git a/setup.py b/setup.py index 5bdf3eeb3..e41708a8e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.24" +version = "2022.12.25" with open("README.rst") as readme_file: long_description = readme_file.read() From 019efba2e1cc44aa1b4aa9627cf49729c3dea24d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Dec 2022 05:03:43 -0500 Subject: [PATCH 166/205] Update pre-commit to 2.21.0 (#4026) * Update pre-commit from 2.20.0 to 2.21.0 * Update pre-commit from 2.20.0 to 2.21.0 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3f5b0a6d8..27cdeeb11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==22.12.0 isort==5.11.3 flake8==6.0.0 flake8-isort==5.0.3 -pre-commit==2.20.0 +pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index adba4a0f7..22b0f0fa3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,7 +36,7 @@ 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 {%- endif %} -pre-commit==2.20.0 # https://github.com/pre-commit/pre-commit +pre-commit==2.21.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From f1b5056f4a02a29de23a3d20be422fffc2c1fa30 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Dec 2022 05:03:58 -0500 Subject: [PATCH 167/205] Update tox from 4.0.16 to 4.0.17 (#4027) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 27cdeeb11..ec14de1c6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.16 +tox==4.0.17 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 6b3b5cd067995dd4a199d17c259ae18ed55ec50f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Dec 2022 02:20:11 +0000 Subject: [PATCH 168/205] Release 2022.12.26 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75cbf2ade..9ff6f2286 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.26 + +### Updated +- Update tox to 4.0.17 ([#4027](https://github.com/cookiecutter/cookiecutter-django/pull/4027)) +- Update pre-commit to 2.21.0 ([#4026](https://github.com/cookiecutter/cookiecutter-django/pull/4026)) + ## 2022.12.25 ### Updated diff --git a/setup.py b/setup.py index e41708a8e..e7ec62436 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.25" +version = "2022.12.26" with open("README.rst") as readme_file: long_description = readme_file.read() From c72818063133cd3da8fcb13d0d62a49379c6ed00 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 29 Dec 2022 00:18:41 -0800 Subject: [PATCH 169/205] Update gitpython from 3.1.29 to 3.1.30 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ec14de1c6..04852f01c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.57 -gitpython==3.1.29 +gitpython==3.1.30 jinja2==3.1.2 requests==2.28.1 From 5530eebfec0b7607078bdca6bd2e95cdcafbfe73 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 29 Dec 2022 02:21:49 -0800 Subject: [PATCH 170/205] Update django-allauth from 0.51.0 to 0.52.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9acae6a80..8ae17ad60 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.20.0 # https://github.com/encode/uvicorn django==4.0.8 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.51.0 # https://github.com/pennersr/django-allauth +django-allauth==0.52.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 51abef1b8dccac6e89f14abcf195dc539f3407ed Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 29 Dec 2022 13:17:02 -0500 Subject: [PATCH 171/205] Update tox from 4.0.17 to 4.0.19 (#4030) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ec14de1c6..f5e828ad0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.17 +tox==4.0.19 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From f6c44d69563e99c588598505879e24498726d145 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 29 Dec 2022 13:30:50 -0500 Subject: [PATCH 172/205] Update tox from 4.0.19 to 4.1.0 (#4035) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f5e828ad0..ef0272058 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.19 +tox==4.1.0 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 03e90149302cf5f17d16a57699c14f7589fe49ae Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 30 Dec 2022 02:22:45 +0000 Subject: [PATCH 173/205] Release 2022.12.29 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ff6f2286..aca668c5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.29 + +### Updated +- Update tox to 4.1.0 ([#4035](https://github.com/cookiecutter/cookiecutter-django/pull/4035)) +- Update tox to 4.0.19 ([#4030](https://github.com/cookiecutter/cookiecutter-django/pull/4030)) +- Update django-allauth to 0.52.0 ([#4033](https://github.com/cookiecutter/cookiecutter-django/pull/4033)) + ## 2022.12.26 ### Updated diff --git a/setup.py b/setup.py index e7ec62436..e03b72109 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.26" +version = "2022.12.29" with open("README.rst") as readme_file: long_description = readme_file.read() From a7f195680f52eec8b25eb48a59fc3d5639780592 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 1 Jan 2023 21:15:53 -0800 Subject: [PATCH 174/205] Update pillow from 9.3.0 to 9.4.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8ae17ad60..e37caf3c7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2022.7 # https://github.com/stub42/pytz python-slugify==7.0.0 # https://github.com/un33k/python-slugify -Pillow==9.3.0 # https://github.com/python-pillow/Pillow +Pillow==9.4.0 # 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 From 522574d1b241a486ff5327d6033e0da0abea9296 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Jan 2023 16:43:31 -0800 Subject: [PATCH 175/205] Update tox from 4.1.0 to 4.1.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ef0272058..040189b28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.1.0 +tox==4.1.3 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From af625635230bffc77cc0c6c8eebacee278cfcb18 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Jan 2023 16:43:37 -0800 Subject: [PATCH 176/205] Update coverage from 7.0.1 to 7.0.2 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 22b0f0fa3..016880601 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort -coverage==7.0.1 # https://github.com/nedbat/coveragepy +coverage==7.0.2 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 3bb37120744d77cebedcec25dad12998adebbd6e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 3 Jan 2023 04:30:22 -0800 Subject: [PATCH 177/205] Update whitenoise from 6.2.0 to 6.3.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8ae17ad60..1c4507d84 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -10,7 +10,7 @@ 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.2.0 # https://github.com/evansd/whitenoise +whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.4.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From f7b628092d5a18cbf7edc2ac58069f72a10545af Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 3 Jan 2023 13:31:12 -0500 Subject: [PATCH 178/205] Update flake8-isort to 6.0.0 (#4022) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update flake8-isort from 5.0.3 to 6.0.0 Co-authored-by: Fábio C. Barrionuevo da Luz --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 45167a17f..f514ad0f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==22.12.0 isort==5.11.3 flake8==6.0.0 -flake8-isort==5.0.3 +flake8-isort==6.0.0 pre-commit==2.21.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 016880601..a703dedf0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 -flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort +flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort coverage==7.0.2 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 065b994238a9cad8fa5481de021dcb08c807844b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Jan 2023 02:24:51 +0000 Subject: [PATCH 179/205] Release 2023.01.03 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aca668c5f..69a9e780a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.03 + +### Updated +- Update flake8-isort to 6.0.0 ([#4022](https://github.com/cookiecutter/cookiecutter-django/pull/4022)) +- Update tox to 4.1.3 ([#4041](https://github.com/cookiecutter/cookiecutter-django/pull/4041)) +- Update pillow to 9.4.0 ([#4040](https://github.com/cookiecutter/cookiecutter-django/pull/4040)) +- Update gitpython to 3.1.30 ([#4032](https://github.com/cookiecutter/cookiecutter-django/pull/4032)) +- Update coverage to 7.0.2 ([#4042](https://github.com/cookiecutter/cookiecutter-django/pull/4042)) +- Update whitenoise to 6.3.0 ([#4044](https://github.com/cookiecutter/cookiecutter-django/pull/4044)) + ## 2022.12.29 ### Updated diff --git a/setup.py b/setup.py index e03b72109..90e524837 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.29" +version = "2023.01.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 2da98ab87cc99420557aa0e84d3834886b8cc590 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2023 07:22:18 -0500 Subject: [PATCH 180/205] Update coverage from 7.0.2 to 7.0.3 (#4047) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index a703dedf0..0bb99c1a6 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.0.2 # https://github.com/nedbat/coveragepy +coverage==7.0.3 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From b00fde9a872da1a3ae2e9771e468074ad1da427b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2023 07:24:21 -0500 Subject: [PATCH 181/205] Update tox from 4.1.3 to 4.2.1 (#4046) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f514ad0f4..412410843 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.1.3 +tox==4.2.1 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From ebcee95c8b055c9bb4bf18878badfb81b31354a1 Mon Sep 17 00:00:00 2001 From: Thomas Booij Date: Wed, 4 Jan 2023 16:33:02 +0100 Subject: [PATCH 182/205] Fix typo on the test settings (#4049) --- {{cookiecutter.project_slug}}/config/settings/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index f103eb10b..198b5aa5d 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -25,7 +25,7 @@ PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"] # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" -# DEBUGING FOR TEMPLATES +# DEBUGGING FOR TEMPLATES # ------------------------------------------------------------------------------ TEMPLATES[0]["OPTIONS"]["debug"] = True # type: ignore # noqa F405 From abf9405a59656d4bd46685e256a2778579cf0601 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Wed, 4 Jan 2023 15:33:47 +0000 Subject: [PATCH 183/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 5c8b1f753..55a6df601 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1332,5 +1332,10 @@ "name": "TAKAHASHI Shuuji", "github_login": "shuuji3", "twitter_username": "" + }, + { + "name": "Thomas Booij", + "github_login": "ThomasBooij95", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index dba721de6..fbc8dd973 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1706,6 +1706,13 @@ Listed in alphabetical order. thibault + + Thomas Booij + + ThomasBooij95 + + + Théo Segonds From bd5ceb00481dfaac12e0c24e1e1011ac45c98d56 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2023 15:51:37 -0500 Subject: [PATCH 184/205] Update tox from 4.2.1 to 4.2.2 (#4050) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 412410843..7db83d824 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.1 +tox==4.2.2 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From d7485fd93e587b13570f4d7755e594470ad901e8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 5 Jan 2023 02:25:14 +0000 Subject: [PATCH 185/205] Release 2023.01.04 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69a9e780a..eb5f7b48f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.04 + +### Changed +- Fix typo on test settings ([#4049](https://github.com/cookiecutter/cookiecutter-django/pull/4049)) +### Updated +- Update tox to 4.2.2 ([#4050](https://github.com/cookiecutter/cookiecutter-django/pull/4050)) +- Update tox to 4.2.1 ([#4046](https://github.com/cookiecutter/cookiecutter-django/pull/4046)) +- Update coverage to 7.0.3 ([#4047](https://github.com/cookiecutter/cookiecutter-django/pull/4047)) + ## 2023.01.03 ### Updated diff --git a/setup.py b/setup.py index 90e524837..ba0475913 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.03" +version = "2023.01.04" with open("README.rst") as readme_file: long_description = readme_file.read() From 66be5ceab463307c25d42c979825960aadca2198 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Fri, 6 Jan 2023 09:48:39 -0800 Subject: [PATCH 186/205] Fix link, add non-Docker commands (#4036) --- docs/testing.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/testing.rst b/docs/testing.rst index dd6fcb48f..bea45c6dd 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -28,10 +28,15 @@ Coverage You should build your tests to provide the highest level of **code coverage**. You can run the ``pytest`` with code ``coverage`` by typing in the following command: :: - $ docker-compose -f local.yml run --rm django coverage run -m pytest + $ coverage run -m pytest Once the tests are complete, in order to see the code coverage, run the following command: :: + $ coverage report + +If you're running the project locally with Docker, use these commands instead: :: + + $ docker-compose -f local.yml run --rm django coverage run -m pytest $ docker-compose -f local.yml run --rm django coverage report .. note:: @@ -53,4 +58,4 @@ Once the tests are complete, in order to see the code coverage, run the followin .. _develop locally with docker: ./developing-locally-docker.html .. _customize: https://docs.pytest.org/en/latest/customize.html .. _unittest: https://docs.python.org/3/library/unittest.html#module-unittest -.. _configuring: https://coverage.readthedocs.io/en/v4.5.x/config.html +.. _configuring: https://coverage.readthedocs.io/en/latest/config.html From d5631b7d2a6363f6520adf38f869410f4330e389 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 6 Jan 2023 17:49:08 +0000 Subject: [PATCH 187/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 55a6df601..9ba9955cc 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1337,5 +1337,10 @@ "name": "Thomas Booij", "github_login": "ThomasBooij95", "twitter_username": "" + }, + { + "name": "Pamela Fox", + "github_login": "pamelafox", + "twitter_username": "pamelafox" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index fbc8dd973..e54c1f650 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1461,6 +1461,13 @@ Listed in alphabetical order. + + Pamela Fox + + pamelafox + + pamelafox + Parbhat Puri From 84851ef6096d97bcf70ea11c3c94faf682411c2d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 6 Jan 2023 12:49:41 -0500 Subject: [PATCH 188/205] Update tox to 4.2.3 (#4051) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7db83d824..5db12aac8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.2 +tox==4.2.3 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 62df4f44603e07f23f126a9e78da706c53a170f5 Mon Sep 17 00:00:00 2001 From: Robin <7276999+Kaffeetasse@users.noreply.github.com> Date: Fri, 6 Jan 2023 18:56:41 +0100 Subject: [PATCH 189/205] Add .git to .dockerignore (#4054) --- {{cookiecutter.project_slug}}/.dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore index 5518e60af..7369480e3 100644 --- a/{{cookiecutter.project_slug}}/.dockerignore +++ b/{{cookiecutter.project_slug}}/.dockerignore @@ -8,3 +8,4 @@ .readthedocs.yml .travis.yml venv +.git From b9933f54afea71f6b94181f191c4040a13e9b0eb Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 6 Jan 2023 18:06:14 +0000 Subject: [PATCH 190/205] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 9ba9955cc..34c84979d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1342,5 +1342,10 @@ "name": "Pamela Fox", "github_login": "pamelafox", "twitter_username": "pamelafox" + }, + { + "name": "Robin", + "github_login": "Kaffeetasse", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e54c1f650..718d58c57 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1573,6 +1573,13 @@ Listed in alphabetical order. + + Robin + + Kaffeetasse + + + Roman Afanaskin From d91c2141eaa84f7fb0fe574e2d22a755169444ea Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 6 Jan 2023 10:50:05 -0800 Subject: [PATCH 191/205] Update rcssmin from 1.1.0 to 1.1.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index f4d2399de..16e96cc2b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -5,7 +5,7 @@ Pillow==9.4.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.1.0 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin {%- else %} -rcssmin==1.1.0 # https://github.com/ndparker/rcssmin +rcssmin==1.1.1 # https://github.com/ndparker/rcssmin {%- endif %} {%- endif %} argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi From 9c23a17987cc4a737780bd11a39eb617a5cd42e4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 6 Jan 2023 14:11:14 -0800 Subject: [PATCH 192/205] Update django-compressor from 4.1 to 4.3 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index f4d2399de..a20b98c18 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -36,7 +36,7 @@ django-allauth==0.52.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} -django-compressor==4.1 # https://github.com/django-compressor/django-compressor +django-compressor==4.3 # https://github.com/django-compressor/django-compressor {%- endif %} django-redis==5.2.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} From 3601d2a843f600ba5c6763825cce177c74b9b5ed Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 7 Jan 2023 02:23:16 +0000 Subject: [PATCH 193/205] Release 2023.01.06 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb5f7b48f..e84c56136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.06 + +### Changed +- Add `.git` to `.dockerignore` ([#4054](https://github.com/cookiecutter/cookiecutter-django/pull/4054)) +- Fix link and add non-Docker commands to testing page in the docs ([#4036](https://github.com/cookiecutter/cookiecutter-django/pull/4036)) +### Updated +- Update tox to 4.2.3 ([#4051](https://github.com/cookiecutter/cookiecutter-django/pull/4051)) + ## 2023.01.04 ### Changed diff --git a/setup.py b/setup.py index ba0475913..6275646be 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.04" +version = "2023.01.06" with open("README.rst") as readme_file: long_description = readme_file.read() From 56143f7a5f8a6296cdc3b21dd5ec73f36875105b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 7 Jan 2023 08:27:47 -0500 Subject: [PATCH 194/205] Update isort to 5.11.4 (#4058) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5db12aac8..9d42222c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==22.12.0 -isort==5.11.3 +isort==5.11.4 flake8==6.0.0 flake8-isort==6.0.0 pre-commit==2.21.0 From f294c276ad8109ecdca8d0be9e3cb16fb75739a7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 7 Jan 2023 08:29:18 -0500 Subject: [PATCH 195/205] Update django-storages to 1.13.2 (#4057) --- {{cookiecutter.project_slug}}/requirements/production.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index b7d73819b..04889fc27 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,11 +17,11 @@ hiredis==2.1.0 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.13.1 # https://github.com/jschneier/django-storages +django-storages[boto3]==1.13.2 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.13.1 # https://github.com/jschneier/django-storages +django-storages[google]==1.13.2 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'Azure' %} -django-storages[azure]==1.13.1 # https://github.com/jschneier/django-storages +django-storages[azure]==1.13.2 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==9.0 # https://github.com/anymail/django-anymail From 5aecf924abd2661ab98db9c47434044f855e8669 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 7 Jan 2023 08:34:22 -0500 Subject: [PATCH 196/205] Update tox to 4.2.6 (#4064) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9d42222c7..bc164293d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.3 +tox==4.2.6 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From f6023ab21e8de386e847d03df2e6e90126ee6af6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 8 Jan 2023 02:28:02 +0000 Subject: [PATCH 197/205] Release 2023.01.07 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e84c56136..f6ac1a9d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.07 + +### Updated +- Update tox to 4.2.6 ([#4064](https://github.com/cookiecutter/cookiecutter-django/pull/4064)) +- Update django-storages to 1.13.2 ([#4057](https://github.com/cookiecutter/cookiecutter-django/pull/4057)) +- Update isort to 5.11.4 ([#4058](https://github.com/cookiecutter/cookiecutter-django/pull/4058)) +- Update rcssmin to 1.1.1 ([#4060](https://github.com/cookiecutter/cookiecutter-django/pull/4060)) +- Update django-compressor to 4.3 ([#4063](https://github.com/cookiecutter/cookiecutter-django/pull/4063)) + ## 2023.01.06 ### Changed diff --git a/setup.py b/setup.py index 6275646be..91e605619 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.06" +version = "2023.01.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 3e050c0f5b4f948734ecab11d51f626456fda5cd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 8 Jan 2023 06:10:04 -0500 Subject: [PATCH 198/205] Update coverage from 7.0.3 to 7.0.4 (#4067) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0bb99c1a6..b9b4d2008 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.0.3 # https://github.com/nedbat/coveragepy +coverage==7.0.4 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From ce25e18a24a6acacfcafb86681dcf880adf6ff1b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 8 Jan 2023 06:10:19 -0500 Subject: [PATCH 199/205] Update redis from 4.4.0 to 4.4.1 (#4068) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index c4e809112..3a389eb08 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{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==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.4.0 # https://github.com/redis/redis-py +redis==4.4.1 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.1.0 # https://github.com/redis/hiredis-py {%- endif %} From e23fe10add86836e6a78d2d1d9f402a19ea5d76a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 9 Jan 2023 02:24:37 +0000 Subject: [PATCH 200/205] Release 2023.01.08 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6ac1a9d4..75cfa9795 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.08 + +### Updated +- Update redis to 4.4.1 ([#4068](https://github.com/cookiecutter/cookiecutter-django/pull/4068)) +- Update coverage to 7.0.4 ([#4067](https://github.com/cookiecutter/cookiecutter-django/pull/4067)) + ## 2023.01.07 ### Updated diff --git a/setup.py b/setup.py index 91e605619..ff9990b7b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.07" +version = "2023.01.08" with open("README.rst") as readme_file: long_description = readme_file.read() From 629785e1d4e43771e80c7b29375203852b95c06f Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Tue, 10 Jan 2023 00:57:05 -0800 Subject: [PATCH 201/205] Add .venv to exclude (#4069) --- {{cookiecutter.project_slug}}/setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index b99bba644..7ee60215a 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -1,10 +1,10 @@ [flake8] max-line-length = 120 -exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv +exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv [pycodestyle] max-line-length = 120 -exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv +exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv [isort] line_length = 88 From 98ca314904baffc259c856d846bdc8030c4c6c7a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 10 Jan 2023 08:21:58 -0500 Subject: [PATCH 202/205] Update hiredis to 2.1.1 (#4070) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 3a389eb08..06be3c65c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -14,7 +14,7 @@ whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.4.1 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} -hiredis==2.1.0 # https://github.com/redis/hiredis-py +hiredis==2.1.1 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 04889fc27..ce3e9f3fe 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ Collectfast==2.2.0 # https://github.com/antonagestam/collectfast sentry-sdk==1.12.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} -hiredis==2.1.0 # https://github.com/redis/hiredis-py +hiredis==2.1.1 # https://github.com/redis/hiredis-py {%- endif %} # Django From c4291e7522648dbf43f5d38956afc061ddaf8131 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Tue, 10 Jan 2023 15:11:53 -0800 Subject: [PATCH 203/205] Add dump.rdb to gitignore (#4062) --- {{cookiecutter.project_slug}}/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index ede26ef72..acc484307 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -326,6 +326,9 @@ Session.vim # Auto-generated tag files tags +# Redis dump file +dump.rdb + ### Project template {%- if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %} MailHog From 7b93aac85748df72cdadc0828532bb1c3ddf748b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Jan 2023 02:42:18 +0000 Subject: [PATCH 204/205] Release 2023.01.10 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75cfa9795..ecd6023af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.10 + +### Changed +- Add dump.rdb to gitignore ([#4062](https://github.com/cookiecutter/cookiecutter-django/pull/4062)) +### Fixed +- Exclude `.venv` from code style checks ([#4069](https://github.com/cookiecutter/cookiecutter-django/pull/4069)) +### Updated +- Update hiredis to 2.1.1 ([#4070](https://github.com/cookiecutter/cookiecutter-django/pull/4070)) + ## 2023.01.08 ### Updated diff --git a/setup.py b/setup.py index ff9990b7b..397500054 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.08" +version = "2023.01.10" with open("README.rst") as readme_file: long_description = readme_file.read() From 470eb70069e504940c273832dce040af843d69d4 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Wed, 11 Jan 2023 09:38:38 -0800 Subject: [PATCH 205/205] Update Celery instructions (#4061) Co-authored-by: Bruno Alla --- docs/developing-locally.rst | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index e1c946268..2b9438059 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -141,15 +141,32 @@ In production, we have Mailgun_ configured to have your back! Celery ------ -If the project is configured to use Celery as a task scheduler then by default tasks are set to run on the main thread -when developing locally. If you have the appropriate setup on your local machine then set the following -in ``config/settings/local.py``:: +If the project is configured to use Celery as a task scheduler then, by default, tasks are set to run on the main thread when developing locally instead of getting sent to a broker. However, if you have Redis setup on your local machine, you can set the following in ``config/settings/local.py``:: CELERY_TASK_ALWAYS_EAGER = False -To run Celery locally, make sure redis-server is installed (instructions are available at https://redis.io/topics/quickstart), run the server in one terminal with `redis-server`, and then start celery in another terminal with the following command:: +Next, make sure `redis-server` is installed (per the `Getting started with Redis`_ guide) and run the server in one terminal:: - celery -A config.celery_app worker --loglevel=info + $ redis-server + +Start the Celery worker by running the following command in another terminal:: + + $ celery -A config.celery_app worker --loglevel=info + +That Celery worker should be running whenever your app is running, typically as a background process, +so that it can pick up any tasks that get queued. Learn more from the `Celery Workers Guide`_. + +The project comes with a simple task for manual testing purposes, inside `/users/tasks.py`. To queue that task locally, start the Django shell, import the task, and call `delay()` on it:: + + $ python manage.py shell + >> from .users.tasks import get_users_count + >> get_users_count.delay() + +You can also use Django admin to queue up tasks, thanks to the `django-celerybeat`_ package. + +.. _Getting started with Redis guide: https://redis.io/docs/getting-started/ +.. _Celery Workers Guide: https://docs.celeryq.dev/en/stable/userguide/workers.html +.. _django-celerybeat: https://django-celery-beat.readthedocs.io/en/latest/ Sass Compilation & Live Reloading