From 89540df1bfa1e1f7d46d4923a2bfa2d16b209f8a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 8 Sep 2023 04:04:36 -0500 Subject: [PATCH 01/14] Update pytest to 7.4.2 (#4573) * Update pytest from 7.4.1 to 7.4.2 * Update pytest from 7.4.1 to 7.4.2 --- 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 417d17386..141fb85a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pre-commit==3.4.0 # Testing # ------------------------------------------------------------------------------ tox==4.11.1 -pytest==7.4.1 +pytest==7.4.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index c1d4adad4..804aed8f0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.20.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.4.1 # https://github.com/python/mypy django-stubs[compatible-mypy]==4.2.3 # https://github.com/typeddjango/django-stubs -pytest==7.4.1 # https://github.com/pytest-dev/pytest +pytest==7.4.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs[compatible-mypy]==3.14.2 # https://github.com/typeddjango/djangorestframework-stubs From e27454a2167b4bd2d7065f3606b690e66d8a9f6d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 8 Sep 2023 05:39:35 -0500 Subject: [PATCH 02/14] Update tox to 4.11.2 (#4575) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 141fb85a1..6279a88f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.4.0 # Testing # ------------------------------------------------------------------------------ -tox==4.11.1 +tox==4.11.2 pytest==7.4.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 99c909df70ea587d7a33d2253e722f4a2f1f8ec0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 9 Sep 2023 02:08:06 +0000 Subject: [PATCH 03/14] Release 2023.09.08 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8673490d0..6bfa22fbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.09.08 + + +### Updated + +- Update pytest to 7.4.2 ([#4573](https://github.com/cookiecutter/cookiecutter-django/pull/4573)) + ## 2023.09.07 diff --git a/setup.py b/setup.py index 4e83f9ff1..c1e6a6468 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.07" +version = "2023.09.08" with open("README.md") as readme_file: long_description = readme_file.read() From f36641f0eb9d1aea90a4aa015fccb037b8666702 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 11 Sep 2023 05:38:11 -0500 Subject: [PATCH 04/14] Update django-allauth from 0.56.0 to 0.56.1 (#4576) --- {{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 ad8cc8351..61660121b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn django==4.2.5 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.56.0 # https://github.com/pennersr/django-allauth +django-allauth==0.56.1 # https://github.com/pennersr/django-allauth django-crispy-forms==2.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 97219510eeaefebc93494c25748b5f36a5c78a13 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 11 Sep 2023 05:38:23 -0500 Subject: [PATCH 05/14] Update tox from 4.11.2 to 4.11.3 (#4577) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6279a88f7..107b07989 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.4.0 # Testing # ------------------------------------------------------------------------------ -tox==4.11.2 +tox==4.11.3 pytest==7.4.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 6664ab89161db5612a3ea81ea38cfa879003de98 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 11 Sep 2023 05:38:33 -0500 Subject: [PATCH 06/14] Update black to 23.9.1 (#4580) * Update black from 23.7.0 to 23.9.1 * Update black from 23.7.0 to 23.9.1 --- 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 107b07989..1144741f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==23.7.0 +black==23.9.1 isort==5.12.0 flake8==6.1.0 django-upgrade==1.14.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 804aed8f0..349ddb423 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.1.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort coverage==7.3.1 # https://github.com/nedbat/coveragepy -black==23.7.0 # https://github.com/psf/black +black==23.9.1 # https://github.com/psf/black djlint==1.32.1 # https://github.com/Riverside-Healthcare/djLint pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From c78becfd6741b94bd8d693864b4455bfe371ffad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:38:43 +0100 Subject: [PATCH 07/14] Auto-update pre-commit hooks (#4579) 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 6243406b0..01032aec5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,7 +30,7 @@ repos: exclude: hooks/ - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.1 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 2a03db795..fb249f2c0 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -37,7 +37,7 @@ repos: args: [--py311-plus] - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.1 hooks: - id: black From 9e8e87c39b459b14370fcbfcd6d174be82c56bcf Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 12 Sep 2023 02:09:18 +0000 Subject: [PATCH 08/14] Release 2023.09.11 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bfa22fbd..388bf0622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.09.11 + + +### Updated + +- Auto-update pre-commit hooks ([#4579](https://github.com/cookiecutter/cookiecutter-django/pull/4579)) + +- Update black to 23.9.1 ([#4580](https://github.com/cookiecutter/cookiecutter-django/pull/4580)) + +- Update django-allauth to 0.56.1 ([#4576](https://github.com/cookiecutter/cookiecutter-django/pull/4576)) + ## 2023.09.08 diff --git a/setup.py b/setup.py index c1e6a6468..59d68a8c8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.08" +version = "2023.09.11" with open("README.md") as readme_file: long_description = readme_file.read() From c27a9a84543971a9e7a5d3235714575ed8e72bcc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 12 Sep 2023 06:07:28 -0500 Subject: [PATCH 09/14] Update django-storages to 1.14 (#4564) * Update django-storages from 1.13.2 to 1.14 * Update django-storages from 1.13.2 to 1.14 * Update django-storages from 1.13.2 to 1.14 * Migrate to new namespace for S3 Storage class * Update extra require for django-storages * Rename our subclasses for S3Storage to match parent naming * Remove "Root" in our own storage class names --------- Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- .../config/settings/production.py | 12 ++++++------ .../requirements/production.txt | 6 +++--- .../utils/storages.py | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 87340b88a..971efa396 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -109,28 +109,28 @@ AZURE_CONTAINER = env("DJANGO_AZURE_CONTAINER_NAME") {% if cookiecutter.use_whitenoise == 'y' -%} STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" {% elif cookiecutter.cloud_provider == 'AWS' -%} -STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootS3Boto3Storage" +STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticS3Storage" COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy" STATIC_URL = f"https://{aws_s3_domain}/static/" {% elif cookiecutter.cloud_provider == 'GCP' -%} -STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage" +STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticGoogleCloudStorage" 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" +STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticAzureStorage" STATIC_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/static/" {% endif -%} # MEDIA # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootS3Boto3Storage" +DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaS3Storage" MEDIA_URL = f"https://{aws_s3_domain}/media/" {%- elif cookiecutter.cloud_provider == 'GCP' %} -DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage" +DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaGoogleCloudStorage" 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" +DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaAzureStorage" MEDIA_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/media/" {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index f04c04ffb..5c53bf111 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,11 +17,11 @@ hiredis==2.2.3 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.13.2 # https://github.com/jschneier/django-storages +django-storages[s3]==1.14 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.13.2 # https://github.com/jschneier/django-storages +django-storages[google]==1.14 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'Azure' %} -django-storages[azure]==1.13.2 # https://github.com/jschneier/django-storages +django-storages[azure]==1.14 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==10.1 # 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 27595ad1a..cc055378a 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py @@ -1,36 +1,36 @@ {% if cookiecutter.cloud_provider == 'AWS' -%} -from storages.backends.s3boto3 import S3Boto3Storage +from storages.backends.s3 import S3Storage -class StaticRootS3Boto3Storage(S3Boto3Storage): +class StaticS3Storage(S3Storage): location = "static" default_acl = "public-read" -class MediaRootS3Boto3Storage(S3Boto3Storage): +class MediaS3Storage(S3Storage): location = "media" file_overwrite = False {%- elif cookiecutter.cloud_provider == 'GCP' -%} from storages.backends.gcloud import GoogleCloudStorage -class StaticRootGoogleCloudStorage(GoogleCloudStorage): +class StaticGoogleCloudStorage(GoogleCloudStorage): location = "static" default_acl = "publicRead" -class MediaRootGoogleCloudStorage(GoogleCloudStorage): +class MediaGoogleCloudStorage(GoogleCloudStorage): location = "media" file_overwrite = False {%- elif cookiecutter.cloud_provider == 'Azure' -%} from storages.backends.azure_storage import AzureStorage -class StaticRootAzureStorage(AzureStorage): +class StaticAzureStorage(AzureStorage): location = "static" -class MediaRootAzureStorage(AzureStorage): +class MediaAzureStorage(AzureStorage): location = "media" file_overwrite = False {%- endif %} From 3709c9ce6c597613e9403d0ae21ba5047dc068f0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 12 Sep 2023 06:07:39 -0500 Subject: [PATCH 10/14] Update gitpython to 3.1.36 (#4581) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1144741f3..6a5062d4c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,6 @@ pyyaml==6.0.1 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.59.1 -gitpython==3.1.35 +gitpython==3.1.36 jinja2==3.1.2 requests==2.31.0 From 77ce7d61889c452313970efb42916649c1f77434 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 13 Sep 2023 02:10:36 +0000 Subject: [PATCH 11/14] Release 2023.09.12 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 388bf0622..328cb9e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.09.12 + + +### Updated + +- Update django-storages to 1.14 ([#4564](https://github.com/cookiecutter/cookiecutter-django/pull/4564)) + ## 2023.09.11 diff --git a/setup.py b/setup.py index 59d68a8c8..84e85cb74 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.11" +version = "2023.09.12" with open("README.md") as readme_file: long_description = readme_file.read() From fe45f20106e1d91cfe673decca169891e46c465b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 13 Sep 2023 13:09:31 -0500 Subject: [PATCH 12/14] Update sentry-sdk from 1.30.0 to 1.31.0 (#4582) --- {{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 5c53bf111..ecbb34799 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.9 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.30.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.31.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From d37a448485c4882bd1d0fda6022df9a928cf41b5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Sep 2023 02:09:46 +0000 Subject: [PATCH 13/14] Release 2023.09.13 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 328cb9e9a..c96ce4d56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.09.13 + + +### Updated + +- Update sentry-sdk to 1.31.0 ([#4582](https://github.com/cookiecutter/cookiecutter-django/pull/4582)) + ## 2023.09.12 diff --git a/setup.py b/setup.py index 84e85cb74..b41bc2773 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.12" +version = "2023.09.13" with open("README.md") as readme_file: long_description = readme_file.read() From 17f9c270d3719f77de9cb303fa1c09bf5236f6d4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 14 Sep 2023 05:58:53 -0500 Subject: [PATCH 14/14] Update sphinx to 7.2.6 (#4583) * Update sphinx from 7.2.5 to 7.2.6 * Update sphinx from 7.2.5 to 7.2.6 --- 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 0e96d112b..38a8385fd 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.2.5 +sphinx==7.2.6 sphinx-rtd-theme==1.3.0 myst-parser==2.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 349ddb423..af0520999 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.14.2 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.2.5 # https://github.com/sphinx-doc/sphinx +sphinx==7.2.6 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality