From c3c099095b3719da177af31e6a3dfe4650d3e8a3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 23 May 2024 13:39:28 -0700 Subject: [PATCH 001/233] Update ruff to 0.4.5 (#5086) * Update ruff from 0.4.4 to 0.4.5 * Update ruff from 0.4.4 to 0.4.5 --- 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 ef6329922..316178187 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.4 +ruff==0.4.5 django-upgrade==1.17.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 2e4423f30..990217ee0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.4 # https://github.com/astral-sh/ruff +ruff==0.4.5 # https://github.com/astral-sh/ruff coverage==7.5.1 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From b669566bc5aff2bfc468e3dfe4ebd1758ec764ba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 21:39:41 +0100 Subject: [PATCH 002/233] Auto-update pre-commit hooks (#5087) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 461dcf920..6e074087f 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.4 + rev: v0.4.5 hooks: # Linter - id: ruff From bdaa17ca07b61acd82620c523393a891d3ccc483 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 23 May 2024 13:41:12 -0700 Subject: [PATCH 003/233] Update sentry-sdk to 2.3.1 (#5091) --- {{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 6686bf982..8b79334d9 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.2.1 # https://github.com/getsentry/sentry-python +sentry-sdk==2.3.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From c319d929d1590873e3af4af19c077a6a0a13df40 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 24 May 2024 02:16:35 +0000 Subject: [PATCH 004/233] Release 2024.05.23 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8b61b563..8873c9a1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.05.23 + + +### Updated + +- Update sentry-sdk to 2.3.1 ([#5091](https://github.com/cookiecutter/cookiecutter-django/pull/5091)) + +- Auto-update pre-commit hooks ([#5087](https://github.com/cookiecutter/cookiecutter-django/pull/5087)) + +- Update ruff to 0.4.5 ([#5086](https://github.com/cookiecutter/cookiecutter-django/pull/5086)) + ## 2024.05.21 diff --git a/setup.py b/setup.py index 0b959a53a..d3a0f7fd0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.05.21" +version = "2024.05.23" with open("README.md") as readme_file: long_description = readme_file.read() From ba97c2a7195e3df18c0feeed2c549bc62c45cccd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 27 May 2024 06:39:49 -0700 Subject: [PATCH 005/233] Update django-debug-toolbar to 4.4.2 (#5098) --- {{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 990217ee0..3791125de 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,7 @@ pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==4.3.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==4.4.2 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.1.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.8.0 # https://github.com/pytest-dev/pytest-django From 6ed9e588b28f353bd2a40f94b4c2399e76d8d2e5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 27 May 2024 06:40:05 -0700 Subject: [PATCH 006/233] Update coverage to 7.5.2 (#5095) --- {{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 3791125de..95b3da27a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.4.5 # https://github.com/astral-sh/ruff -coverage==7.5.1 # https://github.com/nedbat/coveragepy +coverage==7.5.2 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 4bdc239e031ad8d4a0e9c01fd8b2a38ae4fc80df Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 27 May 2024 06:40:28 -0700 Subject: [PATCH 007/233] Update django-allauth to 0.63.2 (#5092) --- {{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 5cfa245c2..53efdaecc 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn[standard]==0.29.0 # https://github.com/encode/uvicorn django==4.2.13 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==0.63.1 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==0.63.2 # https://github.com/pennersr/django-allauth django-crispy-forms==2.1 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From a0c2e1f31f51faa17cb3654b124caee66d6e9931 Mon Sep 17 00:00:00 2001 From: Param Kapur Date: Mon, 27 May 2024 19:16:12 +0530 Subject: [PATCH 008/233] Rename SendInBlue ESP to Brevo (#5094) * Update cookiecutter.json with Brevo for SendInBlue * Change all occurrences of SendinBlue to Brevo --- README.md | 2 +- cookiecutter.json | 2 +- docs/project-generation-options.rst | 4 ++-- docs/settings.rst | 4 ++-- tests/test_cookiecutter_generation.py | 8 ++++---- .../.envs/.production/.django | 4 ++-- .../config/settings/production.py | 10 +++++----- .../requirements/production.txt | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 6263c599a..b73ecef9e 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re 4 - Mandrill 5 - Postmark 6 - Sendgrid - 7 - SendinBlue + 7 - Brevo (formerly SendinBlue) 8 - SparkPost 9 - Other SMTP Choose from 1, 2, 3, 4, 5, 6, 7, 8, 9 [1]: 1 diff --git a/cookiecutter.json b/cookiecutter.json index 4eeede9c0..86e44f368 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -27,7 +27,7 @@ "Mandrill", "Postmark", "Sendgrid", - "SendinBlue", + "Brevo", "SparkPost", "Other SMTP" ], diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index 23c8e9178..21059d3a2 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -91,7 +91,7 @@ mail_service: 4. Mandrill_ 5. Postmark_ 6. SendGrid_ - 7. SendinBlue_ + 7. `Brevo (formerly SendinBlue)`_ 8. SparkPost_ 9. `Other SMTP`_ @@ -174,7 +174,7 @@ debug: .. _Mandrill: http://mandrill.com .. _Postmark: https://postmarkapp.com .. _SendGrid: https://sendgrid.com -.. _SendinBlue: https://www.sendinblue.com +.. _Brevo (formerly SendinBlue): https://www.brevo.com .. _SparkPost: https://www.sparkpost.com .. _Other SMTP: https://anymail.readthedocs.io/en/stable/ diff --git a/docs/settings.rst b/docs/settings.rst index 0880bce95..2be79cbf5 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -69,8 +69,8 @@ SENDGRID_API_KEY SENDGRID_API_KEY n/a SENDGRID_GENERATE_MESSAGE_ID True n/a raises error SENDGRID_MERGE_FIELD_FORMAT None n/a raises error SENDGRID_API_URL n/a n/a "https://api.sendgrid.com/v3/" -SENDINBLUE_API_KEY SENDINBLUE_API_KEY n/a raises error -SENDINBLUE_API_URL n/a n/a "https://api.sendinblue.com/v3/" +BREVO_API_KEY BREVO_API_KEY n/a raises error +BREVO_API_URL n/a n/a "https://api.brevo.com/v3/" SPARKPOST_API_KEY SPARKPOST_API_KEY n/a raises error SPARKPOST_API_URL n/a n/a "https://api.sparkpost.com/api/v1" ======================================= =========================== ============================================== ====================================================================== diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 141ae4cc1..5a0bca383 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -73,7 +73,7 @@ SUPPORTED_COMBINATIONS = [ {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mandrill"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Postmark"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Sendgrid"}, - {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "SendinBlue"}, + {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Brevo"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "SparkPost"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Other SMTP"}, # Note: cloud_provider=None AND use_whitenoise=n is not supported @@ -83,7 +83,7 @@ SUPPORTED_COMBINATIONS = [ {"cloud_provider": "AWS", "mail_service": "Mandrill"}, {"cloud_provider": "AWS", "mail_service": "Postmark"}, {"cloud_provider": "AWS", "mail_service": "Sendgrid"}, - {"cloud_provider": "AWS", "mail_service": "SendinBlue"}, + {"cloud_provider": "AWS", "mail_service": "Brevo"}, {"cloud_provider": "AWS", "mail_service": "SparkPost"}, {"cloud_provider": "AWS", "mail_service": "Other SMTP"}, {"cloud_provider": "GCP", "mail_service": "Mailgun"}, @@ -91,7 +91,7 @@ SUPPORTED_COMBINATIONS = [ {"cloud_provider": "GCP", "mail_service": "Mandrill"}, {"cloud_provider": "GCP", "mail_service": "Postmark"}, {"cloud_provider": "GCP", "mail_service": "Sendgrid"}, - {"cloud_provider": "GCP", "mail_service": "SendinBlue"}, + {"cloud_provider": "GCP", "mail_service": "Brevo"}, {"cloud_provider": "GCP", "mail_service": "SparkPost"}, {"cloud_provider": "GCP", "mail_service": "Other SMTP"}, {"cloud_provider": "Azure", "mail_service": "Mailgun"}, @@ -99,7 +99,7 @@ SUPPORTED_COMBINATIONS = [ {"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": "Brevo"}, {"cloud_provider": "Azure", "mail_service": "SparkPost"}, {"cloud_provider": "Azure", "mail_service": "Other SMTP"}, # Note: cloud_providers GCP, Azure, and None diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django index ad652c9ad..07ffd7112 100644 --- a/{{cookiecutter.project_slug}}/.envs/.production/.django +++ b/{{cookiecutter.project_slug}}/.envs/.production/.django @@ -28,8 +28,8 @@ POSTMARK_SERVER_TOKEN= SENDGRID_API_KEY= SENDGRID_GENERATE_MESSAGE_ID=True SENDGRID_MERGE_FIELD_FORMAT=None -{% elif cookiecutter.mail_service == 'SendinBlue' %} -SENDINBLUE_API_KEY= +{% elif cookiecutter.mail_service == 'Brevo' %} +BREVO_API_KEY= {% elif cookiecutter.mail_service == 'SparkPost' %} SPARKPOST_API_KEY= {% endif %} diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 2f5f0be83..5a6cbdb1d 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -276,12 +276,12 @@ ANYMAIL = { "SENDGRID_API_KEY": env("SENDGRID_API_KEY"), "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"), } -{%- elif cookiecutter.mail_service == 'SendinBlue' %} -# https://anymail.readthedocs.io/en/stable/esps/sendinblue/ -EMAIL_BACKEND = "anymail.backends.sendinblue.EmailBackend" +{%- elif cookiecutter.mail_service == 'Brevo' %} +# https://anymail.readthedocs.io/en/stable/esps/brevo/ +EMAIL_BACKEND = "anymail.backends.brevo.EmailBackend" ANYMAIL = { - "SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"), - "SENDINBLUE_API_URL": env("SENDINBLUE_API_URL", default="https://api.sendinblue.com/v3/"), + "BREVO_API_KEY": env("BREVO_API_KEY"), + "BREVO_API_URL": env("BREVO_API_URL", default="https://api.brevo.com/v3/"), } {%- elif cookiecutter.mail_service == 'SparkPost' %} # https://anymail.readthedocs.io/en/stable/esps/sparkpost/ diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 8b79334d9..e07d83825 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -35,8 +35,8 @@ django-anymail[mandrill]==10.3 # https://github.com/anymail/django-anymail django-anymail[postmark]==10.3 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==10.3 # https://github.com/anymail/django-anymail -{%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==10.3 # https://github.com/anymail/django-anymail +{%- elif cookiecutter.mail_service == 'Brevo' %} +django-anymail[brevo]==10.3 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==10.3 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} From 3965c385b069e747582a1441f2f2c8b2f6c2ee29 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 27 May 2024 13:47:06 +0000 Subject: [PATCH 009/233] 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 97e997a9c..e8fa42667 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1578,5 +1578,10 @@ "name": "Nadav Peretz", "github_login": "nadavperetz", "twitter_username": "" + }, + { + "name": "Param Kapur", + "github_login": "paramkpr", + "twitter_username": "ParamKapur" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index fc444a5b3..ac5f596b5 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1692,6 +1692,13 @@ Listed in alphabetical order. pamelafox + + Param Kapur + + paramkpr + + ParamKapur + Parbhat Puri From 4849aeb7f8fd6ecc9b3b52150dc9f4e2849cd42f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 27 May 2024 06:55:17 -0700 Subject: [PATCH 010/233] Update watchfiles to 0.22.0 (#5099) --- {{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 95b3da27a..7bc7c4bdb 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg psycopg[binary]==3.1.19 # https://github.com/psycopg/psycopg {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.22.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From 779d51e60af783620c31db53d6f30dc39c1f56ba Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 27 May 2024 06:55:58 -0700 Subject: [PATCH 011/233] Update django-stubs to 5.0.2 (#5100) --- {{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 7bc7c4bdb..df234909b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.22.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy -django-stubs[compatible-mypy]==5.0.0 # https://github.com/typeddjango/django-stubs +django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs pytest==8.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 28e4ded0489adf6a234c36603b47df9a9b88a82e Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 28 May 2024 02:17:05 +0000 Subject: [PATCH 012/233] Release 2024.05.27 --- CHANGELOG.md | 19 +++++++++++++++++++ setup.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8873c9a1b..a76818302 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.05.27 + + +### Changed + +- Rename SendInBlue ESP to Brevo ([#5094](https://github.com/cookiecutter/cookiecutter-django/pull/5094)) + +### Updated + +- Update django-stubs to 5.0.2 ([#5100](https://github.com/cookiecutter/cookiecutter-django/pull/5100)) + +- Update watchfiles to 0.22.0 ([#5099](https://github.com/cookiecutter/cookiecutter-django/pull/5099)) + +- Update django-allauth to 0.63.2 ([#5092](https://github.com/cookiecutter/cookiecutter-django/pull/5092)) + +- Update coverage to 7.5.2 ([#5095](https://github.com/cookiecutter/cookiecutter-django/pull/5095)) + +- Update django-debug-toolbar to 4.4.2 ([#5098](https://github.com/cookiecutter/cookiecutter-django/pull/5098)) + ## 2024.05.23 diff --git a/setup.py b/setup.py index d3a0f7fd0..dfdbc330c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.05.23" +version = "2024.05.27" with open("README.md") as readme_file: long_description = readme_file.read() From efc388298053713b692a52ed8a15359cefc2c4b5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 28 May 2024 08:41:57 +0100 Subject: [PATCH 013/233] Update uvicorn from 0.29.0 to 0.30.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 53efdaecc..d70575444 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.29.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.0 # https://github.com/encode/uvicorn {%- endif %} # Django From 310b803f29623aa071432d814cf53a51706d0193 Mon Sep 17 00:00:00 2001 From: Alexandr Artemyev Date: Tue, 28 May 2024 14:10:33 +0500 Subject: [PATCH 014/233] Enhancing the security of cookies --- {{cookiecutter.project_slug}}/config/settings/production.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 5a6cbdb1d..a650d8315 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -55,8 +55,12 @@ SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https") SECURE_SSL_REDIRECT = env.bool("DJANGO_SECURE_SSL_REDIRECT", default=True) # https://docs.djangoproject.com/en/dev/ref/settings/#session-cookie-secure SESSION_COOKIE_SECURE = True +# https://docs.djangoproject.com/en/dev/ref/settings/#session-cookie-name +SESSION_COOKIE_NAME = "__Secure-sessionid" # https://docs.djangoproject.com/en/dev/ref/settings/#csrf-cookie-secure CSRF_COOKIE_SECURE = True +# https://docs.djangoproject.com/en/dev/ref/settings/#csrf-cookie-name +CSRF_COOKIE_NAME = "__Secure-csrftoken" # https://docs.djangoproject.com/en/dev/topics/security/#ssl-https # https://docs.djangoproject.com/en/dev/ref/settings/#secure-hsts-seconds # TODO: set this to 60 seconds first and then to 518400 once you prove the former works From 30a92f55af379fa20b6de73e645f265444e2dae5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 28 May 2024 18:05:32 -0700 Subject: [PATCH 015/233] Update django-upgrade from 1.17.0 to 1.18.0 (#5105) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 316178187..4db6a10ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ ruff==0.4.5 -django-upgrade==1.17.0 +django-upgrade==1.18.0 djlint==1.34.1 pre-commit==3.7.1 From 2aae512ef673f41eae836dcda0c668a92b091867 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 29 May 2024 00:23:32 -0700 Subject: [PATCH 016/233] Update coverage from 7.5.2 to 7.5.3 (#5104) --- {{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 df234909b..8e4615d66 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.4.5 # https://github.com/astral-sh/ruff -coverage==7.5.2 # https://github.com/nedbat/coveragepy +coverage==7.5.3 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 07e6282244557d2798aedbf3663aaeded7b8c2f9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 08:24:38 +0100 Subject: [PATCH 017/233] Auto-update pre-commit hooks (#5106) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 6e074087f..90d1b3ed5 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -28,14 +28,14 @@ repos: exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/adamchainz/django-upgrade - rev: '1.17.0' + rev: '1.18.0' hooks: - id: django-upgrade args: ['--target-version', '4.2'] # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.5 + rev: v0.4.6 hooks: # Linter - id: ruff From 0216ebb26856bb090b8f831dd06fdc4f2a5b0e4b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 29 May 2024 05:25:36 -0700 Subject: [PATCH 018/233] Update ruff to 0.4.6 (#5107) * Update ruff from 0.4.5 to 0.4.6 * Update ruff from 0.4.5 to 0.4.6 --------- Co-authored-by: Bruno Alla --- 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 4db6a10ee..05085b96e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.5 +ruff==0.4.6 django-upgrade==1.18.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 8e4615d66..449c7e939 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.5 # https://github.com/astral-sh/ruff +ruff==0.4.6 # https://github.com/astral-sh/ruff coverage==7.5.3 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 3dd83f47ff4bd77ea0b3bab111d1df4f52c772e7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 29 May 2024 11:20:48 -0700 Subject: [PATCH 019/233] Update requests from 2.32.2 to 2.32.3 (#5108) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 05085b96e..30793a712 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,4 @@ pyyaml==6.0.1 PyGithub==2.3.0 gitpython==3.1.43 jinja2==3.1.4 -requests==2.32.2 +requests==2.32.3 From 2d5712baf0792abc5c83f07954916d7ecdb920d8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 30 May 2024 02:17:05 +0000 Subject: [PATCH 020/233] Release 2024.05.29 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a76818302..8c5ccc031 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.05.29 + + +### Updated + +- Update requests to 2.32.3 ([#5108](https://github.com/cookiecutter/cookiecutter-django/pull/5108)) + +- Update ruff to 0.4.6 ([#5107](https://github.com/cookiecutter/cookiecutter-django/pull/5107)) + +- Auto-update pre-commit hooks ([#5106](https://github.com/cookiecutter/cookiecutter-django/pull/5106)) + +- Update coverage to 7.5.3 ([#5104](https://github.com/cookiecutter/cookiecutter-django/pull/5104)) + +- Update django-upgrade to 1.18.0 ([#5105](https://github.com/cookiecutter/cookiecutter-django/pull/5105)) + ## 2024.05.27 diff --git a/setup.py b/setup.py index dfdbc330c..49e644a9d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.05.27" +version = "2024.05.29" with open("README.md") as readme_file: long_description = readme_file.read() From fc5182591fccc80bb8f303095aee48a8cfa24695 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 31 May 2024 02:17:04 +0000 Subject: [PATCH 021/233] Release 2024.05.30 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c5ccc031..680a18935 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.05.30 + + +### Updated + +- Update uvicorn to 0.30.0 ([#5101](https://github.com/cookiecutter/cookiecutter-django/pull/5101)) + ## 2024.05.29 diff --git a/setup.py b/setup.py index 49e644a9d..b98443f0d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.05.29" +version = "2024.05.30" with open("README.md") as readme_file: long_description = readme_file.read() From 0cfd278da2338da5e398c84c2c8e5cda7c6ec71e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 1 Jun 2024 03:43:59 -0700 Subject: [PATCH 022/233] Update ruff to 0.4.7 (#5112) * Update ruff from 0.4.6 to 0.4.7 * Update ruff from 0.4.6 to 0.4.7 * Update Ruff pre-commit hook (#5113) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 30793a712..b2db470cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.6 +ruff==0.4.7 django-upgrade==1.18.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 90d1b3ed5..db3259b1c 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.6 + rev: v0.4.7 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 449c7e939..e57d81687 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.6 # https://github.com/astral-sh/ruff +ruff==0.4.7 # https://github.com/astral-sh/ruff coverage==7.5.3 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 3f38cfac5a140213bd70c1018725e04072137b46 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 2 Jun 2024 02:18:24 +0000 Subject: [PATCH 023/233] Release 2024.06.01 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 680a18935..e1e0cd60f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.01 + + +### Updated + +- Update ruff to 0.4.7 ([#5112](https://github.com/cookiecutter/cookiecutter-django/pull/5112)) + ## 2024.05.30 diff --git a/setup.py b/setup.py index b98443f0d..99e225653 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.05.30" +version = "2024.06.01" with open("README.md") as readme_file: long_description = readme_file.read() From 53394a6ac72f289ac9ef6499424fbacb099a96a2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 2 Jun 2024 12:00:08 -0700 Subject: [PATCH 024/233] Update uvicorn from 0.30.0 to 0.30.1 (#5115) --- {{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 d70575444..f9a2d9758 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.30.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.1 # https://github.com/encode/uvicorn {%- endif %} # Django From ed59d08ec31b05b672c05f2c8e24e263aa9c7402 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 3 Jun 2024 02:17:48 +0000 Subject: [PATCH 025/233] Release 2024.06.02 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1e0cd60f..d1b705479 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.02 + + +### Updated + +- Update uvicorn to 0.30.1 ([#5115](https://github.com/cookiecutter/cookiecutter-django/pull/5115)) + ## 2024.06.01 diff --git a/setup.py b/setup.py index 99e225653..7ca68d7e7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.01" +version = "2024.06.02" with open("README.md") as readme_file: long_description = readme_file.read() From 824630a9e921b6bdaeed8701dda764e9930b057c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 4 Jun 2024 11:02:11 +0100 Subject: [PATCH 026/233] Update sentry-sdk from 2.3.1 to 2.4.0 --- {{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 e07d83825..341c15767 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.3.1 # https://github.com/getsentry/sentry-python +sentry-sdk==2.4.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From 7216565cfa4a1c695a4fbf5881a0db46e2b4968d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 1 Jun 2024 18:04:38 +0100 Subject: [PATCH 027/233] Update sh from 2.0.6 to 2.0.7 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b2db470cd..a273d49c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==2.6.0 -sh==2.0.6; sys_platform != "win32" +sh==2.0.7; sys_platform != "win32" binaryornot==0.4.4 # Code quality From 75a8dae0dc27dfdc4d2a12d94b848da4b7bc1d45 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 4 Jun 2024 21:08:44 +0100 Subject: [PATCH 028/233] Update pytest from 8.2.1 to 8.2.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a273d49c9..6daed0069 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.7.1 # Testing # ------------------------------------------------------------------------------ tox==4.15.0 -pytest==8.2.1 +pytest==8.2.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 From 66e4d3d99a484d643215e8a27fd77703666112c7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 4 Jun 2024 21:08:45 +0100 Subject: [PATCH 029/233] Update pytest from 8.2.1 to 8.2.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 e57d81687..3a3ca0a5b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.22.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs -pytest==8.2.1 # https://github.com/pytest-dev/pytest +pytest==8.2.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs From f2880ab5d5cb844c34f12611739cfb93aecc8029 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Jun 2024 02:17:11 +0000 Subject: [PATCH 030/233] Release 2024.06.04 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1b705479..0cacabc7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.04 + + +### Updated + +- Update pytest to 8.2.2 ([#5120](https://github.com/cookiecutter/cookiecutter-django/pull/5120)) + +- Update sh to 2.0.7 ([#5114](https://github.com/cookiecutter/cookiecutter-django/pull/5114)) + +- Update sentry-sdk to 2.4.0 ([#5119](https://github.com/cookiecutter/cookiecutter-django/pull/5119)) + ## 2024.06.02 diff --git a/setup.py b/setup.py index 7ca68d7e7..e3e24df51 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.02" +version = "2024.06.04" with open("README.md") as readme_file: long_description = readme_file.read() From e3adc3561fb9c36527c887f17f144218f06b7f3d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 6 Jun 2024 04:13:08 -0700 Subject: [PATCH 031/233] Update tox to 4.15.1 (#5124) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6daed0069..e46050ec2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.7.1 # Testing # ------------------------------------------------------------------------------ -tox==4.15.0 +tox==4.15.1 pytest==8.2.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From 1e1255c966a139543c1f20dcf324aa1d4715a034 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 6 Jun 2024 04:13:27 -0700 Subject: [PATCH 032/233] Update redis to 5.0.5 (#5125) --- {{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 f9a2d9758..e12c0a70e 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.6.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==5.0.4 # https://github.com/redis/redis-py +redis==5.0.5 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py {%- endif %} From 690b1ad327aaee0d0460c1594d569fe5c4945155 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 6 Jun 2024 04:47:52 -0700 Subject: [PATCH 033/233] Update ruff to 0.4.8 (#5122) * Update ruff from 0.4.7 to 0.4.8 * Update ruff from 0.4.7 to 0.4.8 * Update Ruff pre-commit hook (#5123) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index e46050ec2..b2d8690c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.7 +ruff==0.4.8 django-upgrade==1.18.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index db3259b1c..871e01014 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.7 + rev: v0.4.8 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 3a3ca0a5b..bad8f4002 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.7 # https://github.com/astral-sh/ruff +ruff==0.4.8 # https://github.com/astral-sh/ruff coverage==7.5.3 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 33c36f17cd82e8b2ebd354df79e5d30240c1efbf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 6 Jun 2024 07:27:42 -0700 Subject: [PATCH 034/233] Update sentry-sdk to 2.5.0 (#5126) --- {{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 341c15767..f6f27308f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.4.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.5.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From db38d8b00f057430744bf6c7a487208d939517b1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 7 Jun 2024 02:17:56 +0000 Subject: [PATCH 035/233] Release 2024.06.06 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cacabc7a..2f1dbf549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.06 + + +### Updated + +- Update sentry-sdk to 2.5.0 ([#5126](https://github.com/cookiecutter/cookiecutter-django/pull/5126)) + +- Update ruff to 0.4.8 ([#5122](https://github.com/cookiecutter/cookiecutter-django/pull/5122)) + +- Update redis to 5.0.5 ([#5125](https://github.com/cookiecutter/cookiecutter-django/pull/5125)) + ## 2024.06.04 diff --git a/setup.py b/setup.py index e3e24df51..02de5da46 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.04" +version = "2024.06.06" with open("README.md") as readme_file: long_description = readme_file.read() From b6656379af0fc757e3bc98d60f6ecd40feafa998 Mon Sep 17 00:00:00 2001 From: Jason Mok <106209849+jasonmokk@users.noreply.github.com> Date: Sat, 8 Jun 2024 09:56:02 -0400 Subject: [PATCH 036/233] Replace deprecated `uvicorn.workers` with `uvicorn-worker` (#5110) * chore: Replace deprecated uvicorn.workers with uvicorn-worker * Add package and fix worker class name --------- Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/Procfile | 2 +- {{cookiecutter.project_slug}}/compose/production/django/start | 2 +- {{cookiecutter.project_slug}}/gulpfile.js | 2 +- {{cookiecutter.project_slug}}/requirements/base.txt | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile index 2f2fbe927..6424e048d 100644 --- a/{{cookiecutter.project_slug}}/Procfile +++ b/{{cookiecutter.project_slug}}/Procfile @@ -1,6 +1,6 @@ release: python manage.py migrate {%- if cookiecutter.use_async == "y" %} -web: gunicorn config.asgi:application -k uvicorn.workers.UvicornWorker +web: gunicorn config.asgi:application -k uvicorn_worker.UvicornWorker {%- else %} web: gunicorn config.wsgi:application {%- endif %} diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start index 73f686bd7..38fc29b55 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' %} -exec /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_worker.UvicornWorker {%- else %} exec /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app {%- endif %} diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js index df434c134..ee6e70282 100644 --- a/{{cookiecutter.project_slug}}/gulpfile.js +++ b/{{cookiecutter.project_slug}}/gulpfile.js @@ -106,7 +106,7 @@ function imgCompression() { function asyncRunServer() { const cmd = spawn( 'gunicorn', - ['config.asgi', '-k', 'uvicorn.workers.UvicornWorker', '--reload'], + ['config.asgi', '-k', 'uvicorn_worker.UvicornWorker', '--reload'], {stdio: 'inherit'}, ); cmd.on('close', function (code) { diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e12c0a70e..4e89b9453 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,6 +24,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- if cookiecutter.use_async == 'y' %} uvicorn[standard]==0.30.1 # https://github.com/encode/uvicorn +uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} # Django From ad632484fd16f936c8266f44b77e9ebfc2179ecd Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 8 Jun 2024 13:56:36 +0000 Subject: [PATCH 037/233] 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 e8fa42667..c26021e7a 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1583,5 +1583,10 @@ "name": "Param Kapur", "github_login": "paramkpr", "twitter_username": "ParamKapur" + }, + { + "name": "Jason Mok", + "github_login": "jasonmokk", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ac5f596b5..2885fc4ca 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1118,6 +1118,13 @@ Listed in alphabetical order. + + Jason Mok + + jasonmokk + + + Jens Kaeske From eec17f7c57a50bcf96deeedbb0fa1c208031de3f Mon Sep 17 00:00:00 2001 From: Manas Mallick <34524570+ManDun@users.noreply.github.com> Date: Sun, 9 Jun 2024 00:12:33 +1000 Subject: [PATCH 038/233] Change aws-cli docker image to use official amazon image (#5116) --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index 36eea7f8c..be01056d7 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/garland/aws-cli-docker:1.16.140 +FROM docker.io/amazon/aws-cli:2.15.58 COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From f6bf52173ed574dd769a732729231473e07096de Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 8 Jun 2024 14:13:10 +0000 Subject: [PATCH 039/233] 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 c26021e7a..9a2ae24f9 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1588,5 +1588,10 @@ "name": "Jason Mok", "github_login": "jasonmokk", "twitter_username": "" + }, + { + "name": "Manas Mallick", + "github_login": "ManDun", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 2885fc4ca..2e894f387 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1405,6 +1405,13 @@ Listed in alphabetical order. flyudvik + + Manas Mallick + + ManDun + + + Manjit Pardeshi From cbe4532af580a859da3ee0e154a6fb49607fef12 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 9 Jun 2024 02:19:34 +0000 Subject: [PATCH 040/233] Release 2024.06.08 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f1dbf549..39a1e2e80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.08 + + +### Changed + +- Replace deprecated `uvicorn.workers` with `uvicorn-worker` ([#5110](https://github.com/cookiecutter/cookiecutter-django/pull/5110)) + +- Change aws-cli docker image to use official amazon image ([#5116](https://github.com/cookiecutter/cookiecutter-django/pull/5116)) + ## 2024.06.06 diff --git a/setup.py b/setup.py index 02de5da46..4cc0bf346 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.06" +version = "2024.06.08" with open("README.md") as readme_file: long_description = readme_file.read() From 8969cf60abc5c112be6ef7557b6e602091f82adb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 9 Jun 2024 11:00:16 +0100 Subject: [PATCH 041/233] Auto-update pre-commit hooks (#5128) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 985e519db..c81f51ec0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.15.2 + rev: v3.16.0 hooks: - id: pyupgrade args: [--py312-plus] From d3ce7925b2be40784168f840bb30cb373a5fe81c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:45:22 +0100 Subject: [PATCH 042/233] Bump amazon/aws-cli Docker image from 2.15.58 to 2.16.6 (#5135) Bumps amazon/aws-cli from 2.15.58 to 2.16.6. --- updated-dependencies: - dependency-name: amazon/aws-cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index be01056d7..a7fe8c6bb 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/amazon/aws-cli:2.15.58 +FROM docker.io/amazon/aws-cli:2.16.6 COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From c1ca194e4f3a1f826a71a85084bd6a34adbfd59d Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 13 Jun 2024 02:17:40 +0000 Subject: [PATCH 043/233] Release 2024.06.12 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39a1e2e80..d9a37307b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.12 + + +### Updated + +- Bump amazon/aws-cli Docker image from 2.15.58 to 2.16.6 ([#5135](https://github.com/cookiecutter/cookiecutter-django/pull/5135)) + ## 2024.06.08 diff --git a/setup.py b/setup.py index 4cc0bf346..c7adeb651 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.08" +version = "2024.06.12" with open("README.md") as readme_file: long_description = readme_file.read() From a0ae1945b598c492b66de9a5a034dafff0ea0915 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 13 Jun 2024 11:49:51 -0700 Subject: [PATCH 044/233] Update redis from 5.0.5 to 5.0.6 (#5137) --- {{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 4e89b9453..4163ad9bb 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.6.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==5.0.5 # https://github.com/redis/redis-py +redis==5.0.6 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py {%- endif %} From 4b94cde8870c2fb1581d73fdfda856c692b766f1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 14 Jun 2024 02:17:54 +0000 Subject: [PATCH 045/233] Release 2024.06.13 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9a37307b..bca8ad36c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.13 + + +### Updated + +- Update redis to 5.0.6 ([#5137](https://github.com/cookiecutter/cookiecutter-django/pull/5137)) + ## 2024.06.12 diff --git a/setup.py b/setup.py index c7adeb651..055395824 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.12" +version = "2024.06.13" with open("README.md") as readme_file: long_description = readme_file.read() From 07c125d940c3412d189e2cef8af0994072336d12 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 Jun 2024 16:42:05 +0100 Subject: [PATCH 046/233] Update ruff from 0.4.8 to 0.4.9 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b2d8690c0..cd8a823f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.8 +ruff==0.4.9 django-upgrade==1.18.0 djlint==1.34.1 pre-commit==3.7.1 From bde8236e9a5d952dba9a52a12e54f86d1a0b99d5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 Jun 2024 16:42:05 +0100 Subject: [PATCH 047/233] Update ruff from 0.4.8 to 0.4.9 --- {{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 bad8f4002..96814cd31 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.8 # https://github.com/astral-sh/ruff +ruff==0.4.9 # https://github.com/astral-sh/ruff coverage==7.5.3 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 453ea25b1d62820e16739ccaf11335e9883e1cf6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 05:41:54 +0000 Subject: [PATCH 048/233] Bump amazon/aws-cli Bumps amazon/aws-cli from 2.16.6 to 2.16.8. --- updated-dependencies: - dependency-name: amazon/aws-cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index a7fe8c6bb..687c6d5cf 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/amazon/aws-cli:2.16.6 +FROM docker.io/amazon/aws-cli:2.16.8 COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From ed0857f7b3f672a259001cf0d855f3b9029c3530 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 05:36:04 +0000 Subject: [PATCH 049/233] Bump python in /{{cookiecutter.project_slug}}/compose/production/django Bumps python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../compose/production/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 671eb4635..ab83fcd8f 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -25,7 +25,7 @@ RUN npm run build {%- endif %} # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.3-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm as python # Python build stage FROM python as python-build-stage From c11d5519d6cb034b1a42b998a0577e0052343dbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 05:22:44 +0000 Subject: [PATCH 050/233] Bump python in /{{cookiecutter.project_slug}}/compose/local/django Bumps python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 88ccb7491..b085d990c 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.3-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm as python # Python build stage FROM python as python-build-stage From 03e68e893f0c169f398f88e8a14d14cf8742e140 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 05:05:04 +0000 Subject: [PATCH 051/233] Bump python in /{{cookiecutter.project_slug}}/compose/local/docs Bumps python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{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 35565042d..0fadd009b 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.3-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm as python # Python build stage From 80674b017e16ab105f7b4b1da6ac6439510ea18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Fri, 14 Jun 2024 17:26:01 -0300 Subject: [PATCH 052/233] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 23ca7a37f..5d7d9f9ca 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,5 +1,5 @@ # These are supported funding model platforms -github: [pydanny, browniebroke] +github: [pydanny, browniebroke, luzfcb] patreon: feldroy open_collective: cookiecutter-django From 987bee4573ea5e021754aa5c6964616d95464349 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 15 Jun 2024 02:17:13 +0000 Subject: [PATCH 053/233] Release 2024.06.14 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bca8ad36c..c0dd776d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.14 + + +### Updated + +- Bump python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm in /{{cookiecutter.project_slug}}/compose/local/docs ([#5129](https://github.com/cookiecutter/cookiecutter-django/pull/5129)) + +- Bump python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm in /{{cookiecutter.project_slug}}/compose/local/django ([#5130](https://github.com/cookiecutter/cookiecutter-django/pull/5130)) + +- Bump python from 3.12.3-slim-bookworm to 3.12.4-slim-bookworm in /{{cookiecutter.project_slug}}/compose/production/django ([#5132](https://github.com/cookiecutter/cookiecutter-django/pull/5132)) + +- Bump amazon/aws-cli from 2.16.6 to 2.16.8 in /{{cookiecutter.project_slug}}/compose/production/aws ([#5138](https://github.com/cookiecutter/cookiecutter-django/pull/5138)) + +- Update ruff to 0.4.9 ([#5139](https://github.com/cookiecutter/cookiecutter-django/pull/5139)) + ## 2024.06.13 diff --git a/setup.py b/setup.py index 055395824..65982cb81 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.13" +version = "2024.06.14" with open("README.md") as readme_file: long_description = readme_file.read() From f6b9fa370802afe1ec6d9852a73dbf6f794ba1e1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 15 Jun 2024 15:46:42 -0700 Subject: [PATCH 054/233] Update django-allauth from 0.63.2 to 0.63.3 (#5111) --- {{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 4163ad9bb..8fd928a65 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==4.2.13 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==0.63.2 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==0.63.3 # https://github.com/pennersr/django-allauth django-crispy-forms==2.1 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From c4f7b09cf3f4dc9dc9a6c982728938ce3c983ce6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Jun 2024 23:46:57 +0100 Subject: [PATCH 055/233] Auto-update pre-commit hooks (#5140) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 871e01014..e9629f6da 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.8 + rev: v0.4.9 hooks: # Linter - id: ruff From f9a4d864db51ad7f4a8b168f9f78ab24364a4eca Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 15 Jun 2024 15:48:02 -0700 Subject: [PATCH 056/233] Update sentry-sdk from 2.5.0 to 2.5.1 (#5142) --- {{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 f6f27308f..9a742a16a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.5.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.5.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From c3335e6604d8f34272b293b72795485f7c17e733 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 15 Jun 2024 22:54:26 +0000 Subject: [PATCH 057/233] 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 9a2ae24f9..2e40624f4 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1593,5 +1593,10 @@ "name": "Manas Mallick", "github_login": "ManDun", "twitter_username": "" + }, + { + "name": "Alexandr Artemyev", + "github_login": "Mogost", + "twitter_username": "MOGOST" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 2e894f387..520f6423d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -215,6 +215,13 @@ Listed in alphabetical order. + + Alexandr Artemyev + + Mogost + + MOGOST + Alvaro [Andor] From 401ffd0e860ecd72789b7f685998a4dfad088388 Mon Sep 17 00:00:00 2001 From: Arnav Choudhury Date: Sun, 16 Jun 2024 04:25:43 +0530 Subject: [PATCH 058/233] Update start-flower in flower to wait until all celery workers are online (#5012) Flower needs to start only after the celery workers come online. Otherwise one will see errors like `inspect method failed` etc --- .../compose/local/django/celery/flower/start | 8 ++++++++ .../compose/production/django/celery/flower/start | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index b4783d2f0..cebb62203 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -3,6 +3,14 @@ set -o errexit set -o nounset + +until timeout 10 celery -A config.celery_app inspect ping; do + >&2 echo "Celery workers not available" +done + +echo 'Starting flower' + + exec watchfiles --filter python 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/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start index 4180d6778..f903a05a2 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start @@ -4,6 +4,14 @@ set -o errexit set -o nounset + +until timeout 10 celery -A config.celery_app inspect ping; do + >&2 echo "Celery workers not available" +done + +echo 'Starting flower' + + exec celery \ -A config.celery_app \ -b "${CELERY_BROKER_URL}" \ From a2e364b5c1440e025c3b67138c06aca0621dc1b6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 15 Jun 2024 15:57:21 -0700 Subject: [PATCH 059/233] Update django-crispy-forms from 2.1 to 2.2 (#5143) --- {{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 8fd928a65..c81952198 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -33,7 +33,7 @@ django==4.2.13 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==0.63.3 # https://github.com/pennersr/django-allauth -django-crispy-forms==2.1 # https://github.com/django-crispy-forms/django-crispy-forms +django-crispy-forms==2.2 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} django-compressor==4.4 # https://github.com/django-compressor/django-compressor From d40623b3821ab6b533ad19d66723a083e2445050 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 16 Jun 2024 02:19:35 +0000 Subject: [PATCH 060/233] Release 2024.06.15 --- CHANGELOG.md | 19 +++++++++++++++++++ setup.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0dd776d7..6d2e5371e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.15 + + +### Changed + +- Update start-flower in flower to wait until all celery workers are online ([#5012](https://github.com/cookiecutter/cookiecutter-django/pull/5012)) + +- Enhancing the security of cookies ([#5102](https://github.com/cookiecutter/cookiecutter-django/pull/5102)) + +### Updated + +- Update django-crispy-forms to 2.2 ([#5143](https://github.com/cookiecutter/cookiecutter-django/pull/5143)) + +- Update sentry-sdk to 2.5.1 ([#5142](https://github.com/cookiecutter/cookiecutter-django/pull/5142)) + +- Auto-update pre-commit hooks ([#5140](https://github.com/cookiecutter/cookiecutter-django/pull/5140)) + +- Update django-allauth to 0.63.3 ([#5111](https://github.com/cookiecutter/cookiecutter-django/pull/5111)) + ## 2024.06.14 diff --git a/setup.py b/setup.py index 65982cb81..e240446f8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.14" +version = "2024.06.15" with open("README.md") as readme_file: long_description = readme_file.read() From 16652acaf1bcd9a4142e84a406135342c66316af Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 17 Jun 2024 01:17:45 -0700 Subject: [PATCH 061/233] Update django-compressor to 4.5 (#5145) * Update django-compressor from 4.4 to 4.5 * Update rcssmin to 1.1.2 (#4614) --- {{cookiecutter.project_slug}}/requirements/base.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index c81952198..62a7d45c6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -2,9 +2,9 @@ python-slugify==8.0.4 # https://github.com/un33k/python-slugify Pillow==10.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 +rcssmin==1.1.2 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin {%- else %} -rcssmin==1.1.1 # https://github.com/ndparker/rcssmin +rcssmin==1.1.2 # https://github.com/ndparker/rcssmin {%- endif %} {%- endif %} argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi @@ -36,7 +36,7 @@ django-allauth[mfa]==0.63.3 # https://github.com/pennersr/django-allauth django-crispy-forms==2.2 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} -django-compressor==4.4 # https://github.com/django-compressor/django-compressor +django-compressor==4.5 # https://github.com/django-compressor/django-compressor {%- endif %} django-redis==5.4.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} From 0b95d16aaa7099701e94f4ec011e9ff4a6f6fd08 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:21:47 +0100 Subject: [PATCH 062/233] Update flake8 pre-commit hook in template (#5144) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c81f51ec0..acf7676ec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 7.0.0 + rev: 7.1.0 hooks: - id: flake8 From 1e260740c26ff90e17f0dd20f7a9c2934b5ad28b Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 18 Jun 2024 02:17:54 +0000 Subject: [PATCH 063/233] Release 2024.06.17 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d2e5371e..2d49fceeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.17 + + +### Updated + +- Update django-compressor to 4.5 ([#5145](https://github.com/cookiecutter/cookiecutter-django/pull/5145)) + +- Update rcssmin to 1.1.2 ([#4614](https://github.com/cookiecutter/cookiecutter-django/pull/4614)) + ## 2024.06.15 diff --git a/setup.py b/setup.py index e240446f8..1d45d2f7b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.15" +version = "2024.06.17" with open("README.md") as readme_file: long_description = readme_file.read() From cc41c0b80483c21513a23805fee3733e9dac5402 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:30:00 +0100 Subject: [PATCH 064/233] Bump amazon/aws-cli from 2.16.8 to 2.16.10 (#5149) Bumps amazon/aws-cli from 2.16.8 to 2.16.10. --- updated-dependencies: - dependency-name: amazon/aws-cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index 687c6d5cf..7629654c1 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/amazon/aws-cli:2.16.8 +FROM docker.io/amazon/aws-cli:2.16.10 COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From e03d9a6854dea9f89f7e3e355f7dd81265916830 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Jun 2024 02:18:13 +0000 Subject: [PATCH 065/233] Release 2024.06.18 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d49fceeb..f1c2eeb06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.18 + + +### Updated + +- Bump amazon/aws-cli from 2.16.8 to 2.16.10 ([#5149](https://github.com/cookiecutter/cookiecutter-django/pull/5149)) + ## 2024.06.17 diff --git a/setup.py b/setup.py index 1d45d2f7b..2864f579b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.17" +version = "2024.06.18" with open("README.md") as readme_file: long_description = readme_file.read() From 875022864acb053caa14fc2eb1bf9be56f606779 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Jun 2024 14:42:34 -0700 Subject: [PATCH 066/233] Update whitenoise from 6.6.0 to 6.7.0 (#5155) --- {{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 62a7d45c6..a3f47e83a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -9,7 +9,7 @@ rcssmin==1.1.2 # https://github.com/ndparker/rcssmin {%- endif %} argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} -whitenoise==6.6.0 # https://github.com/evansd/whitenoise +whitenoise==6.7.0 # https://github.com/evansd/whitenoise {%- endif %} redis==5.0.6 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From daa858225fa95128ac64f4d901951586a467d557 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Jun 2024 14:42:50 -0700 Subject: [PATCH 067/233] Update sentry-sdk from 2.5.1 to 2.6.0 (#5153) --- {{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 9a742a16a..94950710c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.5.1 # https://github.com/getsentry/sentry-python +sentry-sdk==2.6.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From f9b30c7bc8cd93e1fe8f707c0cad97167a37bd8a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Jun 2024 14:43:31 -0700 Subject: [PATCH 068/233] Update django-cors-headers from 4.3.1 to 4.4.0 (#5154) --- {{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 a3f47e83a..846467518 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -42,7 +42,7 @@ django-redis==5.4.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework djangorestframework==3.15.1 # https://github.com/encode/django-rest-framework -django-cors-headers==4.3.1 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==4.4.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation drf-spectacular==0.27.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} From ef34d668da8b92cf5c3ac0d2b63b587989b9c473 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Jun 2024 14:53:00 -0700 Subject: [PATCH 069/233] Update djangorestframework from 3.15.1 to 3.15.2 (#5156) --- {{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 846467518..fdaba406b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,7 +41,7 @@ django-compressor==4.5 # https://github.com/django-compressor/django-compressor django-redis==5.4.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework -djangorestframework==3.15.1 # https://github.com/encode/django-rest-framework +djangorestframework==3.15.2 # https://github.com/encode/django-rest-framework django-cors-headers==4.4.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation drf-spectacular==0.27.2 # https://github.com/tfranzel/drf-spectacular From e71dd7c1fd8e6063f908365a8b9eb33623ad1a80 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 20 Jun 2024 02:21:59 +0000 Subject: [PATCH 070/233] Release 2024.06.19 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1c2eeb06..7cddd69a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.19 + + +### Updated + +- Update djangorestframework to 3.15.2 ([#5156](https://github.com/cookiecutter/cookiecutter-django/pull/5156)) + +- Update django-cors-headers to 4.4.0 ([#5154](https://github.com/cookiecutter/cookiecutter-django/pull/5154)) + +- Update sentry-sdk to 2.6.0 ([#5153](https://github.com/cookiecutter/cookiecutter-django/pull/5153)) + +- Update whitenoise to 6.7.0 ([#5155](https://github.com/cookiecutter/cookiecutter-django/pull/5155)) + ## 2024.06.18 diff --git a/setup.py b/setup.py index 2864f579b..12cb866a4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.18" +version = "2024.06.19" with open("README.md") as readme_file: long_description = readme_file.read() From 9f64012987cc28cadcfa33e024a88333dded682a Mon Sep 17 00:00:00 2001 From: jelmert Date: Thu, 20 Jun 2024 08:46:29 +0200 Subject: [PATCH 071/233] Gitlab tags docker & python are removed from runner --- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 41eea0db4..71216bc7a 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -28,8 +28,6 @@ pytest: stage: test {%- if cookiecutter.use_docker == 'y' %} image: docker:25.0 - tags: - - docker services: - docker:dind before_script: @@ -42,8 +40,6 @@ pytest: - docker compose -f docker-compose.local.yml run django pytest {%- else %} image: python:3.12 - tags: - - python services: - postgres:{{ cookiecutter.postgresql_version }} variables: From 85c601459730201cc0db1e209df80128c2d655d8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 21 Jun 2024 02:17:16 +0000 Subject: [PATCH 072/233] Release 2024.06.20 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cddd69a1..2b27960c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.20 + + +### Fixed + +- Remove deprecated docker and python tags from GitLab CI config ([#5158](https://github.com/cookiecutter/cookiecutter-django/pull/5158)) + ## 2024.06.19 diff --git a/setup.py b/setup.py index 12cb866a4..91ab02ec2 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.19" +version = "2024.06.20" with open("README.md") as readme_file: long_description = readme_file.read() From a4f2206741a53b49060bc7286705d2d68ed6cd29 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 22 Jun 2024 04:20:34 -0700 Subject: [PATCH 073/233] Update ruff to 0.4.10 (#5159) * Update ruff from 0.4.9 to 0.4.10 * Update ruff from 0.4.9 to 0.4.10 --- 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 cd8a823f8..176d26f52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.9 +ruff==0.4.10 django-upgrade==1.18.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 96814cd31..e3356f22f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.9 # https://github.com/astral-sh/ruff +ruff==0.4.10 # https://github.com/astral-sh/ruff coverage==7.5.3 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 3257b3d2700d9005e7525458e7f456ecb06e7313 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 12:20:50 +0100 Subject: [PATCH 074/233] Auto-update pre-commit hooks (#5160) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index e9629f6da..a57923584 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.9 + rev: v0.4.10 hooks: # Linter - id: ruff From bacd17bb08a2a8f5f0bec595a191e74c2a1cfeb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 12:22:37 +0100 Subject: [PATCH 075/233] Bump amazon/aws-cli from 2.16.10 to 2.17.0 in /{{cookiecutter.project_slug}}/compose/production/aws (#5161) Bumps amazon/aws-cli from 2.16.10 to 2.17.0. --- updated-dependencies: - dependency-name: amazon/aws-cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index 7629654c1..22cfdf29f 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/amazon/aws-cli:2.16.10 +FROM docker.io/amazon/aws-cli:2.17.0 COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From 29705080b99fbaf94a589edd60988cf3fb6dc8d9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 23 Jun 2024 02:18:51 +0000 Subject: [PATCH 076/233] Release 2024.06.22 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b27960c1..29f70a9dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.22 + + +### Updated + +- Bump amazon/aws-cli from 2.16.10 to 2.17.0 ([#5161](https://github.com/cookiecutter/cookiecutter-django/pull/5161)) + +- Auto-update pre-commit hooks ([#5160](https://github.com/cookiecutter/cookiecutter-django/pull/5160)) + +- Update ruff to 0.4.10 ([#5159](https://github.com/cookiecutter/cookiecutter-django/pull/5159)) + ## 2024.06.20 diff --git a/setup.py b/setup.py index 91ab02ec2..8a0646db8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.20" +version = "2024.06.22" with open("README.md") as readme_file: long_description = readme_file.read() From b6aa5b1535c88a2fa231e8d1d606081211c143c8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 24 Jun 2024 03:36:43 -0700 Subject: [PATCH 077/233] Update coverage from 7.5.3 to 7.5.4 (#5162) --- {{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 e3356f22f..5a47824a9 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.4.10 # https://github.com/astral-sh/ruff -coverage==7.5.3 # https://github.com/nedbat/coveragepy +coverage==7.5.4 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 315724b797d0150cf0e869fce3963d74fd167545 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 24 Jun 2024 03:42:37 -0700 Subject: [PATCH 078/233] Update django-anymail to 11.0 (#5163) --- .../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 94950710c..1c2d8b054 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,21 +24,21 @@ django-storages[google]==1.14.3 # https://github.com/jschneier/django-storages django-storages[azure]==1.14.3 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==10.3 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon-ses]==10.3 # https://github.com/anymail/django-anymail +django-anymail[amazon-ses]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==10.3 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==10.3 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==10.3 # https://github.com/anymail/django-anymail +django-anymail[postmark]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==10.3 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} -django-anymail[brevo]==10.3 # https://github.com/anymail/django-anymail +django-anymail[brevo]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==10.3 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==10.3 # https://github.com/anymail/django-anymail +django-anymail==11.0 # https://github.com/anymail/django-anymail {%- endif %} From bcfbb7b7124e9874d9b70af54315c0ebf4dd7231 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 25 Jun 2024 02:17:52 +0000 Subject: [PATCH 079/233] Release 2024.06.24 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29f70a9dd..a318bacdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.24 + + +### Updated + +- Update django-anymail to 11.0 ([#5163](https://github.com/cookiecutter/cookiecutter-django/pull/5163)) + +- Update coverage to 7.5.4 ([#5162](https://github.com/cookiecutter/cookiecutter-django/pull/5162)) + ## 2024.06.22 diff --git a/setup.py b/setup.py index 8a0646db8..06af356f9 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.22" +version = "2024.06.24" with open("README.md") as readme_file: long_description = readme_file.read() From 8e319a21db5503c57974782c86822002da60ac2b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 26 Jun 2024 13:02:16 +0100 Subject: [PATCH 080/233] Update sentry-sdk from 2.6.0 to 2.7.0 --- {{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 1c2d8b054..d513bd164 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.6.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.7.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From 1f82072d5bd1de9f7af71fe881a6f00a779d4ae5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 24 Jun 2024 12:35:27 +0200 Subject: [PATCH 081/233] Fix keywords case warning in Dockerfile Recently noticed the following warning in my Docker builds: > WARN: FromAsCasing: 'as' and 'FROM' keywords' casing do not match I don't think it's causing any harm, apart perhaps some small noise in the logs. --- .../compose/local/django/Dockerfile | 6 +++--- .../compose/local/docs/Dockerfile | 6 +++--- .../compose/production/django/Dockerfile | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index b085d990c..26a21c938 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,8 +1,8 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm AS python # Python build stage -FROM python as python-build-stage +FROM python AS python-build-stage ARG BUILD_ENVIRONMENT=local @@ -22,7 +22,7 @@ RUN pip wheel --wheel-dir /usr/src/app/wheels \ # Python 'run' stage -FROM python as python-run-stage +FROM python AS python-run-stage ARG BUILD_ENVIRONMENT=local ARG APP_HOME=/app diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 0fadd009b..54e209886 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,9 +1,9 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm AS python # Python build stage -FROM python as python-build-stage +FROM python AS python-build-stage ENV PYTHONDONTWRITEBYTECODE 1 @@ -26,7 +26,7 @@ RUN pip wheel --no-cache-dir --wheel-dir /usr/src/app/wheels \ # Python 'run' stage -FROM python as python-run-stage +FROM python AS python-run-stage ARG BUILD_ENVIRONMENT ENV PYTHONUNBUFFERED 1 diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index ab83fcd8f..ee3b9994a 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -1,5 +1,5 @@ {% if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] -%} -FROM docker.io/node:20-bookworm-slim as client-builder +FROM docker.io/node:20-bookworm-slim AS client-builder ARG APP_HOME=/app WORKDIR ${APP_HOME} @@ -25,10 +25,10 @@ RUN npm run build {%- endif %} # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm as python +FROM docker.io/python:3.12.4-slim-bookworm AS python # Python build stage -FROM python as python-build-stage +FROM python AS python-build-stage ARG BUILD_ENVIRONMENT=production @@ -48,7 +48,7 @@ RUN pip wheel --wheel-dir /usr/src/app/wheels \ # Python 'run' stage -FROM python as python-run-stage +FROM python AS python-run-stage ARG BUILD_ENVIRONMENT=production ARG APP_HOME=/app From c7a4b9bb45a199cbd7265f7af69bdd4450623152 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 26 Jun 2024 15:22:47 +0100 Subject: [PATCH 082/233] Update redis from 5.0.6 to 5.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 fdaba406b..54cf692e0 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.7.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==5.0.6 # https://github.com/redis/redis-py +redis==5.0.7 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py {%- endif %} From 9757b1739e90b03adb1d4702a8220be914345cb2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Jun 2024 02:17:42 +0000 Subject: [PATCH 083/233] Release 2024.06.26 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a318bacdc..3cb7db80f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.26 + + +### Fixed + +- Fix keywords case warning in Dockerfile ([#5164](https://github.com/cookiecutter/cookiecutter-django/pull/5164)) + +### Updated + +- Update redis to 5.0.7 ([#5170](https://github.com/cookiecutter/cookiecutter-django/pull/5170)) + +- Update sentry-sdk to 2.7.0 ([#5169](https://github.com/cookiecutter/cookiecutter-django/pull/5169)) + ## 2024.06.24 diff --git a/setup.py b/setup.py index 06af356f9..329f04861 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.24" +version = "2024.06.26" with open("README.md") as readme_file: long_description = readme_file.read() From 0f7aed4f27ae8fe8a0019308e3ae88e7e2c828ec Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 30 Jun 2024 09:50:12 -0700 Subject: [PATCH 084/233] Update django-upgrade to 1.19.0 (#5171) * Update django-upgrade from 1.18.0 to 1.19.0 * Update django-upgrade pre-commit hook --------- Co-authored-by: Bruno Alla --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 176d26f52..91d1d77ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ ruff==0.4.10 -django-upgrade==1.18.0 +django-upgrade==1.19.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index a57923584..50bd36b55 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/adamchainz/django-upgrade - rev: '1.18.0' + rev: '1.19.0' hooks: - id: django-upgrade args: ['--target-version', '4.2'] From b200d44885f9a9fed454ed2db987932886b8cddd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 1 Jul 2024 02:22:00 +0000 Subject: [PATCH 085/233] Release 2024.06.30 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cb7db80f..72089e5af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.06.30 + + +### Updated + +- Update django-upgrade to 1.19.0 ([#5171](https://github.com/cookiecutter/cookiecutter-django/pull/5171)) + ## 2024.06.26 diff --git a/setup.py b/setup.py index 329f04861..70cbf2981 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.26" +version = "2024.06.30" with open("README.md") as readme_file: long_description = readme_file.read() From 899886fa2a619390290c90e708a048d67976ad28 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 1 Jul 2024 03:50:24 -0700 Subject: [PATCH 086/233] Update psycopg to 3.2.1 (#5180) * Update psycopg from 3.1.19 to 3.2.1 * Update psycopg from 3.1.19 to 3.2.1 * Update psycopg from 3.1.19 to 3.2.1 --- {{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 5a47824a9..7c24bc6c1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,9 +3,9 @@ Werkzeug[watchdog]==3.0.3 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg +psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg {%- else %} -psycopg[binary]==3.1.19 # https://github.com/psycopg/psycopg +psycopg[binary]==3.2.1 # https://github.com/psycopg/psycopg {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchfiles==0.22.0 # https://github.com/samuelcolvin/watchfiles diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index d513bd164..2186bf001 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==22.0.0 # https://github.com/benoitc/gunicorn -psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg +psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From 0e7ca033456be470dfb317f08ac6f26212c292c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 11:51:29 +0100 Subject: [PATCH 087/233] Auto-update pre-commit hooks (#5175) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 50bd36b55..ad6c57d9f 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.10 + rev: v0.5.0 hooks: # Linter - id: ruff From 2d18e673a3dc9b5e4758d2e55458e42ce6f12b6c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 1 Jul 2024 03:51:53 -0700 Subject: [PATCH 088/233] Update sentry-sdk to 2.7.1 (#5174) --- {{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 2186bf001..500a1890d 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.7.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.7.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From edbdefb0a7703afda8accdc2f8914ed53900272f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 1 Jul 2024 04:07:16 -0700 Subject: [PATCH 089/233] Update ruff to 0.5.0 (#5181) --- 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 91d1d77ea..c6cc4bf93 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.10 +ruff==0.5.0 django-upgrade==1.19.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7c24bc6c1..ae0f32eb0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.4.10 # https://github.com/astral-sh/ruff +ruff==0.5.0 # https://github.com/astral-sh/ruff coverage==7.5.4 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 29027487fa98e9ad7d2e3f97ff1b00be330484a9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 2 Jul 2024 02:18:05 +0000 Subject: [PATCH 090/233] Release 2024.07.01 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72089e5af..31f3f5b9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.01 + + +### Updated + +- Update ruff to 0.5.0 ([#5181](https://github.com/cookiecutter/cookiecutter-django/pull/5181)) + +- Update sentry-sdk to 2.7.1 ([#5174](https://github.com/cookiecutter/cookiecutter-django/pull/5174)) + +- Auto-update pre-commit hooks ([#5175](https://github.com/cookiecutter/cookiecutter-django/pull/5175)) + +- Update psycopg to 3.2.1 ([#5180](https://github.com/cookiecutter/cookiecutter-django/pull/5180)) + ## 2024.06.30 diff --git a/setup.py b/setup.py index 70cbf2981..aab16448c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.06.30" +version = "2024.07.01" with open("README.md") as readme_file: long_description = readme_file.read() From de2239ab2f32afce62dc78c9eb15f0c3b28e6021 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 2 Jul 2024 07:32:48 -0700 Subject: [PATCH 091/233] Update pillow to 10.4.0 (#5182) --- {{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 54cf692e0..e2258adfe 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ python-slugify==8.0.4 # https://github.com/un33k/python-slugify -Pillow==10.3.0 # https://github.com/python-pillow/Pillow +Pillow==10.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.2 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From ae64eef2ee7e4d6fb22fc91b24594fb4dadc3b89 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 3 Jul 2024 02:17:41 +0000 Subject: [PATCH 092/233] Release 2024.07.02 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31f3f5b9e..acc545e13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.02 + + +### Updated + +- Update pillow to 10.4.0 ([#5182](https://github.com/cookiecutter/cookiecutter-django/pull/5182)) + ## 2024.07.01 diff --git a/setup.py b/setup.py index aab16448c..806d24cda 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.01" +version = "2024.07.02" with open("README.md") as readme_file: long_description = readme_file.read() From b65afbce8c6df98891980d010585cb0e64220c51 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 2 Jul 2024 23:35:43 -0700 Subject: [PATCH 093/233] Update tox from 4.15.1 to 4.16.0 (#5186) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c6cc4bf93..28c391e8d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.7.1 # Testing # ------------------------------------------------------------------------------ -tox==4.15.1 +tox==4.16.0 pytest==8.2.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From 20bae48753c9da770bee4a285184973148712596 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 5 Jul 2024 05:57:00 -0700 Subject: [PATCH 094/233] Update django-debug-toolbar to 4.4.3 (#5189) --- {{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 ae0f32eb0..bb8ca639b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,7 @@ pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==4.4.2 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==4.4.3 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.1.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.8.0 # https://github.com/pytest-dev/pytest-django From fef5476742c5cfead56ddbf4caca0a3f432ade76 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 6 Jul 2024 02:16:54 +0000 Subject: [PATCH 095/233] Release 2024.07.05 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acc545e13..5e2291094 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.05 + + +### Updated + +- Update django-debug-toolbar to 4.4.3 ([#5189](https://github.com/cookiecutter/cookiecutter-django/pull/5189)) + ## 2024.07.02 diff --git a/setup.py b/setup.py index 806d24cda..282bc844f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.02" +version = "2024.07.05" with open("README.md") as readme_file: long_description = readme_file.read() From 888d48728ee4844e6670ba81b9e733d0cc18f02b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 8 Jul 2024 08:48:31 -0700 Subject: [PATCH 096/233] Update sentry-sdk to 2.8.0 (#5195) --- {{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 500a1890d..a8cf3642f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.7.1 # https://github.com/getsentry/sentry-python +sentry-sdk==2.8.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From a0c6867722bcade4641b25b597455789c5bfef92 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 8 Jul 2024 08:48:47 -0700 Subject: [PATCH 097/233] Update django-debug-toolbar to 4.4.5 (#5192) --- {{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 bb8ca639b..6ce5e7fcf 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,7 @@ pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==4.4.3 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==4.4.5 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.1.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.8.0 # https://github.com/pytest-dev/pytest-django From abd00d18ae87f4c42a675f7c34e39ab8d0e21d67 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 8 Jul 2024 09:39:44 -0700 Subject: [PATCH 098/233] Update ruff to 0.5.1 (#5190) * Update ruff from 0.5.0 to 0.5.1 * Update ruff from 0.5.0 to 0.5.1 * Auto-update ruff pre-commit hook (#5194) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Bruno Alla --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 28c391e8d..eebfd96a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.0 +ruff==0.5.1 django-upgrade==1.19.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index ad6c57d9f..e4e79d67d 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.0 + rev: v0.5.1 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6ce5e7fcf..e7270d8ad 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.0 # https://github.com/astral-sh/ruff +ruff==0.5.1 # https://github.com/astral-sh/ruff coverage==7.5.4 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From c3e1983ef1e572b1a8f7a9e38c9ede3b80d6fca1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 9 Jul 2024 02:18:52 +0000 Subject: [PATCH 099/233] Release 2024.07.08 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e2291094..67ba9da93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.08 + + +### Updated + +- Update ruff to 0.5.1 ([#5190](https://github.com/cookiecutter/cookiecutter-django/pull/5190)) + +- Update django-debug-toolbar to 4.4.5 ([#5192](https://github.com/cookiecutter/cookiecutter-django/pull/5192)) + +- Update sentry-sdk to 2.8.0 ([#5195](https://github.com/cookiecutter/cookiecutter-django/pull/5195)) + ## 2024.07.05 diff --git a/setup.py b/setup.py index 282bc844f..ba4961c37 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.05" +version = "2024.07.08" with open("README.md") as readme_file: long_description = readme_file.read() From e716be4d36f4c0d88ed78839bd84cf9e6a3dca4f Mon Sep 17 00:00:00 2001 From: Ali Shamakhi Date: Tue, 9 Jul 2024 11:13:57 +0330 Subject: [PATCH 100/233] Fix a typo in the option --all of the makemessages command (#5198) --- {{cookiecutter.project_slug}}/locale/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/locale/README.md b/{{cookiecutter.project_slug}}/locale/README.md index 8971441a0..7cb6876ad 100644 --- a/{{cookiecutter.project_slug}}/locale/README.md +++ b/{{cookiecutter.project_slug}}/locale/README.md @@ -3,7 +3,7 @@ Start by configuring the `LANGUAGES` settings in `base.py`, by uncommenting languages you are willing to support. Then, translations strings will be placed in this folder when running: ```bash -{% if cookiecutter.use_docker == 'y' %}docker compose -f docker-compose.local.yml run --rm django {% endif %}python manage.py makemessages -all --no-location +{% if cookiecutter.use_docker == 'y' %}docker compose -f docker-compose.local.yml run --rm django {% endif %}python manage.py makemessages --all --no-location ``` This should generate `django.po` (stands for Portable Object) files under each locale `/LC_MESSAGES/django.po`. Each translatable string in the codebase is collected with its `msgid` and need to be translated as `msgstr`, for example: From 3463d8ad172252dd1e94b6729db03ac33498211b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 9 Jul 2024 07:44:37 +0000 Subject: [PATCH 101/233] 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 2e40624f4..ad6f162d2 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1598,5 +1598,10 @@ "name": "Alexandr Artemyev", "github_login": "Mogost", "twitter_username": "MOGOST" + }, + { + "name": "Ali Shamakhi", + "github_login": "ali-shamakhi", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 520f6423d..fac85d9e4 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -222,6 +222,13 @@ Listed in alphabetical order. MOGOST + + Ali Shamakhi + + ali-shamakhi + + + Alvaro [Andor] From bac56c4a7f2e864489d37c7761ce4835e6238aa6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 9 Jul 2024 00:45:08 -0700 Subject: [PATCH 102/233] Update django-storages to 1.14.4 (#5197) * Update django-storages from 1.14.3 to 1.14.4 * Update django-storages from 1.14.3 to 1.14.4 * Update django-storages from 1.14.3 to 1.14.4 --- {{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 a8cf3642f..efee352fc 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,11 +17,11 @@ hiredis==2.3.2 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[s3]==1.14.3 # https://github.com/jschneier/django-storages +django-storages[s3]==1.14.4 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.14.3 # https://github.com/jschneier/django-storages +django-storages[google]==1.14.4 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'Azure' %} -django-storages[azure]==1.14.3 # https://github.com/jschneier/django-storages +django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==11.0 # https://github.com/anymail/django-anymail From 8cf31c93176e06e21741c74c02495d6c814f893d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 9 Jul 2024 09:11:15 +0100 Subject: [PATCH 103/233] Migrate from Collectfast to Collestfasta (#5172) --- .../config/settings/production.py | 10 +++++----- .../requirements/production.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index a650d8315..706d04e0a 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -198,13 +198,13 @@ STORAGES = { {%- if cookiecutter.cloud_provider == 'AWS' %} MEDIA_URL = f"https://{aws_s3_domain}/media/" {%- if cookiecutter.use_whitenoise == 'n' %} -COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy" +COLLECTFASTA_STRATEGY = "collectfasta.strategies.boto3.Boto3Strategy" STATIC_URL = f"https://{aws_s3_domain}/static/" {%- endif %} {%- elif cookiecutter.cloud_provider == 'GCP' %} MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/" {%- if cookiecutter.use_whitenoise == 'n' %} -COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy" +COLLECTFASTA_STRATEGY = "collectfasta.strategies.gcloud.GoogleCloudStrategy" STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/" {%- endif %} {%- elif cookiecutter.cloud_provider == 'Azure' %} @@ -329,10 +329,10 @@ COMPRESS_FILTERS = { } {% endif %} {%- if cookiecutter.use_whitenoise == 'n' -%} -# Collectfast +# Collectfasta # ------------------------------------------------------------------------------ -# https://github.com/antonagestam/collectfast#installation -INSTALLED_APPS = ["collectfast", *INSTALLED_APPS] +# https://github.com/jasongi/collectfasta#installation +INSTALLED_APPS = ["collectfasta", *INSTALLED_APPS] {% endif %} # LOGGING # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index efee352fc..afe39311c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -5,7 +5,7 @@ gunicorn==22.0.0 # https://github.com/benoitc/gunicorn psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg {%- if cookiecutter.use_whitenoise == 'n' %} -Collectfast==2.2.0 # https://github.com/antonagestam/collectfast +Collectfasta==3.1.3 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} sentry-sdk==2.8.0 # https://github.com/getsentry/sentry-python From 889d8e07326039fcf23ee62212dee9468315fa48 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 Jul 2024 02:18:28 +0000 Subject: [PATCH 104/233] Release 2024.07.09 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67ba9da93..df39390b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.09 + + +### Changed + +- Migrate from Collectfast to Collestfasta ([#5172](https://github.com/cookiecutter/cookiecutter-django/pull/5172)) + +### Documentation + +- Fix a typo in the `--all` option of the `makemessages` command ([#5198](https://github.com/cookiecutter/cookiecutter-django/pull/5198)) + +### Updated + +- Update django-storages to 1.14.4 ([#5197](https://github.com/cookiecutter/cookiecutter-django/pull/5197)) + ## 2024.07.08 diff --git a/setup.py b/setup.py index ba4961c37..27c85a80a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.08" +version = "2024.07.09" with open("README.md") as readme_file: long_description = readme_file.read() From 9631c0a81724ff966a7935eeb5c5a595eb86f3c2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 10 Jul 2024 09:51:31 -0700 Subject: [PATCH 105/233] Update django-debug-toolbar to 4.4.6 (#5203) --- {{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 e7270d8ad..a4785e5ba 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,7 @@ pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==4.4.5 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==4.4.6 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.1.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.8.0 # https://github.com/pytest-dev/pytest-django From 96a5a2d1dd467a8289eb0190397078e13992429d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 10 Jul 2024 09:51:47 -0700 Subject: [PATCH 106/233] Update sentry-sdk to 2.9.0 (#5202) --- {{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 afe39311c..5cdac5b7a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfasta==3.1.3 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.8.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.9.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From 2fbceaf6c3d861d39d1d51f392fdcd1915b86d58 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 10 Jul 2024 09:52:05 -0700 Subject: [PATCH 107/233] Update collectfasta to 3.2.0 (#5201) --- {{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 5cdac5b7a..99058bfae 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -5,7 +5,7 @@ gunicorn==22.0.0 # https://github.com/benoitc/gunicorn psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg {%- if cookiecutter.use_whitenoise == 'n' %} -Collectfasta==3.1.3 # https://github.com/jasongi/collectfasta +Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} sentry-sdk==2.9.0 # https://github.com/getsentry/sentry-python From 0dd5c6ee38bd6c57c2bfe8cd59b81534019c4fcf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 9 Jul 2024 18:30:39 +0100 Subject: [PATCH 108/233] Update django from 4.2.13 to 4.2.14 --- {{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 e2258adfe..b52a06512 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==4.2.13 # pyup: < 5.0 # https://www.djangoproject.com/ +django==4.2.14 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==0.63.3 # https://github.com/pennersr/django-allauth From d5198dc40b312799ccd56622a29a3f5b0da9b448 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 00:48:24 +0100 Subject: [PATCH 109/233] Update django-allauth from 0.63.3 to 0.63.4 --- {{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 b52a06512..5545feed9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==4.2.14 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==0.63.3 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==0.63.4 # https://github.com/pennersr/django-allauth django-crispy-forms==2.2 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 7cbc7e920ed74a642c85406b3bb662adbfd96244 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 11 Jul 2024 02:19:40 +0000 Subject: [PATCH 110/233] Release 2024.07.10 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df39390b9..d573e415f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.10 + + +### Updated + +- Update django-allauth to 0.63.4 ([#5204](https://github.com/cookiecutter/cookiecutter-django/pull/5204)) + +- Update django to 4.2.14 ([#5200](https://github.com/cookiecutter/cookiecutter-django/pull/5200)) + +- Update collectfasta to 3.2.0 ([#5201](https://github.com/cookiecutter/cookiecutter-django/pull/5201)) + +- Update sentry-sdk to 2.9.0 ([#5202](https://github.com/cookiecutter/cookiecutter-django/pull/5202)) + +- Update django-debug-toolbar to 4.4.6 ([#5203](https://github.com/cookiecutter/cookiecutter-django/pull/5203)) + ## 2024.07.09 diff --git a/setup.py b/setup.py index 27c85a80a..e9af6cf4f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.09" +version = "2024.07.10" with open("README.md") as readme_file: long_description = readme_file.read() From e6336a29f048f09ad4944ea9800c9cbb4e40da1f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:00 +0100 Subject: [PATCH 111/233] Update django-anymail from 11.0 to 11.0.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 99058bfae..4b1f9aeab 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ django-storages[google]==1.14.4 # https://github.com/jschneier/django-storages django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==11.0 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon-ses]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} From 78593239eeee5de98baa4b0e43bd39a213c2b986 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:00 +0100 Subject: [PATCH 112/233] Update django-anymail from 11.0 to 11.0.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 4b1f9aeab..0d7d42099 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -26,7 +26,7 @@ django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon-ses]==11.0 # https://github.com/anymail/django-anymail +django-anymail[amazon-ses]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} From 3156e2a5605b0cde9f80c8a23414f5381401fcfb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:01 +0100 Subject: [PATCH 113/233] Update django-anymail from 11.0 to 11.0.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 0d7d42099..bd4342d7e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -28,7 +28,7 @@ django-anymail[mailgun]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon-ses]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==11.0 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} From ef433d1a17b1158620f35f5f089f1b075cd9dda3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:02 +0100 Subject: [PATCH 114/233] Update django-anymail from 11.0 to 11.0.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 bd4342d7e..9756264a8 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -30,7 +30,7 @@ django-anymail[amazon-ses]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==11.0 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} From 6754a2ec04d5e5c5920b180eb7a210dcd538f167 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:02 +0100 Subject: [PATCH 115/233] Update django-anymail from 11.0 to 11.0.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 9756264a8..b49e1fe6c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -32,7 +32,7 @@ django-anymail[mailjet]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==11.0 # https://github.com/anymail/django-anymail +django-anymail[postmark]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} From cc67304d9ca7b84d437e3fa062998301c026d627 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:03 +0100 Subject: [PATCH 116/233] Update django-anymail from 11.0 to 11.0.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 b49e1fe6c..a8c3f28bc 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -34,7 +34,7 @@ django-anymail[mandrill]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==11.0 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} django-anymail[brevo]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} From 45c4429154d46a65c057b8f4fd21ea29bbb38251 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:03 +0100 Subject: [PATCH 117/233] Update django-anymail from 11.0 to 11.0.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 a8c3f28bc..3258e2291 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -36,7 +36,7 @@ django-anymail[postmark]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} -django-anymail[brevo]==11.0 # https://github.com/anymail/django-anymail +django-anymail[brevo]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==11.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} From ae03ac4702e4d25d794572d2909e414ab0ea7991 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:04 +0100 Subject: [PATCH 118/233] Update django-anymail from 11.0 to 11.0.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 3258e2291..48c8f0d40 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -38,7 +38,7 @@ django-anymail[sendgrid]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} django-anymail[brevo]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==11.0 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} django-anymail==11.0 # https://github.com/anymail/django-anymail {%- endif %} From d389302b6daa4bd66dc2cd362b1f36f986af9f39 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 22:39:04 +0100 Subject: [PATCH 119/233] Update django-anymail from 11.0 to 11.0.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 48c8f0d40..70c61dee2 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -40,5 +40,5 @@ django-anymail[brevo]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==11.0 # https://github.com/anymail/django-anymail +django-anymail==11.0.1 # https://github.com/anymail/django-anymail {%- endif %} From 00bac8eb68788dd453b33f132e68d6374d360898 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 19:28:42 +0100 Subject: [PATCH 120/233] Update coverage from 7.5.4 to 7.6.0 --- {{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 a4785e5ba..b3a75f782 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.5.1 # https://github.com/astral-sh/ruff -coverage==7.5.4 # https://github.com/nedbat/coveragepy +coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 4e39cd2d51307e64b0e4fb3721742580129818c3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 11 Jul 2024 14:48:22 +0100 Subject: [PATCH 121/233] Update django-allauth from 0.63.4 to 0.63.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 5545feed9..fda6cbb9d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==4.2.14 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==0.63.4 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==0.63.5 # https://github.com/pennersr/django-allauth django-crispy-forms==2.2 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From c662c4d6156b8d903e5abe167f053a7e5e52d820 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 12 Jul 2024 22:48:17 +0100 Subject: [PATCH 122/233] Update django-allauth from 0.63.5 to 0.63.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 fda6cbb9d..65b49facc 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==4.2.14 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==0.63.5 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth django-crispy-forms==2.2 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From a319c8284efa0fa25df08ed668b3e3c2d55b1252 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 13 Jul 2024 02:18:05 +0000 Subject: [PATCH 123/233] Release 2024.07.12 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d573e415f..c454f4e65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.12 + + +### Updated + +- Update django-allauth to 0.63.6 ([#5210](https://github.com/cookiecutter/cookiecutter-django/pull/5210)) + +- Update django-allauth to 0.63.5 ([#5206](https://github.com/cookiecutter/cookiecutter-django/pull/5206)) + +- Update coverage to 7.6.0 ([#5207](https://github.com/cookiecutter/cookiecutter-django/pull/5207)) + +- Update django-anymail to 11.0.1 ([#5208](https://github.com/cookiecutter/cookiecutter-django/pull/5208)) + ## 2024.07.10 diff --git a/setup.py b/setup.py index e9af6cf4f..1d3732b6c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.10" +version = "2024.07.12" with open("README.md") as readme_file: long_description = readme_file.read() From 722e2bc4d579a7739057ec2ccaa7b843426bb7fc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 Jul 2024 02:46:00 -0700 Subject: [PATCH 124/233] Update sphinx to 7.4.0 (#5214) * Update sphinx from 7.3.7 to 7.4.0 * Update sphinx from 7.3.7 to 7.4.0 --- 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 26cb8da1b..8518b5e70 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.3.7 +sphinx==7.4.0 sphinx-rtd-theme==2.0.0 myst-parser==3.0.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b3a75f782..decabe69e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.3.7 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 5ba14a2d2c34858607e58e10346d29423c45a040 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 Jul 2024 02:54:04 -0700 Subject: [PATCH 125/233] Update ruff to 0.5.2 (#5211) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index eebfd96a1..000d1cf36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.1 +ruff==0.5.2 django-upgrade==1.19.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index e4e79d67d..956ca8d00 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.1 + rev: v0.5.2 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index decabe69e..91b0da1e1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.1 # https://github.com/astral-sh/ruff +ruff==0.5.2 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From bf76313bdf08130c20ae74bedb391240b66b9b83 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 15 Jul 2024 13:02:38 +0100 Subject: [PATCH 126/233] Update sphinx from 7.4.0 to 7.4.2 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 8518b5e70..6dbf7892f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.4.0 +sphinx==7.4.2 sphinx-rtd-theme==2.0.0 myst-parser==3.0.1 From 057fb75a450344b759513611a9c5fcd54c7fc1c5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 15 Jul 2024 13:02:39 +0100 Subject: [PATCH 127/233] Update sphinx from 7.4.0 to 7.4.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 91b0da1e1..e9d04387d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.4.0 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.2 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 32eb1b2e8cf7a19cb7e6d0f9ba9c52f6c4e2ad52 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 15 Jul 2024 13:02:42 +0100 Subject: [PATCH 128/233] Update sentry-sdk from 2.9.0 to 2.10.0 --- {{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 70c61dee2..5fa14841c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.9.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.10.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.3.2 # https://github.com/redis/hiredis-py From e260a5da7e99297ab98e322f62949b496c182aca Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 16 Jul 2024 02:19:21 +0000 Subject: [PATCH 129/233] Release 2024.07.15 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c454f4e65..38634ff31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.15 + + +### Updated + +- Update sentry-sdk to 2.10.0 ([#5216](https://github.com/cookiecutter/cookiecutter-django/pull/5216)) + +- Update sphinx to 7.4.2 ([#5215](https://github.com/cookiecutter/cookiecutter-django/pull/5215)) + +- Update ruff to 0.5.2 ([#5211](https://github.com/cookiecutter/cookiecutter-django/pull/5211)) + +- Update sphinx to 7.4.0 ([#5214](https://github.com/cookiecutter/cookiecutter-django/pull/5214)) + ## 2024.07.12 diff --git a/setup.py b/setup.py index 1d3732b6c..fdb6a2358 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.12" +version = "2024.07.15" with open("README.md") as readme_file: long_description = readme_file.read() From 24439329743e3efc1feabe4962187b15114bf6a6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 16 Jul 2024 02:14:56 -0700 Subject: [PATCH 130/233] Update sphinx to 7.4.4 (#5218) * Update sphinx from 7.4.2 to 7.4.4 * Update sphinx from 7.4.2 to 7.4.4 --- 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 6dbf7892f..da6cb8419 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.4.2 +sphinx==7.4.4 sphinx-rtd-theme==2.0.0 myst-parser==3.0.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e9d04387d..843b26bed 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.4.2 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.4 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 634b091756a6e8e2731b8cd610299972f716c89c Mon Sep 17 00:00:00 2001 From: hleroy Date: Tue, 16 Jul 2024 15:57:40 +0200 Subject: [PATCH 131/233] Clear `ENTRYPOINT` in `awscli` image to allow script execution (#5221) * Fix: clear ENTRYPOINT in derived image to allow script execution * Added explanation regarding clearing ENTRYPOINT from the base image Co-authored-by: Bruno Alla --------- Co-authored-by: Bruno Alla --- .../compose/production/aws/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index 22cfdf29f..9c7b8a69a 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -1,5 +1,8 @@ FROM docker.io/amazon/aws-cli:2.17.0 +# Clear entrypoint from the base image, otherwise it's always calling the aws CLI +ENTRYPOINT [] + COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From f669e101a0936eee8ca8b5c46e7c38fa4ca93d6e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 17 Jul 2024 01:31:11 +0100 Subject: [PATCH 132/233] Update sphinx from 7.4.4 to 7.4.5 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index da6cb8419..d4b0420de 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.4.4 +sphinx==7.4.5 sphinx-rtd-theme==2.0.0 myst-parser==3.0.1 From bd82fe72f837cebfc9f39775d8a748a44ea4e2ac Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 17 Jul 2024 01:31:12 +0100 Subject: [PATCH 133/233] Update sphinx from 7.4.4 to 7.4.5 --- {{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 843b26bed..6c418272b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.4.4 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.5 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality From dcaf6741de857427efc68454e71ea16379f3ccb8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 17 Jul 2024 02:19:01 +0000 Subject: [PATCH 134/233] Release 2024.07.16 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38634ff31..63bc51b34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.16 + + +### Fixed + +- Clear `ENTRYPOINT` in `awscli` image to allow script execution ([#5221](https://github.com/cookiecutter/cookiecutter-django/pull/5221)) + +### Updated + +- Update sphinx to 7.4.4 ([#5218](https://github.com/cookiecutter/cookiecutter-django/pull/5218)) + ## 2024.07.15 diff --git a/setup.py b/setup.py index fdb6a2358..1b1a86e7a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.15" +version = "2024.07.16" with open("README.md") as readme_file: long_description = readme_file.read() From 0834ba6870ca564e65a64c6edf25b71603f845e3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 18 Jul 2024 02:18:30 +0000 Subject: [PATCH 135/233] Release 2024.07.17 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63bc51b34..df51251bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.17 + + +### Updated + +- Update sphinx to 7.4.5 ([#5222](https://github.com/cookiecutter/cookiecutter-django/pull/5222)) + ## 2024.07.16 diff --git a/setup.py b/setup.py index 1b1a86e7a..312da1c83 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.16" +version = "2024.07.17" with open("README.md") as readme_file: long_description = readme_file.read() From 7082e66db36297a406c321dd93693531c638d493 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 18 Jul 2024 09:50:15 -0700 Subject: [PATCH 136/233] Update sphinx to 7.4.6 (#5223) * Update sphinx from 7.4.5 to 7.4.6 * Update sphinx from 7.4.5 to 7.4.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 d4b0420de..e1bc625ff 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.4.5 +sphinx==7.4.6 sphinx-rtd-theme==2.0.0 myst-parser==3.0.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6c418272b..06065fa12 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.4.5 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.6 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality From e16eed7f1b8b8688dd894b51819a383c5c0e3245 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 19 Jul 2024 02:18:50 +0000 Subject: [PATCH 137/233] Release 2024.07.18 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df51251bb..843244210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.18 + + +### Updated + +- Update sphinx to 7.4.6 ([#5223](https://github.com/cookiecutter/cookiecutter-django/pull/5223)) + ## 2024.07.17 diff --git a/setup.py b/setup.py index 312da1c83..edeeadfbd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.17" +version = "2024.07.18" with open("README.md") as readme_file: long_description = readme_file.read() From e68d93598712347775bf1ce1b481d117b1ef79d7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 19 Jul 2024 01:52:29 -0700 Subject: [PATCH 138/233] Update ruff to 0.5.3 (#5224) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 000d1cf36..f0e7f7b9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.2 +ruff==0.5.3 django-upgrade==1.19.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 956ca8d00..0c79e7234 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.2 + rev: v0.5.3 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 06065fa12..4fb93fb4b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.2 # https://github.com/astral-sh/ruff +ruff==0.5.3 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From cb103ce28d684b81d5efbf0b36d9b526c137b001 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Thu, 18 Jul 2024 17:07:44 -0300 Subject: [PATCH 139/233] Use "ENV key=value" instead of "ENV key value" in Dockerfiles The old syntax for ENV and LABEL is marked as deprecated in docker buildx v0.14.0 https://docs.docker.com/reference/build-checks/legacy-key-value-format/ https://github.com/moby/buildkit/pull/4923 --- .../compose/local/django/Dockerfile | 6 +++--- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 6 +++--- {{cookiecutter.project_slug}}/compose/local/node/Dockerfile | 2 +- .../compose/production/django/Dockerfile | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 26a21c938..1183ae984 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -27,9 +27,9 @@ FROM python AS python-run-stage ARG BUILD_ENVIRONMENT=local ARG APP_HOME=/app -ENV PYTHONUNBUFFERED 1 -ENV PYTHONDONTWRITEBYTECODE 1 -ENV BUILD_ENV ${BUILD_ENVIRONMENT} +ENV PYTHONUNBUFFERED=1 +ENV PYTHONDONTWRITEBYTECODE=1 +ENV BUILD_ENV=${BUILD_ENVIRONMENT} WORKDIR ${APP_HOME} diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 54e209886..cdc002fe0 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -5,7 +5,7 @@ FROM docker.io/python:3.12.4-slim-bookworm AS python # Python build stage FROM python AS python-build-stage -ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONDONTWRITEBYTECODE=1 RUN apt-get update && apt-get install --no-install-recommends -y \ # dependencies for building Python packages @@ -29,8 +29,8 @@ RUN pip wheel --no-cache-dir --wheel-dir /usr/src/app/wheels \ FROM python AS python-run-stage ARG BUILD_ENVIRONMENT -ENV PYTHONUNBUFFERED 1 -ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED=1 +ENV PYTHONDONTWRITEBYTECODE=1 RUN apt-get update && apt-get install --no-install-recommends -y \ # To run the Makefile diff --git a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile index 0848ecaf8..438e3fa08 100644 --- a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile @@ -6,4 +6,4 @@ COPY ./package.json /app RUN npm install && npm cache clean --force -ENV PATH ./node_modules/.bin/:$PATH +ENV PATH=./node_modules/.bin/:$PATH diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index ee3b9994a..6279908a9 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -53,9 +53,9 @@ FROM python AS python-run-stage ARG BUILD_ENVIRONMENT=production ARG APP_HOME=/app -ENV PYTHONUNBUFFERED 1 -ENV PYTHONDONTWRITEBYTECODE 1 -ENV BUILD_ENV ${BUILD_ENVIRONMENT} +ENV PYTHONUNBUFFERED=1 +ENV PYTHONDONTWRITEBYTECODE=1 +ENV BUILD_ENV=${BUILD_ENVIRONMENT} WORKDIR ${APP_HOME} From ab081ee4715f68316721056b314cdde3991d3eab Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 19 Jul 2024 04:55:50 -0700 Subject: [PATCH 140/233] Update django-upgrade to 1.20.0 (#5227) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f0e7f7b9b..ca98dce69 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ ruff==0.5.3 -django-upgrade==1.19.0 +django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.7.1 From 88da1f44136b332f472bce681d3b53ef8a06ebd0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 20 Jul 2024 02:17:34 +0000 Subject: [PATCH 141/233] Release 2024.07.19 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 843244210..0fa376e15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.19 + + +### Changed + +- Use "ENV key=value" instead of "ENV key value" in Dockerfiles ([#5225](https://github.com/cookiecutter/cookiecutter-django/pull/5225)) + +### Updated + +- Update django-upgrade to 1.20.0 ([#5227](https://github.com/cookiecutter/cookiecutter-django/pull/5227)) + +- Update ruff to 0.5.3 ([#5224](https://github.com/cookiecutter/cookiecutter-django/pull/5224)) + ## 2024.07.18 diff --git a/setup.py b/setup.py index edeeadfbd..1cf1166e7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.18" +version = "2024.07.19" with open("README.md") as readme_file: long_description = readme_file.read() From 1b88b699c97a5f35755d5d75a95f3e9098e04c37 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 10:37:43 +0100 Subject: [PATCH 142/233] Update django-upgrade pre-commit hooks (#5232) --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 0c79e7234..07577c0b2 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/adamchainz/django-upgrade - rev: '1.19.0' + rev: '1.20.0' hooks: - id: django-upgrade args: ['--target-version', '4.2'] From 4d74cd9730a4aa487d0a09d10573175def3f5924 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 20 Jul 2024 02:41:47 -0700 Subject: [PATCH 143/233] Update django-crispy-forms to 2.3 (#5229) --- {{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 65b49facc..6dd2ed8a1 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -33,7 +33,7 @@ django==4.2.14 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth -django-crispy-forms==2.2 # https://github.com/django-crispy-forms/django-crispy-forms +django-crispy-forms==2.3 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} django-compressor==4.5 # https://github.com/django-compressor/django-compressor From a5f0967eeca8b111dd96d6abbdb4aac9bffaa135 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 20 Jul 2024 10:47:06 +0100 Subject: [PATCH 144/233] Update Heroku runtime to Python 3.12.4 --- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 4ddc7cd66..74d315a82 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.12.3 +python-3.12.4 From b5d7460ae12895ae04d2bc095b2644cd72ec3256 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 20 Jul 2024 07:46:39 -0700 Subject: [PATCH 145/233] Update uvicorn from 0.30.1 to 0.30.3 (#5234) --- {{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 6dd2ed8a1..e4e191e40 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.30.1 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.3 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From e4a2a46c686eebdc7e7f286495abb930b6a21bca Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 20 Jul 2024 07:47:04 -0700 Subject: [PATCH 146/233] Update hiredis to 3.0.0 (#5228) --- {{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 e4e191e40..0717745a7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -13,7 +13,7 @@ whitenoise==6.7.0 # https://github.com/evansd/whitenoise {%- endif %} redis==5.0.7 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} -hiredis==2.3.2 # https://github.com/redis/hiredis-py +hiredis==3.0.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.4.0 # 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 5fa14841c..3cda1be50 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta sentry-sdk==2.10.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} -hiredis==2.3.2 # https://github.com/redis/hiredis-py +hiredis==3.0.0 # https://github.com/redis/hiredis-py {%- endif %} # Django From e6bd8d1a2a42832a4212a58e07a3dd23ffe00b53 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 21 Jul 2024 02:20:10 +0000 Subject: [PATCH 147/233] Release 2024.07.20 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fa376e15..0d0506b29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.20 + + +### Updated + +- Update hiredis to 3.0.0 ([#5228](https://github.com/cookiecutter/cookiecutter-django/pull/5228)) + +- Update uvicorn to 0.30.3 ([#5234](https://github.com/cookiecutter/cookiecutter-django/pull/5234)) + +- Update django-crispy-forms to 2.3 ([#5229](https://github.com/cookiecutter/cookiecutter-django/pull/5229)) + +- Auto-update pre-commit hooks ([#5232](https://github.com/cookiecutter/cookiecutter-django/pull/5232)) + ## 2024.07.19 diff --git a/setup.py b/setup.py index 1cf1166e7..ee2c2cd76 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.19" +version = "2024.07.20" with open("README.md") as readme_file: long_description = readme_file.read() From 22e2715c82d6048b306c265591f79f8f3f68fd18 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 21 Jul 2024 02:46:30 -0700 Subject: [PATCH 148/233] Update sphinx to 7.4.7 (#5235) * Update sphinx from 7.4.6 to 7.4.7 * Update sphinx from 7.4.6 to 7.4.7 --- 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 e1bc625ff..f2b16c26f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.4.6 +sphinx==7.4.7 sphinx-rtd-theme==2.0.0 myst-parser==3.0.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4fb93fb4b..4d6e86776 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.4.6 # https://github.com/sphinx-doc/sphinx +sphinx==7.4.7 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 75123bd4ec5f289340033f816cf6b74f9ce3e063 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 21 Jul 2024 02:48:14 -0700 Subject: [PATCH 149/233] Update pytest to 8.3.1 (#5236) * Update pytest from 8.2.2 to 8.3.1 * Update pytest from 8.2.2 to 8.3.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 ca98dce69..8e1415e46 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.7.1 # Testing # ------------------------------------------------------------------------------ tox==4.16.0 -pytest==8.2.2 +pytest==8.3.1 pytest-xdist==3.6.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 4d6e86776..fa8d7d2b0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.22.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs -pytest==8.2.2 # https://github.com/pytest-dev/pytest +pytest==8.3.1 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs From a6fc34eeeaeb459dcf99135bc075288d9b7e5a4f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 21 Jul 2024 02:59:59 -0700 Subject: [PATCH 150/233] Update ruff to 0.5.4 (#5237) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8e1415e46..afdb1a3b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.3 +ruff==0.5.4 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 07577c0b2..244eec314 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.3 + rev: v0.5.4 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index fa8d7d2b0..765adf286 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.3 # https://github.com/astral-sh/ruff +ruff==0.5.4 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 41b50bcb7d8a50ef71dd19adc4759d99ad7b75a9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 22 Jul 2024 02:20:42 +0000 Subject: [PATCH 151/233] Release 2024.07.21 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d0506b29..abb0e09de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.21 + + +### Updated + +- Update ruff to 0.5.4 ([#5237](https://github.com/cookiecutter/cookiecutter-django/pull/5237)) + +- Update pytest to 8.3.1 ([#5236](https://github.com/cookiecutter/cookiecutter-django/pull/5236)) + +- Update sphinx to 7.4.7 ([#5235](https://github.com/cookiecutter/cookiecutter-django/pull/5235)) + ## 2024.07.20 diff --git a/setup.py b/setup.py index ee2c2cd76..c8959595f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.20" +version = "2024.07.21" with open("README.md") as readme_file: long_description = readme_file.read() From 34803624ebb26ccf4e46743665f2fa81135cddff Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 22 Jul 2024 12:40:19 +0100 Subject: [PATCH 152/233] Update django-compressor from 4.5 to 4.5.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 0717745a7..5df095df9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -36,7 +36,7 @@ django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth django-crispy-forms==2.3 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} -django-compressor==4.5 # https://github.com/django-compressor/django-compressor +django-compressor==4.5.1 # https://github.com/django-compressor/django-compressor {%- endif %} django-redis==5.4.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} From 3858e90528ba507f9f34f6749555b8023124ecbe Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 23 Jul 2024 02:19:07 +0000 Subject: [PATCH 153/233] Release 2024.07.22 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abb0e09de..99132d26f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.22 + + +### Updated + +- Update django-compressor to 4.5.1 ([#5240](https://github.com/cookiecutter/cookiecutter-django/pull/5240)) + ## 2024.07.21 diff --git a/setup.py b/setup.py index c8959595f..adfbea156 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.21" +version = "2024.07.22" with open("README.md") as readme_file: long_description = readme_file.read() From 12c5eacb0c3c43564358cb28d4f616af853e1372 Mon Sep 17 00:00:00 2001 From: Filipe Nascimento <50376848+FilipeNas@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:53:52 +0200 Subject: [PATCH 154/233] Downgrade watchfiles from 0.22 to 0.21 (#5243) --- {{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 765adf286..acb1a09b3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg psycopg[binary]==3.2.1 # https://github.com/psycopg/psycopg {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.22.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From bee2e414b75669a0930efdd192e525bdcf222586 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 23 Jul 2024 06:54:27 +0000 Subject: [PATCH 155/233] 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 ad6f162d2..62b93da92 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1603,5 +1603,10 @@ "name": "Ali Shamakhi", "github_login": "ali-shamakhi", "twitter_username": "" + }, + { + "name": "Filipe Nascimento", + "github_login": "FilipeNas", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index fac85d9e4..03f86e76c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -852,6 +852,13 @@ Listed in alphabetical order. + + Filipe Nascimento + + FilipeNas + + + Florian Idelberger From 12e9dc753c9376168f801f2983216c39241c396e Mon Sep 17 00:00:00 2001 From: hleroy Date: Mon, 22 Jul 2024 19:45:12 +0200 Subject: [PATCH 156/233] Added back CMD command Clearning the ENTRYPOINT also clears the CMD. We need to set explicitly CMD again. --- {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile index 9c7b8a69a..80c9a5cc9 100644 --- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile @@ -2,6 +2,7 @@ FROM docker.io/amazon/aws-cli:2.17.0 # Clear entrypoint from the base image, otherwise it's always calling the aws CLI ENTRYPOINT [] +CMD ["/bin/bash"] COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced From b0e6b5ef76133c95fee34adba355a4cc4833fc7b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 Jul 2024 02:18:58 +0000 Subject: [PATCH 157/233] Release 2024.07.23 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99132d26f..2c8afa665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.23 + + +### Changed + +- Ensure that awscli service has a CMD to fix #5241 ([#5245](https://github.com/cookiecutter/cookiecutter-django/pull/5245)) + +### Fixed + +- Downgrade watchfiles ([#5243](https://github.com/cookiecutter/cookiecutter-django/pull/5243)) + ## 2024.07.22 diff --git a/setup.py b/setup.py index adfbea156..f47a03532 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.22" +version = "2024.07.23" with open("README.md") as readme_file: long_description = readme_file.read() From 69c3b4c0cb7dd76ab076a6e7afcd05f7ae7aa7a6 Mon Sep 17 00:00:00 2001 From: Hoai-Thu Vuong Date: Thu, 25 Jul 2024 02:12:39 +0700 Subject: [PATCH 158/233] fix non existent of two scoops of django image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b73ecef9e..4ceb4f6d8 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Projects that provide financial support to the maintainers: ### Two Scoops of Django -[![Cover of the book "Two Scoops of Django 3.x"](https://www.feldroy.com/static/book-TSD3-800.jpg)](https://www.feldroy.com/two-scoops-press#two-scoops-of-django) +[![Cover of the book "Two Scoops of Django 3.x"](https://f004.backblazeb2.com/file/feldroycom/images/book-TSD3-800.jpg)](https://www.feldroy.com/two-scoops-press#two-scoops-of-django) Two Scoops of Django 3.x is the best ice cream-themed Django reference in the universe! From 4540098afc62474975b44035bf97786386e80a9b Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 25 Jul 2024 02:18:59 +0000 Subject: [PATCH 159/233] Release 2024.07.24 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c8afa665..db700a788 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.24 + + +### Changed + +- fix non existent of two scoops of django image ([#5248](https://github.com/cookiecutter/cookiecutter-django/pull/5248)) + ## 2024.07.23 diff --git a/setup.py b/setup.py index f47a03532..9095af9be 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.23" +version = "2024.07.24" with open("README.md") as readme_file: long_description = readme_file.read() From a6fcb62e1909665a718cb1ca2db3b6a8feb1b306 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 25 Jul 2024 05:17:09 -0700 Subject: [PATCH 160/233] Update sentry-sdk to 2.11.0 (#5247) --- {{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 3cda1be50..47f1d4690 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.10.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.11.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py From 5caa9c0160011c2f2289fa43e8575c0c694b9516 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 25 Jul 2024 13:18:03 +0100 Subject: [PATCH 161/233] Upgrade to Django 5.0 (#5199) --- README.md | 2 +- setup.py | 2 +- tests/test_cookiecutter_generation.py | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4ceb4f6d8..6e3c0a74c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ production-ready Django projects quickly. ## Features -- For Django 4.2 +- For Django 5.0 - Works with Python 3.12 - 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 9095af9be..7778caff9 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup( classifiers=[ "Development Status :: 4 - Beta", "Environment :: Console", - "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", "Intended Audience :: Developers", "Natural Language :: English", "License :: OSI Approved :: BSD License", diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 5a0bca383..9669d78ba 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -230,7 +230,7 @@ def test_django_upgrade_passes(cookies, context_override): try: sh.django_upgrade( "--target-version", - "4.2", + "5.0", *python_files, _cwd=str(result.project_path), ) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 244eec314..b70addfdd 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: rev: '1.20.0' hooks: - id: django-upgrade - args: ['--target-version', '4.2'] + args: ['--target-version', '5.0'] # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 5df095df9..c947883bb 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==4.2.14 # pyup: < 5.0 # https://www.djangoproject.com/ +django==5.0.7 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth From 55cf48c4f35ca464cfe73036a5ade67f80b10961 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 25 Jul 2024 05:23:43 -0700 Subject: [PATCH 162/233] Update pytest to 8.3.2 (#5249) * Update pytest from 8.3.1 to 8.3.2 * Update pytest from 8.3.1 to 8.3.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 afdb1a3b4..23b7ab500 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.7.1 # Testing # ------------------------------------------------------------------------------ tox==4.16.0 -pytest==8.3.1 +pytest==8.3.2 pytest-xdist==3.6.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 acb1a09b3..236976d33 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs -pytest==8.3.1 # https://github.com/pytest-dev/pytest +pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs From 2b1c6e9f5033a42aa8be9f3daad900a91fd6c180 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 26 Jul 2024 02:19:01 +0000 Subject: [PATCH 163/233] Release 2024.07.25 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db700a788..1d739f007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.25 + + +### Changed + +- Upgrade to Django 5.0 ([#5199](https://github.com/cookiecutter/cookiecutter-django/pull/5199)) + +### Updated + +- Update pytest to 8.3.2 ([#5249](https://github.com/cookiecutter/cookiecutter-django/pull/5249)) + +- Update sentry-sdk to 2.11.0 ([#5247](https://github.com/cookiecutter/cookiecutter-django/pull/5247)) + ## 2024.07.24 diff --git a/setup.py b/setup.py index 7778caff9..fbafc02b0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.24" +version = "2024.07.25" with open("README.md") as readme_file: long_description = readme_file.read() From 1af0757340e479b3c2c875bd0d5a9a4ecb2b02cf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 26 Jul 2024 00:20:02 -0700 Subject: [PATCH 164/233] Update ruff to 0.5.5 (#5250) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 23b7ab500..6bfad1d6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.4 +ruff==0.5.5 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.7.1 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index b70addfdd..d15e46270 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.4 + rev: v0.5.5 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 236976d33..8261ef56a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.4 # https://github.com/astral-sh/ruff +ruff==0.5.5 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit From 207a9e576c5cef9e1c757279d67bb0a752fcdf6e Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 27 Jul 2024 02:18:07 +0000 Subject: [PATCH 165/233] Release 2024.07.26 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d739f007..2c03b41cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.26 + + +### Updated + +- Update ruff to 0.5.5 ([#5250](https://github.com/cookiecutter/cookiecutter-django/pull/5250)) + ## 2024.07.25 diff --git a/setup.py b/setup.py index fbafc02b0..9166d8ce8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.25" +version = "2024.07.26" with open("README.md") as readme_file: long_description = readme_file.read() From 4c24e7fb189737765cb9495a5902829bf07ed669 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 28 Jul 2024 08:40:30 +0100 Subject: [PATCH 166/233] Update django-stubs from 5.0.2 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 8261ef56a..d525bb683 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy -django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs +django-stubs[compatible-mypy]==5.0.3 # https://github.com/typeddjango/django-stubs pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 9b42473bad2cd2cc2c890c31070856616f93103b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 19 Jul 2024 21:14:25 +0100 Subject: [PATCH 167/233] Update mypy from 1.10.0 to 1.11.0 --- {{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 8261ef56a..aef66327f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==1.10.0 # https://github.com/python/mypy +mypy==1.11.0 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar From a8105bdc9fd9b8a0b117ec0d081b1b85844c90b2 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 28 Jul 2024 09:59:08 +0200 Subject: [PATCH 168/233] Fix signature for UserUpdateView.get_object --- .../{{cookiecutter.project_slug}}/users/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index 3f20f2686..942f3e3f0 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -1,5 +1,6 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.messages.views import SuccessMessageMixin +from django.db.models import QuerySet from django.urls import reverse from django.utils.translation import gettext_lazy as _ from django.views.generic import DetailView @@ -28,12 +29,12 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): fields = ["name"] success_message = _("Information successfully updated") - def get_success_url(self): + def get_success_url(self) -> str: # for mypy to know that the user is authenticated assert self.request.user.is_authenticated return self.request.user.get_absolute_url() - def get_object(self): + def get_object(self, queryset: QuerySet | None=None) -> User: return self.request.user @@ -43,7 +44,7 @@ user_update_view = UserUpdateView.as_view() class UserRedirectView(LoginRequiredMixin, RedirectView): permanent = False - def get_redirect_url(self): + def get_redirect_url(self) -> str: {%- if cookiecutter.username_type == "email" %} return reverse("users:detail", kwargs={"pk": self.request.user.pk}) {%- else %} From 6355464230548fff50b498619ea43513376000d9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 28 Jul 2024 10:04:55 +0200 Subject: [PATCH 169/233] Add type guard --- .../{{cookiecutter.project_slug}}/users/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index 942f3e3f0..8bb1838cd 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -35,6 +35,8 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): return self.request.user.get_absolute_url() def get_object(self, queryset: QuerySet | None=None) -> User: + # for mypy to know that the user is authenticated + assert self.request.user.is_authenticated return self.request.user From bb8a1b6637e0563490c67cdfe76841097deba7fa Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 28 Jul 2024 10:18:38 +0200 Subject: [PATCH 170/233] Add AuthenticatedHttpRequest type for helping with LoginRequiredMixin views --- .../{{cookiecutter.project_slug}}/users/views.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index 8bb1838cd..ca3e104ec 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -1,6 +1,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.messages.views import SuccessMessageMixin from django.db.models import QuerySet +from django.http import HttpRequest from django.urls import reverse from django.utils.translation import gettext_lazy as _ from django.views.generic import DetailView @@ -10,6 +11,11 @@ from django.views.generic import UpdateView from {{ cookiecutter.project_slug }}.users.models import User +class AuthenticatedHttpRequest(HttpRequest): + """For mypy to know that the user is authenticated.""" + user: User + + class UserDetailView(LoginRequiredMixin, DetailView): model = User {%- if cookiecutter.username_type == "email" %} @@ -19,6 +25,7 @@ class UserDetailView(LoginRequiredMixin, DetailView): slug_field = "username" slug_url_kwarg = "username" {%- endif %} + request: AuthenticatedHttpRequest user_detail_view = UserDetailView.as_view() @@ -28,15 +35,12 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): model = User fields = ["name"] success_message = _("Information successfully updated") + request: AuthenticatedHttpRequest def get_success_url(self) -> str: - # for mypy to know that the user is authenticated - assert self.request.user.is_authenticated return self.request.user.get_absolute_url() def get_object(self, queryset: QuerySet | None=None) -> User: - # for mypy to know that the user is authenticated - assert self.request.user.is_authenticated return self.request.user @@ -45,6 +49,7 @@ user_update_view = UserUpdateView.as_view() class UserRedirectView(LoginRequiredMixin, RedirectView): permanent = False + request: AuthenticatedHttpRequest def get_redirect_url(self) -> str: {%- if cookiecutter.username_type == "email" %} From 429f4681006030ce59a6d6e3f9db082733c3221c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 28 Jul 2024 10:27:20 +0200 Subject: [PATCH 171/233] Revert to simpler type guard fix --- .../{{cookiecutter.project_slug}}/users/views.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index ca3e104ec..e7655f123 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -1,7 +1,6 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.messages.views import SuccessMessageMixin from django.db.models import QuerySet -from django.http import HttpRequest from django.urls import reverse from django.utils.translation import gettext_lazy as _ from django.views.generic import DetailView @@ -11,11 +10,6 @@ from django.views.generic import UpdateView from {{ cookiecutter.project_slug }}.users.models import User -class AuthenticatedHttpRequest(HttpRequest): - """For mypy to know that the user is authenticated.""" - user: User - - class UserDetailView(LoginRequiredMixin, DetailView): model = User {%- if cookiecutter.username_type == "email" %} @@ -25,7 +19,6 @@ class UserDetailView(LoginRequiredMixin, DetailView): slug_field = "username" slug_url_kwarg = "username" {%- endif %} - request: AuthenticatedHttpRequest user_detail_view = UserDetailView.as_view() @@ -35,12 +28,13 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): model = User fields = ["name"] success_message = _("Information successfully updated") - request: AuthenticatedHttpRequest def get_success_url(self) -> str: + assert self.request.user.is_authenticated # type guard return self.request.user.get_absolute_url() def get_object(self, queryset: QuerySet | None=None) -> User: + assert self.request.user.is_authenticated # type guard return self.request.user @@ -49,7 +43,6 @@ user_update_view = UserUpdateView.as_view() class UserRedirectView(LoginRequiredMixin, RedirectView): permanent = False - request: AuthenticatedHttpRequest def get_redirect_url(self) -> str: {%- if cookiecutter.username_type == "email" %} From 676aa25a3731cfaee44a67a3d7160b110c4a0565 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 28 Jul 2024 20:40:32 +0100 Subject: [PATCH 172/233] Update django-stubs from 5.0.2 to 5.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 8261ef56a..138484040 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.10.0 # https://github.com/python/mypy -django-stubs[compatible-mypy]==5.0.2 # https://github.com/typeddjango/django-stubs +django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-stubs pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 8f4c31cf8c1211d850024e40eea4fcd4a4bb75db Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 30 Jul 2024 17:41:25 +0100 Subject: [PATCH 173/233] Update redis from 5.0.7 to 5.0.8 --- {{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 c947883bb..4ee8f3e31 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.7.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==5.0.7 # https://github.com/redis/redis-py +redis==5.0.8 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py {%- endif %} From db496f9c0c3f4a5b423361305a811d6c1106608a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 06:58:50 -0700 Subject: [PATCH 174/233] Update sentry-sdk to 2.12.0 (#5268) --- {{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 47f1d4690..089a26cd4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.11.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.12.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py From 4c27a59678523974cf7702b6e150a3eb20b0a165 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 06:59:08 -0700 Subject: [PATCH 175/233] Update django-allauth to 64.0.0 (#5269) --- {{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 c947883bb..447503a14 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==5.0.7 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==0.63.6 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==64.0.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.3 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 4413b25706cb26093aed067637606d3c275c528e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 31 Jul 2024 15:02:04 +0100 Subject: [PATCH 176/233] Remove compatible-mypy extra from djangorestframework-stubs Looks like the latest version should work with mypy 1.11: https://github.com/typeddjango/djangorestframework-stubs/pull/642 --- {{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 00e583dbd..21280bb0f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-st pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs[compatible-mypy]==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==3.15.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From 0d9ffe5d7a8efcb7f00b227da80e78f02b3d4148 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 15:13:42 +0100 Subject: [PATCH 177/233] Update pyupgrade pre-commit hook to v3.17.0 (#5258) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index acf7676ec..1b3b76843 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.16.0 + rev: v3.17.0 hooks: - id: pyupgrade args: [--py312-plus] From bb053b0497cfc0cda2c7c7610552c61676efa909 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 07:14:24 -0700 Subject: [PATCH 178/233] Update pre-commit to 3.8.0 (#5257) --- 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 6bfad1d6f..5afa20ead 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 ruff==0.5.5 django-upgrade==1.20.0 djlint==1.34.1 -pre-commit==3.7.1 +pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 21280bb0f..22d8acf10 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -31,7 +31,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild ruff==0.5.5 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint -pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit +pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 20db5f13158720f9aa674d18a0ad38765cac400a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 07:23:25 -0700 Subject: [PATCH 179/233] Update mypy to 1.11.1 (#5270) --- {{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 22d8acf10..e7781dc2f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==1.11.0 # https://github.com/python/mypy +mypy==1.11.1 # https://github.com/python/mypy django-stubs[compatible-mypy]==5.0.4 # https://github.com/typeddjango/django-stubs pytest==8.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar From 75a9da3de2abe59a7f8b523671ea0271c99ada25 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 31 Jul 2024 15:08:44 -0700 Subject: [PATCH 180/233] Update uvicorn from 0.30.3 to 0.30.4 (#5271) --- {{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 82faffb04..c889b5dae 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.30.3 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.4 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From a2b1055e16fc286b182366a17bc98463574da948 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 1 Aug 2024 02:23:00 +0000 Subject: [PATCH 181/233] Release 2024.07.31 --- CHANGELOG.md | 23 +++++++++++++++++++++++ setup.py | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c03b41cb..c6f240d92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,29 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.07.31 + + +### Updated + +- Update uvicorn to 0.30.4 ([#5271](https://github.com/cookiecutter/cookiecutter-django/pull/5271)) + +- Update mypy to 1.11.1 ([#5270](https://github.com/cookiecutter/cookiecutter-django/pull/5270)) + +- Update pre-commit to 3.8.0 ([#5257](https://github.com/cookiecutter/cookiecutter-django/pull/5257)) + +- Update pyupgrade pre-commit hook to v3.17.0 ([#5258](https://github.com/cookiecutter/cookiecutter-django/pull/5258)) + +- Update redis to 5.0.8 ([#5265](https://github.com/cookiecutter/cookiecutter-django/pull/5265)) + +- Update django-stubs to 5.0.4 ([#5256](https://github.com/cookiecutter/cookiecutter-django/pull/5256)) + +- Update mypy to 1.11.0 ([#5231](https://github.com/cookiecutter/cookiecutter-django/pull/5231)) + +- Update django-allauth to 64.0.0 ([#5269](https://github.com/cookiecutter/cookiecutter-django/pull/5269)) + +- Update sentry-sdk to 2.12.0 ([#5268](https://github.com/cookiecutter/cookiecutter-django/pull/5268)) + ## 2024.07.26 diff --git a/setup.py b/setup.py index 9166d8ce8..cf3864c43 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.26" +version = "2024.07.31" with open("README.md") as readme_file: long_description = readme_file.read() From 739ba6206b5c8dc5000d1fec3eb883cc9c11b75d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 11:35:41 +0100 Subject: [PATCH 182/233] Auto-update pre-commit hooks (#5274) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- .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 1b3b76843..a1f0c603f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,7 +33,7 @@ repos: exclude: hooks/ - repo: https://github.com/psf/black - rev: 24.4.2 + rev: 24.8.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index d15e46270..ffe38a7ac 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.5 + rev: v0.5.6 hooks: # Linter - id: ruff From f56562db7962ce349d3118df19e7c4c7454bb340 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 4 Aug 2024 03:35:58 -0700 Subject: [PATCH 183/233] Update ruff to 0.5.6 (#5273) * Update ruff from 0.5.5 to 0.5.6 * Update ruff from 0.5.5 to 0.5.6 --- 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 5afa20ead..8139fb9f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.5 +ruff==0.5.6 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.8.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e7781dc2f..51d789e9a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.5 # https://github.com/astral-sh/ruff +ruff==0.5.6 # https://github.com/astral-sh/ruff coverage==7.6.0 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From a7f34df264dd1e841a6288b6c1d6e7cb62616a8f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 4 Aug 2024 03:36:12 -0700 Subject: [PATCH 184/233] Update uvicorn from 0.30.4 to 0.30.5 (#5272) --- {{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 c889b5dae..03cc2b835 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.30.4 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.5 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From 74c5794a72bef6612181fdec44e1b01f16aa85e3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Aug 2024 02:20:10 +0000 Subject: [PATCH 185/233] Release 2024.08.04 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f240d92..5210aa041 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.04 + + +### Updated + +- Update uvicorn to 0.30.5 ([#5272](https://github.com/cookiecutter/cookiecutter-django/pull/5272)) + +- Update ruff to 0.5.6 ([#5273](https://github.com/cookiecutter/cookiecutter-django/pull/5273)) + +- Auto-update pre-commit hooks ([#5274](https://github.com/cookiecutter/cookiecutter-django/pull/5274)) + ## 2024.07.31 diff --git a/setup.py b/setup.py index cf3864c43..9aaaa02db 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.07.31" +version = "2024.08.04" with open("README.md") as readme_file: long_description = readme_file.read() From 775c7730f669f7cab812a0ee8b171f77cde10afc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:33:11 +0100 Subject: [PATCH 186/233] Auto-update pre-commit hooks (#5277) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a1f0c603f..d8d601e92 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 7.1.0 + rev: 7.1.1 hooks: - id: flake8 From e6916a858a07856b47fb9888fa8ba9337a9c981d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 5 Aug 2024 12:10:21 -0700 Subject: [PATCH 187/233] Update myst-parser to 4.0.0 (#5279) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index f2b16c26f..f3b153721 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ sphinx==7.4.7 sphinx-rtd-theme==2.0.0 -myst-parser==3.0.1 +myst-parser==4.0.0 From 875d9200cf1e350590c5ca16c8ee4003f11c15b2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 5 Aug 2024 12:10:52 -0700 Subject: [PATCH 188/233] Update coverage to 7.6.1 (#5276) --- {{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 51d789e9a..78fec207c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ ruff==0.5.6 # https://github.com/astral-sh/ruff -coverage==7.6.0 # https://github.com/nedbat/coveragepy +coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From 7390948fc53b4316d81f795454da510e472540b1 Mon Sep 17 00:00:00 2001 From: Kevin Mills <35641675+millsks@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:12:30 -0500 Subject: [PATCH 189/233] Update README.md (#5275) Add new Medium story in the Articles section --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6e3c0a74c..879b2b2cf 100644 --- a/README.md +++ b/README.md @@ -244,6 +244,7 @@ experience better. ## Articles +- [Why cookiecutter-django is Essential for Your Next Django Project](https://medium.com/@millsks/why-cookiecutter-django-is-essential-for-your-next-django-project-7d3c00cdce51) - Aug. 4, 2024 - [How to Make Your Own Django Cookiecutter Template!](https://medium.com/@FatemeFouladkar/how-to-make-your-own-django-cookiecutter-template-a753d4cbb8c2) - Aug. 10, 2023 - [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021 - [Complete Walkthrough: Blue/Green Deployment to AWS ECS using GitHub actions](https://github.com/Andrew-Chen-Wang/cookiecutter-django-ecs-github) - June 10, 2020 From 0576726cabcd78513a99e853e3a71b3130961819 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 5 Aug 2024 19:14:39 +0000 Subject: [PATCH 190/233] 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 62b93da92..c11bce30d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1608,5 +1608,10 @@ "name": "Filipe Nascimento", "github_login": "FilipeNas", "twitter_username": "" + }, + { + "name": "Kevin Mills", + "github_login": "millsks", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 03f86e76c..503eb8bfa 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1293,6 +1293,13 @@ Listed in alphabetical order. + + Kevin Mills + + millsks + + + Kevin Ndung'u From 3cbe3b2a908d822f370c311525d44be77c283659 Mon Sep 17 00:00:00 2001 From: Jimmy Gitonga Date: Mon, 5 Aug 2024 22:40:12 +0300 Subject: [PATCH 191/233] Resolve https documentation around local development environment (#5252) --- docs/developing-locally-docker.rst | 139 +++++++++-------------------- 1 file changed, 41 insertions(+), 98 deletions(-) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 83de99bb9..cb2cdc0e5 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -43,7 +43,6 @@ Before doing any git commit, `pre-commit`_ should be installed globally on your Failing to do so will result with a bunch of CI and Linter errors that can be avoided with pre-commit. - Run the Stack ------------- @@ -91,7 +90,6 @@ Also, please note that the ``docker exec`` does not work for running management When ``DEBUG`` is set to ``True``, the host is validated against ``['localhost', '127.0.0.1', '[::1]']``. This is adequate when running a ``virtualenv``. For Docker, in the ``config.settings.local``, add your host development server IP to ``INTERNAL_IPS`` or ``ALLOWED_HOSTS`` if the variable exists. - .. _envs: Configuring the Environment @@ -117,8 +115,8 @@ The most important thing for us here now is ``env_file`` section enlisting ``./. .envs ├── .local - │   ├── .django - │   └── .postgres + │ ├── .django + │ └── .postgres └── .production ├── .django └── .postgres @@ -195,7 +193,6 @@ The ``container_name`` from the yml file can be used to check on containers with $ docker logs _local_celeryworker $ docker top _local_celeryworker - Notice that the ``container_name`` is generated dynamically using your project slug as a prefix Mailpit @@ -245,118 +242,64 @@ The stack comes with a dedicated node service to build the static assets, watch .. _Sass: https://sass-lang.com/ .. _live reloading: https://browsersync.io -Developing locally with HTTPS ------------------------------ +(Optionally) Developing locally with HTTPS +------------------------------------------ -Increasingly it is becoming necessary to develop software in a secure environment in order that there are very few changes when deploying to production. Recently Facebook changed their policies for apps/sites that use Facebook login which requires the use of an HTTPS URL for the OAuth redirect URL. So if you want to use the ``users`` application with a OAuth provider such as Facebook, securing your communication to the local development environment will be necessary. - -In order to create a secure environment, we need to have a trusted SSL certificate installed in our Docker application. - -#. **Let's Encrypt** - - The official line from Let’s Encrypt is: - - [For local development section] ... The best option: Generate your own certificate, either self-signed or signed by a local root, and trust it in your operating system’s trust store. Then use that certificate in your local web server. See below for details. - - See `letsencrypt.org - certificates-for-localhost`_ - - .. _`letsencrypt.org - certificates-for-localhost`: https://letsencrypt.org/docs/certificates-for-localhost/ - -#. **mkcert: Valid Https Certificates For Localhost** - - `mkcert`_ is a simple by design tool that hides all the arcane knowledge required to generate valid TLS certificates. It works for any hostname or IP, including localhost. It supports macOS, Linux, and Windows, and Firefox, Chrome and Java. It even works on mobile devices with a couple manual steps. - - See https://blog.filippo.io/mkcert-valid-https-certificates-for-localhost/ - - .. _`mkcert`: https://github.com/FiloSottile/mkcert/blob/master/README.md#supported-root-stores - -After installing a trusted TLS certificate, configure your docker installation. We are going to configure an ``nginx`` reverse-proxy server. This makes sure that it does not interfere with our ``traefik`` configuration that is reserved for production environments. - -These are the places that you should configure to secure your local environment. - -certs +Nginx ~~~~~ -Take the certificates that you generated and place them in a folder called ``certs`` in the project's root folder. Assuming that you registered your local hostname as ``my-dev-env.local``, the certificates you will put in the folder should have the names ``my-dev-env.local.crt`` and ``my-dev-env.local.key``. +If you want to add some sort of social authentication with a OAuth provider such as Facebook, securing your communication to the local development environment will be necessary. These providers usually require that you use an HTTPS URL for the OAuth redirect URL for the Facebook login to work appropriately. -docker-compose.local.yml -~~~~~~~~~ +Here is a link to an article on `how to add HTTPS using Nginx`_ to your local docker installation. This also includes how to serve files from the ``media`` location, in the event that you are want to serve user-uploaded content. -#. Add the ``nginx-proxy`` service. :: +.. _`how to add HTTPS using Nginx`: https://afroshok.com/cookiecutter-https - ... +Webpack +~~~~~~~ - nginx-proxy: - image: jwilder/nginx-proxy:alpine - container_name: nginx-proxy - ports: - - "80:80" - - "443:443" - volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro - - ./certs:/etc/nginx/certs - restart: always - depends_on: - - django +If you are using Webpack, first install ``mkcert``_. It is a simple by design tool that hides all the arcane knowledge required to generate valid TLS certificates. It works for any hostname or IP, including localhost. It supports macOS, Linux, and Windows, and Firefox, Chrome and Java. It even works on mobile devices with a couple manual steps. See https://blog.filippo.io/mkcert-valid-https-certificates-for-localhost/ - ... +.. _`mkcert`: https://github.com/FiloSottile/mkcert/blob/master/README.md#supported-root-stores -#. Link the ``nginx-proxy`` to ``django`` through environment variables. +These are the places that you should configure to secure your local environment. Take the certificates that you generated and place them in a folder called ``certs`` in the project's root folder. Configure an ``nginx`` reverse-proxy server as a ``service`` in the ``docker-compose.local.yml``. This makes sure that it does not interfere with our ``traefik`` configuration that is reserved for production environments. - ``django`` already has an ``.env`` file connected to it. Add the following variables. You should do this especially if you are working with a team and you want to keep your local environment details to yourself. +Assuming that you registered your local hostname as ``my-dev-env.local``, the certificates you will put in the folder should have the names ``my-dev-env.local.crt`` and ``my-dev-env.local.key``. - :: +1. Add the ``nginx-proxy`` service to the ``docker-compose.local.yml``. :: - # HTTPS - # ------------------------------------------------------------------------------ - VIRTUAL_HOST=my-dev-env.local - VIRTUAL_PORT=8000 + nginx-proxy: + image: jwilder/nginx-proxy:alpine + container_name: nginx-proxy + ports: + - "80:80" + - "443:443" + volumes: + - /var/run/docker.sock:/tmp/docker.sock:ro + - ./certs:/etc/nginx/certs + restart: always + depends_on: + - node + environment: + - VIRTUAL_HOST=my-dev-env.local + - VIRTUAL_PORT=3000 - The services run behind the reverse proxy. - -config/settings/local.py -~~~~~~~~~~~~~~~~~~~~~~~~ - -You should allow the new hostname. :: +2. Add the local secure domain to the ``config/settings/local.py``. You should allow the new hostname :: ALLOWED_HOSTS = ["localhost", "0.0.0.0", "127.0.0.1", "my-dev-env.local"] +3. Add the following configuration to the ``devServer`` section of ``webpack/dev.config.js`` :: + + client: { + webSocketURL: 'auto://0.0.0.0:0/ws', // note the `:0` after `0.0.0.0` + }, + + Rebuild your ``docker`` application. :: $ docker compose -f docker-compose.local.yml up -d --build -Go to your browser and type in your URL bar ``https://my-dev-env.local`` +Go to your browser and type in your URL bar ``https://my-dev-env.local``. -See `https with nginx`_ for more information on this configuration. +For more on this configuration, see `https with nginx`_. - .. _`https with nginx`: https://codewithhugo.com/docker-compose-local-https/ - -.gitignore -~~~~~~~~~~ - -Add ``certs/*`` to the ``.gitignore`` file. This allows the folder to be included in the repo but its contents to be ignored. - -*This configuration is for local development environments only. Do not use this for production since you might expose your local* ``rootCA-key.pem``. - -Webpack -~~~~~~~ - -If you are using Webpack: - -1. On the ``nginx-proxy`` service in ``docker-compose.local.yml``, change ``depends_on`` to ``node`` instead of ``django``. - -2. On the ``node`` service in ``docker-compose.local.yml``, add the following environment configuration: - - :: - - environment: - - VIRTUAL_HOST=my-dev-env.local - - VIRTUAL_PORT=3000 - -3. Add the following configuration to the ``devServer`` section of ``webpack/dev.config.js``: - - :: - - client: { - webSocketURL: 'auto://0.0.0.0:0/ws', // note the `:0` after `0.0.0.0` - }, +.. _`https with nginx`: https://codewithhugo.com/docker-compose-local-https/ From af50d111914aa66d78c1eb13a476b34aa35f2a97 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 6 Aug 2024 02:19:20 +0000 Subject: [PATCH 192/233] Release 2024.08.05 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5210aa041..36bd98f6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.05 + + +### Documentation + +- Simplify documentation for https in local development ([#5252](https://github.com/cookiecutter/cookiecutter-django/pull/5252)) + +- Add Medium story in the Articles section ([#5275](https://github.com/cookiecutter/cookiecutter-django/pull/5275)) + +### Updated + +- Update coverage to 7.6.1 ([#5276](https://github.com/cookiecutter/cookiecutter-django/pull/5276)) + +- Auto-update pre-commit hooks ([#5277](https://github.com/cookiecutter/cookiecutter-django/pull/5277)) + ## 2024.08.04 diff --git a/setup.py b/setup.py index 9aaaa02db..885a2b5fe 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.04" +version = "2024.08.05" with open("README.md") as readme_file: long_description = readme_file.read() From 936fc52602f30e16f42da15fd6983877ba91bb25 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 6 Aug 2024 00:44:44 -0700 Subject: [PATCH 193/233] Update tox from 4.16.0 to 4.17.0 (#5280) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8139fb9f4..d5a73a7ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ -tox==4.16.0 +tox==4.17.0 pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From 5846b051cba44e511b175361ed8e3820e2f82144 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 6 Aug 2024 09:03:46 -0700 Subject: [PATCH 194/233] Update django to 5.0.8 (#5281) --- {{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 03cc2b835..7e6031fe3 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker # Django # ------------------------------------------------------------------------------ -django==5.0.7 # pyup: < 5.1 # https://www.djangoproject.com/ +django==5.0.8 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==64.0.0 # https://github.com/pennersr/django-allauth From e1354239d82fee70043b3a5c4e12570d07310f00 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 7 Aug 2024 02:20:20 +0000 Subject: [PATCH 195/233] Release 2024.08.06 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36bd98f6f..d6e2afa15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.06 + + +### Updated + +- Update django to 5.0.8 ([#5281](https://github.com/cookiecutter/cookiecutter-django/pull/5281)) + ## 2024.08.05 diff --git a/setup.py b/setup.py index 885a2b5fe..0895f753c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.05" +version = "2024.08.06" with open("README.md") as readme_file: long_description = readme_file.read() From 358b26a0d641d96d2d80f1ed3de5bc0b4d11670e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Aug 2024 05:46:04 -0700 Subject: [PATCH 196/233] Update pyyaml to 6.0.2 (#5284) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d5a73a7ae..6cf0f3f74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 -pyyaml==6.0.1 +pyyaml==6.0.2 # Scripting # ------------------------------------------------------------------------------ From c8165ef92cf34004eceea0697f27df74c65a07bf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:34 +0100 Subject: [PATCH 197/233] Update django-anymail from 11.0.1 to 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 089a26cd4..693047903 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ django-storages[google]==1.14.4 # https://github.com/jschneier/django-storages django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon-ses]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} From 68814e94e2139f27d2a123174cc54fdf61d3895f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:34 +0100 Subject: [PATCH 198/233] Update django-anymail from 11.0.1 to 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 693047903..0350d066c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -26,7 +26,7 @@ django-storages[azure]==1.14.4 # https://github.com/jschneier/django-storages {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon-ses]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[amazon-ses]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} From f2f1ef6cd41ce7c4d6218e1f674dd284376393a5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:35 +0100 Subject: [PATCH 199/233] Update django-anymail from 11.0.1 to 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 0350d066c..a94e36dcf 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -28,7 +28,7 @@ django-anymail[mailgun]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon-ses]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} From ced3148af61a2e800692f11ea3f73188cd1bbc8e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:35 +0100 Subject: [PATCH 200/233] Update django-anymail from 11.0.1 to 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 a94e36dcf..77b8216ec 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -30,7 +30,7 @@ django-anymail[amazon-ses]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} From 54dca549d3b7f8b2343bed46eb023360b274d183 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:36 +0100 Subject: [PATCH 201/233] Update django-anymail from 11.0.1 to 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 77b8216ec..bd985ac73 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -32,7 +32,7 @@ django-anymail[mailjet]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[postmark]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} From d0fa1e473d54b5ba8fa7acc77cec160eecc4eec1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:37 +0100 Subject: [PATCH 202/233] Update django-anymail from 11.0.1 to 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 bd985ac73..b9bce8949 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -34,7 +34,7 @@ django-anymail[mandrill]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} django-anymail[brevo]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} From 107d0125aff53f85387406a6519a3e24af533771 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:37 +0100 Subject: [PATCH 203/233] Update django-anymail from 11.0.1 to 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 b9bce8949..99f6b531e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -36,7 +36,7 @@ django-anymail[postmark]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} -django-anymail[brevo]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[brevo]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==11.0.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} From 1c23f83fc4292d3a76c1dbaec8918f6393ef3e83 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:38 +0100 Subject: [PATCH 204/233] Update django-anymail from 11.0.1 to 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 99f6b531e..3fbc444a4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -38,7 +38,7 @@ django-anymail[sendgrid]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Brevo' %} django-anymail[brevo]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==11.0.1 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} django-anymail==11.0.1 # https://github.com/anymail/django-anymail {%- endif %} From 75464de51229e16d11fa56654610f854b8209a42 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 22:54:38 +0100 Subject: [PATCH 205/233] Update django-anymail from 11.0.1 to 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 3fbc444a4..5894e239b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -40,5 +40,5 @@ django-anymail[brevo]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==11.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==11.0.1 # https://github.com/anymail/django-anymail +django-anymail==11.1 # https://github.com/anymail/django-anymail {%- endif %} From 532941a4181f774e8f949e20da9bf79ccb400dbc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 7 Aug 2024 19:29:38 +0100 Subject: [PATCH 206/233] Update tox from 4.17.0 to 4.17.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6cf0f3f74..06f9373f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ -tox==4.17.0 +tox==4.17.1 pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From 4e3768145bda2eb67ea9ba1415f656611ef170d9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 8 Aug 2024 02:19:59 +0000 Subject: [PATCH 207/233] Release 2024.08.07 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6e2afa15..1c7a8129f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.07 + + +### Updated + +- Update tox to 4.17.1 ([#5285](https://github.com/cookiecutter/cookiecutter-django/pull/5285)) + +- Update django-anymail to 11.1 ([#5286](https://github.com/cookiecutter/cookiecutter-django/pull/5286)) + ## 2024.08.06 diff --git a/setup.py b/setup.py index 0895f753c..a27e3a53d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.06" +version = "2024.08.07" with open("README.md") as readme_file: long_description = readme_file.read() From 89d1ae1536c358a02b73f26e0e1351851b0f04ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:50:33 +0000 Subject: [PATCH 208/233] Bump python in /{{cookiecutter.project_slug}}/compose/production/django Bumps python from 3.12.4-slim-bookworm to 3.12.5-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../compose/production/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 6279908a9..3e0859c24 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -25,7 +25,7 @@ RUN npm run build {%- endif %} # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm AS python +FROM docker.io/python:3.12.5-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From 774176f9bed52b563bcdd3404ab63df29fe75622 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:38:31 +0000 Subject: [PATCH 209/233] Bump python in /{{cookiecutter.project_slug}}/compose/local/django Bumps python from 3.12.4-slim-bookworm to 3.12.5-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 1183ae984..ddec2d4e7 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm AS python +FROM docker.io/python:3.12.5-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From 4b683d86d20951271242fc142b7d07688f221bb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:12:57 +0000 Subject: [PATCH 210/233] Bump python in /{{cookiecutter.project_slug}}/compose/local/docs Bumps python from 3.12.4-slim-bookworm to 3.12.5-slim-bookworm. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- {{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 cdc002fe0..49e25cba9 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM docker.io/python:3.12.4-slim-bookworm AS python +FROM docker.io/python:3.12.5-slim-bookworm AS python # Python build stage From 07af107e1e1422c78e0808dd1acc6db803fc2b47 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 8 Aug 2024 12:13:18 +0100 Subject: [PATCH 211/233] Update Heroku Python runtime --- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 74d315a82..8a7cba521 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.12.4 +python-3.12.5 From 734faf13eadc4d9e97eb36f6584b3af2fa91f41e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 8 Aug 2024 18:42:46 +0100 Subject: [PATCH 212/233] Update ruff from 0.5.6 to 0.5.7 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 06f9373f8..12ede4a32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.6 +ruff==0.5.7 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.8.0 From 851155656d38bd75bfc39a92083fedaed0067517 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 8 Aug 2024 18:42:46 +0100 Subject: [PATCH 213/233] Update ruff from 0.5.6 to 0.5.7 --- {{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 78fec207c..a0cb1a5e3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.6 # https://github.com/astral-sh/ruff +ruff==0.5.7 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From cf1ce9e45fb8d05196887514cbb87ed3934d4cce Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 9 Aug 2024 02:20:23 +0000 Subject: [PATCH 214/233] Release 2024.08.08 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c7a8129f..a3614d090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.08 + + +### Updated + +- Update ruff to 0.5.7 ([#5291](https://github.com/cookiecutter/cookiecutter-django/pull/5291)) + +- Bump python from 3.12.4 to 3.12.5 in docs Docker image ([#5287](https://github.com/cookiecutter/cookiecutter-django/pull/5287)) + +- Bump python from 3.12.4 to 3.12.5 in local Docker image ([#5289](https://github.com/cookiecutter/cookiecutter-django/pull/5289)) + +- Bump python from 3.12.4 to 3.12.5 in production Docker image ([#5290](https://github.com/cookiecutter/cookiecutter-django/pull/5290)) + ## 2024.08.07 diff --git a/setup.py b/setup.py index a27e3a53d..56e39674f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.07" +version = "2024.08.08" with open("README.md") as readme_file: long_description = readme_file.read() From b1089c254c7fd66217d411edceb34ada6efd6bb3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 09:19:12 +0100 Subject: [PATCH 215/233] Update Ruff pre-commit hook to v0.5.7 (#5293) Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index ffe38a7ac..d8d699845 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.6 + rev: v0.5.7 hooks: # Linter - id: ruff From 5ba04c6c78f2a03d932dfd33d78430da77a4ae77 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 10 Aug 2024 02:19:39 +0000 Subject: [PATCH 216/233] Release 2024.08.09 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3614d090..c8ba95b38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.09 + + +### Updated + +- Update Ruff pre-commit hook to v0.5.7 ([#5293](https://github.com/cookiecutter/cookiecutter-django/pull/5293)) + ## 2024.08.08 diff --git a/setup.py b/setup.py index 56e39674f..ef3eb13ad 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.08" +version = "2024.08.09" with open("README.md") as readme_file: long_description = readme_file.read() From 89a1efc2a34a58ca52e0035998e3bbd3ab62c19e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 11 Aug 2024 00:00:14 +0100 Subject: [PATCH 217/233] Update gunicorn from 22.0.0 to 23.0.0 --- {{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 5894e239b..3d94e20e1 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -2,7 +2,7 @@ -r base.txt -gunicorn==22.0.0 # https://github.com/benoitc/gunicorn +gunicorn==23.0.0 # https://github.com/benoitc/gunicorn psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg {%- if cookiecutter.use_whitenoise == 'n' %} Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta From 1fc66d0ecf898f8fb6684940eb52375851b31762 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 13 Aug 2024 02:20:35 +0000 Subject: [PATCH 218/233] Release 2024.08.12 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ba95b38..b6dc3d743 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.12 + + +### Updated + +- Update gunicorn to 23.0.0 ([#5294](https://github.com/cookiecutter/cookiecutter-django/pull/5294)) + ## 2024.08.09 diff --git a/setup.py b/setup.py index ef3eb13ad..fef722d89 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.09" +version = "2024.08.12" with open("README.md") as readme_file: long_description = readme_file.read() From 411225bf6773c2acfc7c11f05fa932afc92d0e60 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 13 Aug 2024 19:42:22 +1000 Subject: [PATCH 219/233] Update uvicorn from 0.30.5 to 0.30.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 7e6031fe3..37234ae0d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.30.5 # https://github.com/encode/uvicorn +uvicorn[standard]==0.30.6 # https://github.com/encode/uvicorn uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker {%- endif %} From 623007f7697c795aac7e34e200bac924c37fb407 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 14 Aug 2024 02:05:35 +1000 Subject: [PATCH 220/233] Update sentry-sdk from 2.12.0 to 2.13.0 --- {{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 3d94e20e1..824927ca6 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg Collectfasta==3.2.0 # https://github.com/jasongi/collectfasta {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==2.12.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.13.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==3.0.0 # https://github.com/redis/hiredis-py From c81251962473a01b9a20067ebcd9c31542802b05 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 14 Aug 2024 06:05:10 +1000 Subject: [PATCH 221/233] Update tox from 4.17.1 to 4.18.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 12ede4a32..dbaefb342 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ -tox==4.17.1 +tox==4.18.0 pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From a97d2b8b6653065d0b5322a248eda341c8e08599 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Aug 2024 02:19:57 +0000 Subject: [PATCH 222/233] Release 2024.08.13 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6dc3d743..3c7c1c608 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.13 + + +### Updated + +- Update tox to 4.18.0 ([#5299](https://github.com/cookiecutter/cookiecutter-django/pull/5299)) + +- Update sentry-sdk to 2.13.0 ([#5298](https://github.com/cookiecutter/cookiecutter-django/pull/5298)) + +- Update uvicorn to 0.30.6 ([#5295](https://github.com/cookiecutter/cookiecutter-django/pull/5295)) + ## 2024.08.12 diff --git a/setup.py b/setup.py index fef722d89..92ec62a3a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.12" +version = "2024.08.13" with open("README.md") as readme_file: long_description = readme_file.read() From dc0a511353a755c7bd4dd5c8085309984c70332d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 15 Aug 2024 08:36:59 -0700 Subject: [PATCH 223/233] Update ruff to 0.6.0 (#5300) * Update ruff from 0.5.7 to 0.6.0 * Update ruff from 0.5.7 to 0.6.0 * Update Ruff pre-commit hook * Update pytest style to match update Ruff rules * Switch Ruff setting from exclude to extend-exclude * Omit default Ruff settings --------- Co-authored-by: Bruno Alla --- requirements.txt | 2 +- .../.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/pyproject.toml | 55 ++++--------------- .../requirements/local.txt | 2 +- .../{{cookiecutter.project_slug}}/conftest.py | 2 +- .../users/tests/test_admin.py | 4 +- .../users/tests/test_drf_views.py | 2 +- .../users/tests/test_managers.py | 4 +- .../users/tests/test_swagger.py | 2 +- 9 files changed, 20 insertions(+), 55 deletions(-) diff --git a/requirements.txt b/requirements.txt index dbaefb342..c12146018 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.7 +ruff==0.6.0 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.8.0 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index d8d699845..7eb2cb374 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.7 + rev: v0.6.0 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml index 31e290dff..98a883b62 100644 --- a/{{cookiecutter.project_slug}}/pyproject.toml +++ b/{{cookiecutter.project_slug}}/pyproject.toml @@ -59,36 +59,12 @@ indent_size = 2 indent_size = 2 [tool.ruff] -# Exclude a variety of commonly ignored directories. -exclude = [ - ".bzr", - ".direnv", - ".eggs", - ".git", - ".git-rewrite", - ".hg", - ".mypy_cache", - ".nox", - ".pants.d", - ".pytype", - ".ruff_cache", - ".svn", - ".tox", - ".venv", - "__pypackages__", - "_build", - "buck-out", - "build", - "dist", - "node_modules", - "venv", - "*/migrations/*.py", - "staticfiles/*" -] -# Same as Django: https://github.com/cookiecutter/cookiecutter-django/issues/4792. -line-length = 88 -indent-width = 4 target-version = "py312" +# Exclude a variety of commonly ignored directories. +extend-exclude = [ + "*/migrations/*.py", + "staticfiles/*", +] [tool.ruff.lint] select = [ @@ -145,33 +121,22 @@ select = [ "PERF", # "FURB", # "LOG", - "RUF" + "RUF", ] ignore = [ "S101", # Use of assert detected https://docs.astral.sh/ruff/rules/assert/ "RUF012", # Mutable class attributes should be annotated with `typing.ClassVar` "SIM102", # sometimes it's better to nest - "UP038" # Checks for uses of isinstance/issubclass that take a tuple + "UP038", # Checks for uses of isinstance/issubclass that take a tuple # of types for comparison. - # Deactivated because it can make the code slow: + # Deactivated because it can make the code slow: # https://github.com/astral-sh/ruff/issues/7871 ] -# Allow fix for all enabled rules (when `--fix`) is provided. -fixable = ["ALL"] -unfixable = [] -# The fixes in extend-unsafe-fixes will require +# The fixes in extend-unsafe-fixes will require # provide the `--unsafe-fixes` flag when fixing. extend-unsafe-fixes = [ - "UP038" + "UP038", ] -# Allow unused variables when underscore-prefixed. -dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" - -[tool.ruff.format] -quote-style = "double" -indent-style = "space" -skip-magic-trailing-comma = false -line-ending = "auto" [tool.ruff.lint.isort] force-single-line = true diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index a0cb1a5e3..4458a35c6 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.5.7 # https://github.com/astral-sh/ruff +ruff==0.6.0 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py index 98efcd75e..8d3af053b 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py @@ -9,6 +9,6 @@ def _media_storage(settings, tmpdir) -> None: settings.MEDIA_ROOT = tmpdir.strpath -@pytest.fixture() +@pytest.fixture def user(db) -> User: return UserFactory() diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py index 66555c4ea..3e6a41a94 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py @@ -56,7 +56,7 @@ class TestUserAdmin: response = admin_client.get(url) assert response.status_code == HTTPStatus.OK - @pytest.fixture() + @pytest.fixture def _force_allauth(self, settings): settings.DJANGO_ADMIN_FORCE_ALLAUTH = True # Reload the admin module to apply the setting change @@ -65,7 +65,7 @@ class TestUserAdmin: with contextlib.suppress(admin.sites.AlreadyRegistered): # type: ignore[attr-defined] reload(users_admin) - @pytest.mark.django_db() + @pytest.mark.django_db @pytest.mark.usefixtures("_force_allauth") def test_allauth_login(self, rf, settings): request = rf.get("/fake-url") diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py index 955ebe4eb..0198b1309 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py @@ -6,7 +6,7 @@ from {{ cookiecutter.project_slug }}.users.models import User class TestUserViewSet: - @pytest.fixture() + @pytest.fixture def api_rf(self) -> APIRequestFactory: return APIRequestFactory() diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py index e5e5f5a4b..e3553ab4b 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py @@ -6,7 +6,7 @@ from django.core.management import call_command from {{ cookiecutter.project_slug }}.users.models import User -@pytest.mark.django_db() +@pytest.mark.django_db class TestUserManager: def test_create_user(self): user = User.objects.create_user( @@ -37,7 +37,7 @@ class TestUserManager: assert user.username is None -@pytest.mark.django_db() +@pytest.mark.django_db def test_createsuperuser_command(): """Ensure createsuperuser command works with our custom manager.""" out = StringIO() diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py index 3081d1f65..5db371dbe 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py @@ -10,7 +10,7 @@ def test_swagger_accessible_by_admin(admin_client): assert response.status_code == HTTPStatus.OK -@pytest.mark.django_db() +@pytest.mark.django_db def test_swagger_ui_not_accessible_by_normal_user(client): url = reverse("api-docs") response = client.get(url) From 864581a13e84a7cade8e84f4d5143e141dec1ff5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Aug 2024 02:19:46 +0000 Subject: [PATCH 224/233] Release 2024.08.15 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c7c1c608..7fdd4dbbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.15 + + +### Updated + +- Update ruff to 0.6.0 ([#5300](https://github.com/cookiecutter/cookiecutter-django/pull/5300)) + ## 2024.08.13 diff --git a/setup.py b/setup.py index 92ec62a3a..e4eae9f72 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.13" +version = "2024.08.15" with open("README.md") as readme_file: long_description = readme_file.read() From 47e63900cf6dd84c1a2b60a915e62f27476cfc05 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 16 Aug 2024 01:10:35 -0700 Subject: [PATCH 225/233] Update django-allauth to 64.1.0 (#5302) --- {{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 37234ae0d..c94a0307c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker django==5.0.8 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils -django-allauth[mfa]==64.0.0 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==64.1.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.3 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From d8051c9db28d393651882e4e2ae01716ecfe245f Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 17 Aug 2024 02:18:19 +0000 Subject: [PATCH 226/233] Release 2024.08.16 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fdd4dbbd..24a272063 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.16 + + +### Updated + +- Update django-allauth to 64.1.0 ([#5302](https://github.com/cookiecutter/cookiecutter-django/pull/5302)) + ## 2024.08.15 diff --git a/setup.py b/setup.py index e4eae9f72..857eec1ae 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.15" +version = "2024.08.16" with open("README.md") as readme_file: long_description = readme_file.read() From 5900b39179ab6430bb974b70219c56299d3b355e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 17 Aug 2024 10:17:11 -0700 Subject: [PATCH 227/233] Update ruff to 0.6.1 (#5303) * Update ruff from 0.6.0 to 0.6.1 * Update ruff from 0.6.0 to 0.6.1 * Auto-update pre-commit hooks --------- Co-authored-by: browniebroke <861044+browniebroke@users.noreply.github.com> Co-authored-by: Bruno Alla --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index c12146018..9fbf36afe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.0 +ruff==0.6.1 django-upgrade==1.20.0 djlint==1.34.1 pre-commit==3.8.0 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 7eb2cb374..7a88a5457 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -35,7 +35,7 @@ repos: # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.0 + rev: v0.6.1 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4458a35c6..4327e51bd 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.0 # https://github.com/astral-sh/ruff +ruff==0.6.1 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From f8ca5c2aaf34cf733b92433150f1f8eb2efb321a Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 18 Aug 2024 02:20:59 +0000 Subject: [PATCH 228/233] Release 2024.08.17 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24a272063..0394d64b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.17 + + +### Updated + +- Update ruff to 0.6.1 ([#5303](https://github.com/cookiecutter/cookiecutter-django/pull/5303)) + ## 2024.08.16 diff --git a/setup.py b/setup.py index 857eec1ae..6cddd5f4c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.16" +version = "2024.08.17" with open("README.md") as readme_file: long_description = readme_file.read() From 0836abca26b30d03fbdefa91c5b447ba6917a1bd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Aug 2024 06:10:47 +1000 Subject: [PATCH 229/233] Update factory-boy from 3.3.0 to 3.3.1 --- {{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 4327e51bd..402c303ab 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -35,7 +35,7 @@ pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ -factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy +factory-boy==3.3.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==4.4.6 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions From 8af7634e94ab4590009ffaca847bb561b5f7e9eb Mon Sep 17 00:00:00 2001 From: jtmy Date: Tue, 20 Aug 2024 03:48:44 +0800 Subject: [PATCH 230/233] Fix missing extra_body block in allauth entrance.html --- .../templates/allauth/layouts/entrance.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html index 91cbaba3f..96ba42499 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html @@ -24,6 +24,8 @@ {% endif %} {% block content %} {% endblock content %} + {% block extra_body %} + {% endblock extra_body %} {% endblock body %}{% endraw %} From ab4ed1a1350a4c4b46416acd1596d1cec85b549b Mon Sep 17 00:00:00 2001 From: luzfcb Date: Tue, 20 Aug 2024 00:54:41 +0000 Subject: [PATCH 231/233] 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 c11bce30d..e19e5fa83 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1613,5 +1613,10 @@ "name": "Kevin Mills", "github_login": "millsks", "twitter_username": "" + }, + { + "name": "milvagox", + "github_login": "milvagox", + "twitter_username": "milvagox" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 503eb8bfa..298f3a524 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1608,6 +1608,13 @@ Listed in alphabetical order. + + milvagox + + milvagox + + milvagox + Min ho Kim From d8a2d2fa9dff078f36984f7f0f1f3b22d31297c3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 20 Aug 2024 02:19:38 +0000 Subject: [PATCH 232/233] Release 2024.08.19 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0394d64b5..6ebbab4b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2024.08.19 + + +### Updated + +- Update factory-boy to 3.3.1 ([#5307](https://github.com/cookiecutter/cookiecutter-django/pull/5307)) + ## 2024.08.17 diff --git a/setup.py b/setup.py index 6cddd5f4c..5a428d159 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.08.17" +version = "2024.08.19" with open("README.md") as readme_file: long_description = readme_file.read() From 6100821a35fbd8e6843d3a8fc47377cedd92dc01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:20:40 +0100 Subject: [PATCH 233/233] Bump traefik from 2.11.2 to 3.1.2 (#5282) --- .../compose/production/traefik/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile index d54bf27ca..2a9b2fdd8 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/traefik:2.11.2 +FROM docker.io/traefik:3.1.2 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json