From 7a1dedaffe072ed782ef08621b4153a08cf6e7b3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Sep 2022 02:58:00 +0000 Subject: [PATCH 01/11] 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 02/11] 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 03/11] 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 f1ef4f85ff2f34e58ba2779bd047a7232e68dfce Mon Sep 17 00:00:00 2001 From: krati yadav Date: Fri, 30 Sep 2022 03:37:49 +0530 Subject: [PATCH 04/11] 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 05/11] 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 06/11] 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 07/11] 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 08/11] 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 09/11] 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 10/11] 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 11/11] 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()