From f1ef4f85ff2f34e58ba2779bd047a7232e68dfce Mon Sep 17 00:00:00 2001 From: krati yadav Date: Fri, 30 Sep 2022 03:37:49 +0530 Subject: [PATCH 01/29] 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 02/29] 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 03/29] 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 04/29] 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 05/29] 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 06/29] 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 07/29] 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 08/29] 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 09/29] 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 10/29] 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 11/29] 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 12/29] 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 13/29] 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 14/29] 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 15/29] 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 16/29] 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 17/29] 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 18/29] 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 19/29] 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 20/29] 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 21/29] 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 22/29] 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 23/29] 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 24/29] 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 25/29] 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 26/29] 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 27/29] 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 28/29] 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 29/29] 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' %}