From dc0a511353a755c7bd4dd5c8085309984c70332d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 15 Aug 2024 08:36:59 -0700 Subject: [PATCH 01/53] 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 02/53] 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 03/53] 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 04/53] 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 05/53] 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 06/53] 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 07/53] 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 08/53] 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 09/53] 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 10/53] 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 11/53] 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 From 2e779508e6f8703a34fff5eaae3084980e5ac09f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:39:48 +0100 Subject: [PATCH 12/53] Bump css-loader from 6.11.0 to 7.1.2 (#5089) --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 0b17e5e0b..b3dbadd8b 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -9,7 +9,7 @@ "babel-loader": "^9.1.2", "bootstrap": "^5.2.3", "browser-sync": "^3.0.2", - "css-loader": "^6.5.1", + "css-loader": "^7.1.2", "gulp-concat": "^2.6.1", "concurrently": "^8.0.1", "cssnano": "^7.0.0", From 165b1ef6b5b9704e4e3c655ef3596c1b0ffa74bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:47:46 +0100 Subject: [PATCH 13/53] Bump webpack-merge from 5.10.0 to 6.0.1 (#5187) --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index b3dbadd8b..9e0bf1a0a 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -32,7 +32,7 @@ "webpack-bundle-tracker": "^3.0.1", "webpack-cli": "^5.0.1", "webpack-dev-server": "^5.0.2", - "webpack-merge": "^5.8.0" + "webpack-merge": "^6.0.1" }, "engines": { "node": "20" From ce92e1e944eaed6513f05f933f6ef0ac2dc1a27c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:21:49 +0200 Subject: [PATCH 14/53] Bump node from 20 to 22 (#5039) --- .github/workflows/ci.yml | 2 +- {{cookiecutter.project_slug}}/compose/local/node/Dockerfile | 2 +- {{cookiecutter.project_slug}}/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1db462916..91d08b1d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,6 +110,6 @@ jobs: run: pip install -r requirements.txt - uses: actions/setup-node@v4 with: - node-version: "20" + node-version: "22" - name: Bare Metal ${{ matrix.script.name }} run: sh tests/test_bare.sh ${{ matrix.script.args }} diff --git a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile index 438e3fa08..b0142ff81 100644 --- a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/node:20-bookworm-slim +FROM docker.io/node:22-bookworm-slim WORKDIR /app diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 9e0bf1a0a..02a6b0c57 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -35,7 +35,7 @@ "webpack-merge": "^6.0.1" }, "engines": { - "node": "20" + "node": "22" }, "browserslist": [ "last 2 versions" From 9321a9ba43e23ec31fca158e913810e9d0fdf823 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:24:04 +0200 Subject: [PATCH 15/53] Bump sass-loader from 14.2.1 to 16.0.1 (#5309) --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 02a6b0c57..a93b3fa5f 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -27,7 +27,7 @@ "postcss-loader": "^8.0.0", "postcss-preset-env": "^9.0.0", "sass": "^1.43.4", - "sass-loader": "^14.0.0", + "sass-loader": "^16.0.1", "webpack": "^5.65.0", "webpack-bundle-tracker": "^3.0.1", "webpack-cli": "^5.0.1", From a906529b32fbff4dfdda697f3e60b77eb7341a5b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 21 Aug 2024 02:19:50 +0000 Subject: [PATCH 16/53] Release 2024.08.20 --- CHANGELOG.md | 19 +++++++++++++++++++ setup.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ebbab4b2..e3c3a1ef9 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.08.20 + + +### Changed + +- Add missing extra_body block in allauth entrance.html ([#5308](https://github.com/cookiecutter/cookiecutter-django/pull/5308)) + +### Updated + +- Bump sass-loader from 14.2.1 to 16.0.1 ([#5309](https://github.com/cookiecutter/cookiecutter-django/pull/5309)) + +- Bump node from 20 to 22 ([#5039](https://github.com/cookiecutter/cookiecutter-django/pull/5039)) + +- Bump webpack-merge from 5.10.0 to 6.0.1 ([#5187](https://github.com/cookiecutter/cookiecutter-django/pull/5187)) + +- Bump css-loader from 6.11.0 to 7.1.2 ([#5089](https://github.com/cookiecutter/cookiecutter-django/pull/5089)) + +- Bump traefik from 2.11.2 to 3.1.2 ([#5282](https://github.com/cookiecutter/cookiecutter-django/pull/5282)) + ## 2024.08.19 diff --git a/setup.py b/setup.py index 5a428d159..8398f76ca 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.19" +version = "2024.08.20" with open("README.md") as readme_file: long_description = readme_file.read() From f28b74f2dfba6248837fa48d9b61ef9255d545a5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 21 Aug 2024 10:06:24 +0200 Subject: [PATCH 17/53] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3c3a1ef9..590004aea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All enhancements and patches to Cookiecutter Django will be documented in this f ## 2024.08.20 -### Changed +### Fixed - Add missing extra_body block in allauth entrance.html ([#5308](https://github.com/cookiecutter/cookiecutter-django/pull/5308)) From 69927387f8e48bd796c6952e14aaaa9637c34f4d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 21 Aug 2024 11:35:20 +0200 Subject: [PATCH 18/53] Add type hint for UserFactory (#5312) Since factory-boy 3.3.1, we can type annotate factories: https://github.com/FactoryBoy/factory_boy/pull/1059 Setting that up for the only factory of the project --- .../{{cookiecutter.project_slug}}/users/tests/factories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py index 136d0b1d5..d3115d9d7 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py @@ -8,7 +8,7 @@ from factory.django import DjangoModelFactory from {{ cookiecutter.project_slug }}.users.models import User -class UserFactory(DjangoModelFactory): +class UserFactory(DjangoModelFactory[User]): {%- if cookiecutter.username_type == "username" %} username = Faker("user_name") {%- endif %} From b974fa0ee89f9a6d6cf05fc686642401443190a0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Aug 2024 02:20:25 +0000 Subject: [PATCH 19/53] Release 2024.08.21 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 590004aea..bc502d029 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.21 + + +### Changed + +- Add type hint for UserFactory ([#5312](https://github.com/cookiecutter/cookiecutter-django/pull/5312)) + ## 2024.08.20 diff --git a/setup.py b/setup.py index 8398f76ca..39258342b 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.20" +version = "2024.08.21" with open("README.md") as readme_file: long_description = readme_file.read() From 9b0ce11d1d92c7f3aa4384d7395321290eb5f75b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 22 Aug 2024 21:47:10 +1000 Subject: [PATCH 20/53] Update django-celery-beat from 2.6.0 to 2.7.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 c94a0307c..8122ff467 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -17,7 +17,7 @@ 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 -django-celery-beat==2.6.0 # https://github.com/celery/django-celery-beat +django-celery-beat==2.7.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==2.0.1 # https://github.com/mher/flower {%- endif %} From 4bbc2a7fe67cdee2f38753e55f30037fb3a06585 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 23 Aug 2024 02:20:10 +0000 Subject: [PATCH 21/53] Release 2024.08.22 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc502d029..74a38d8ae 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.22 + + +### Updated + +- Update django-celery-beat to 2.7.0 ([#5315](https://github.com/cookiecutter/cookiecutter-django/pull/5315)) + ## 2024.08.21 diff --git a/setup.py b/setup.py index 39258342b..20aa63152 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.21" +version = "2024.08.22" with open("README.md") as readme_file: long_description = readme_file.read() From e869ad8eaf9430d39dc2cdaa990cc7a56970c7a1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 22 Aug 2024 23:33:13 -0700 Subject: [PATCH 22/53] Update ruff to 0.6.2 (#5316) --- 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 9fbf36afe..c16a7f735 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.1 +ruff==0.6.2 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 7a88a5457..2f54b2593 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.1 + rev: v0.6.2 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 402c303ab..4661b52b7 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.1 # https://github.com/astral-sh/ruff +ruff==0.6.2 # 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 1bbe30c9b94df0772d622f531c4c66a9664713b5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 22 Aug 2024 23:34:55 -0700 Subject: [PATCH 23/53] Update werkzeug from 3.0.3 to 3.0.4 (#5313) --- {{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 4661b52b7..d778e4489 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r production.txt -Werkzeug[watchdog]==3.0.3 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==3.0.4 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg[c]==3.2.1 # https://github.com/psycopg/psycopg From f947c612faf1d612bc357de57b6900e7fea65850 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 24 Aug 2024 02:19:36 +0000 Subject: [PATCH 24/53] Release 2024.08.23 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a38d8ae..6587ee04d 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.23 + + +### Updated + +- Update werkzeug to 3.0.4 ([#5313](https://github.com/cookiecutter/cookiecutter-django/pull/5313)) + +- Update ruff to 0.6.2 ([#5316](https://github.com/cookiecutter/cookiecutter-django/pull/5316)) + ## 2024.08.22 diff --git a/setup.py b/setup.py index 20aa63152..b6d92c99d 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.22" +version = "2024.08.23" with open("README.md") as readme_file: long_description = readme_file.read() From 6e1bab9df01aec86578a125e1acdea4b265e5224 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Aug 2024 00:49:34 -0700 Subject: [PATCH 25/53] Update mypy from 1.11.1 to 1.11.2 (#5320) --- {{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 d778e4489..d5346df99 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.1 # https://github.com/python/mypy +mypy==1.11.2 # 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 2a6d2cc23c7d58d6ec46374bd9f20ac91e1c446c Mon Sep 17 00:00:00 2001 From: Johnny Metz Date: Mon, 26 Aug 2024 00:52:17 -0700 Subject: [PATCH 26/53] Check DB migrations in GitHub CI (#5322) --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 5cb9ead4f..0d8ed0cad 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -74,6 +74,9 @@ jobs: - name: Build the docs run: docker compose -f docker-compose.docs.yml build docs + - name: Check DB Migrations + run: docker compose -f docker-compose.local.yml run --rm django python manage.py makemigrations --check + - name: Run DB Migrations run: docker compose -f docker-compose.local.yml run --rm django python manage.py migrate @@ -98,6 +101,12 @@ jobs: python -m pip install --upgrade pip pip install -r requirements/local.txt + - name: Check DB Migrations + run: python manage.py makemigrations --check + + - name: Run DB Migrations + run: python manage.py migrate + - name: Test with pytest run: pytest {%- endif %} From 31bfe6de12799f3d70568191a10c80acffb1169d Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 26 Aug 2024 07:52:55 +0000 Subject: [PATCH 27/53] 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 e19e5fa83..5519312cd 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1618,5 +1618,10 @@ "name": "milvagox", "github_login": "milvagox", "twitter_username": "milvagox" + }, + { + "name": "Johnny Metz", + "github_login": "johnnymetz", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 298f3a524..0eca2f4f7 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1195,6 +1195,13 @@ Listed in alphabetical order. cass_john + + Johnny Metz + + johnnymetz + + + Jonathan Thompson From 44ef8251010671efc9838569b001fc0eacf18015 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Aug 2024 01:00:41 -0700 Subject: [PATCH 28/53] Update pygithub from 2.3.0 to 2.4.0 (#5326) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c16a7f735..bff4818c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pyyaml==6.0.2 # Scripting # ------------------------------------------------------------------------------ -PyGithub==2.3.0 +PyGithub==2.4.0 gitpython==3.1.43 jinja2==3.1.4 requests==2.32.3 From e90704fdae218dd82fbc6497e9fa1f3a275fedb5 Mon Sep 17 00:00:00 2001 From: Johnny Metz Date: Mon, 26 Aug 2024 01:01:48 -0700 Subject: [PATCH 29/53] Remove unnecessary --dry-run flag (#5323) --- tests/test_docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_docker.sh b/tests/test_docker.sh index 473eede04..9811b4fdc 100755 --- a/tests/test_docker.sh +++ b/tests/test_docker.sh @@ -24,7 +24,7 @@ docker compose -f docker-compose.local.yml run django mypy my_awesome_project docker compose -f docker-compose.local.yml run django pytest # return non-zero status code if there are migrations that have not been created -docker compose -f docker-compose.local.yml run django python manage.py makemigrations --dry-run --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; } +docker compose -f docker-compose.local.yml run django python manage.py makemigrations --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; } # Test support for translations docker compose -f docker-compose.local.yml run django python manage.py makemessages --all From 2ff8a5f0d22ca4aac26d5953447119a5aec2dc27 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Aug 2024 02:20:56 +0000 Subject: [PATCH 30/53] Release 2024.08.26 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6587ee04d..0dbcbaf2b 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.26 + + +### Changed + +- Check DB migrations in GitHub CI ([#5322](https://github.com/cookiecutter/cookiecutter-django/pull/5322)) + +### Updated + +- Update mypy to 1.11.2 ([#5320](https://github.com/cookiecutter/cookiecutter-django/pull/5320)) + ## 2024.08.23 diff --git a/setup.py b/setup.py index b6d92c99d..78bc94e8a 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.23" +version = "2024.08.26" with open("README.md") as readme_file: long_description = readme_file.read() From 9fcb4fc27e564b5bf93f4e27238c19d3bb15abd8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 28 Aug 2024 10:06:11 -0700 Subject: [PATCH 31/53] Update djlint to 1.34.2 (#5329) * Update djlint from 1.34.1 to 1.34.2 * Update djlint from 1.34.1 to 1.34.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 bff4818c1..a79e4b85c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ binaryornot==0.4.4 # ------------------------------------------------------------------------------ ruff==0.6.2 django-upgrade==1.20.0 -djlint==1.34.1 +djlint==1.34.2 pre-commit==3.8.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index d5346df99..81b5a7b28 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ ruff==0.6.2 # 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 +djlint==1.34.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit # Django From d564f453a6f52ce4fb939b7048a1fff24825930f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 28 Aug 2024 10:26:55 -0700 Subject: [PATCH 32/53] Update watchfiles to 0.24.0 (#5330) --- {{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 81b5a7b28..dde8f183b 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.21.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.24.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From 61ce28ba81d76d92d996f34e525dcd3fa39df378 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 29 Aug 2024 02:22:40 +0000 Subject: [PATCH 33/53] Release 2024.08.28 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dbcbaf2b..492d49ff2 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.28 + + +### Updated + +- Update watchfiles to 0.24.0 ([#5330](https://github.com/cookiecutter/cookiecutter-django/pull/5330)) + +- Update djlint to 1.34.2 ([#5329](https://github.com/cookiecutter/cookiecutter-django/pull/5329)) + ## 2024.08.26 diff --git a/setup.py b/setup.py index 78bc94e8a..98afca7f1 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.26" +version = "2024.08.28" with open("README.md") as readme_file: long_description = readme_file.read() From 6b7ca732dcb45258d19c3a209b0c8ffa05bc29a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 09:16:03 +0100 Subject: [PATCH 34/53] Auto-update pre-commit hooks (#5331) --- {{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 2f54b2593..608e657ae 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: ruff-format - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.34.1 + rev: v1.34.2 hooks: - id: djlint-reformat-django - id: djlint-django From 5b5df8c0b64d17d42c1156bd6231cb9c0ea1dc15 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 29 Aug 2024 21:41:59 +1000 Subject: [PATCH 35/53] Update djlint from 1.34.2 to 1.35.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a79e4b85c..2eb9bbffa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ binaryornot==0.4.4 # ------------------------------------------------------------------------------ ruff==0.6.2 django-upgrade==1.20.0 -djlint==1.34.2 +djlint==1.35.2 pre-commit==3.8.0 # Testing From 83fbf9a7705601af506a1ce48f4530ed29cda392 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 29 Aug 2024 21:41:59 +1000 Subject: [PATCH 36/53] Update djlint from 1.34.2 to 1.35.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 dde8f183b..d3df56227 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ ruff==0.6.2 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy -djlint==1.34.2 # https://github.com/Riverside-Healthcare/djLint +djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit # Django From b1bfcfe1823ec3c3805c38e3e954297c57b8d0da Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 29 Aug 2024 12:23:17 -0700 Subject: [PATCH 37/53] Update ruff to 0.6.3 (#5333) --- 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 2eb9bbffa..6425ccde1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.2 +ruff==0.6.3 django-upgrade==1.20.0 djlint==1.35.2 pre-commit==3.8.0 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 608e657ae..be9beae01 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.2 + rev: v0.6.3 hooks: # Linter - id: ruff diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index d3df56227..88ad05036 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.2 # https://github.com/astral-sh/ruff +ruff==0.6.3 # https://github.com/astral-sh/ruff coverage==7.6.1 # https://github.com/nedbat/coveragepy djlint==1.35.2 # https://github.com/Riverside-Healthcare/djLint pre-commit==3.8.0 # https://github.com/pre-commit/pre-commit From 5a53905f8fdaa1fd6603e522f96ff82a0a929687 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 30 Aug 2024 02:23:22 +0000 Subject: [PATCH 38/53] Release 2024.08.29 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 492d49ff2..3431d4ae3 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.29 + + +### Updated + +- Update ruff to 0.6.3 ([#5333](https://github.com/cookiecutter/cookiecutter-django/pull/5333)) + +- Update djlint to 1.35.2 ([#5332](https://github.com/cookiecutter/cookiecutter-django/pull/5332)) + +- Update djlint pre-commit hook to v1.34.2 ([#5331](https://github.com/cookiecutter/cookiecutter-django/pull/5331)) + ## 2024.08.28 diff --git a/setup.py b/setup.py index 98afca7f1..92f506b7c 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.28" +version = "2024.08.29" with open("README.md") as readme_file: long_description = readme_file.read() From f3c0b39928231045aff6a44a35cfbd8184a584d1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Aug 2024 13:10:41 -0700 Subject: [PATCH 39/53] Update django-webpack-loader from 3.1.0 to 3.1.1 (#5336) --- {{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 8122ff467..22e9e6723 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -47,5 +47,5 @@ django-cors-headers==4.4.0 # https://github.com/adamchainz/django-cors-headers drf-spectacular==0.27.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} {%- if cookiecutter.frontend_pipeline == 'Webpack' %} -django-webpack-loader==3.1.0 # https://github.com/django-webpack/django-webpack-loader +django-webpack-loader==3.1.1 # https://github.com/django-webpack/django-webpack-loader {%- endif %} From e443763e35a16b9fac0d49d715bab9dd20f3b45b Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 31 Aug 2024 02:22:10 +0000 Subject: [PATCH 40/53] Release 2024.08.30 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3431d4ae3..6f0830b0d 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.30 + + +### Updated + +- Update django-webpack-loader to 3.1.1 ([#5336](https://github.com/cookiecutter/cookiecutter-django/pull/5336)) + ## 2024.08.29 diff --git a/setup.py b/setup.py index 92f506b7c..654da4a24 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.29" +version = "2024.08.30" with open("README.md") as readme_file: long_description = readme_file.read() From c9e76935599dd3c7686015e025e1cf380bbb173a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 3 Sep 2024 04:34:50 +1000 Subject: [PATCH 41/53] Update pytest-django from 4.8.0 to 4.9.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 88ad05036..0f081c2c3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -40,4 +40,4 @@ 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 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 +pytest-django==4.9.0 # https://github.com/pytest-dev/pytest-django From aa1f8a803be3d5d5c5cd1b9e67bce4d1d38c1526 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 31 Aug 2024 13:45:22 +1000 Subject: [PATCH 42/53] Update django-allauth from 64.1.0 to 64.2.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 22e9e6723..35baeceea 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.1.0 # https://github.com/pennersr/django-allauth +django-allauth[mfa]==64.2.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 b30af679f4bfcdcabf64c4c1f86f35a7192823e2 Mon Sep 17 00:00:00 2001 From: browniebroke <861044+browniebroke@users.noreply.github.com> Date: Sat, 31 Aug 2024 02:32:12 +0000 Subject: [PATCH 43/53] Auto-update pre-commit hooks --- {{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 be9beae01..2f1e42828 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: ruff-format - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.34.2 + rev: v1.35.2 hooks: - id: djlint-reformat-django - id: djlint-django From ede7c843a69cd9f8708962728a120fac2f1c4cd7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 3 Sep 2024 02:22:27 +0000 Subject: [PATCH 44/53] Release 2024.09.02 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f0830b0d..b143432f2 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.09.02 + + +### Updated + +- Auto-update pre-commit hooks ([#5334](https://github.com/cookiecutter/cookiecutter-django/pull/5334)) + +- Update django-allauth to 64.2.0 ([#5337](https://github.com/cookiecutter/cookiecutter-django/pull/5337)) + +- Update pytest-django to 4.9.0 ([#5338](https://github.com/cookiecutter/cookiecutter-django/pull/5338)) + ## 2024.08.30 diff --git a/setup.py b/setup.py index 654da4a24..aacd1e3b1 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.30" +version = "2024.09.02" with open("README.md") as readme_file: long_description = readme_file.read() From b7fc1973ad7114ca9bba4a28b0e50665ac7cd5a5 Mon Sep 17 00:00:00 2001 From: Will Date: Tue, 3 Sep 2024 08:54:26 +0100 Subject: [PATCH 45/53] Pin watchdog to 4.0.2 (#5335) Watchdog 5.0.0 was recently released. This update causes Werkzeug to reload the Django server much more frequently than desired (causing the local docker development build to barely load). --- {{cookiecutter.project_slug}}/requirements/local.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0f081c2c3..b6d8372de 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,5 +1,6 @@ -r production.txt +watchdog==4.0.2 # https://github.com/gorakhargosh/watchdog Werkzeug[watchdog]==3.0.4 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} From 27c654c637b1c160a0bff32f3b158ad00650ce58 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 3 Sep 2024 07:54:58 +0000 Subject: [PATCH 46/53] 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 5519312cd..15e7b84ba 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1623,5 +1623,10 @@ "name": "Johnny Metz", "github_login": "johnnymetz", "twitter_username": "" + }, + { + "name": "Will", + "github_login": "novucs", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0eca2f4f7..75f2d832d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2224,6 +2224,13 @@ Listed in alphabetical order. westurner + + Will + + novucs + + + Will Farley From e782791abcbd07f51c065bd2f3e1aaf3252ec3dd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 3 Sep 2024 03:40:37 -0700 Subject: [PATCH 47/53] Update sphinx-autobuild to 2024.9.3 (#5340) --- {{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 b6d8372de..864fad447 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -25,7 +25,7 @@ djangorestframework-stubs==3.15.0 # https://github.com/typeddjango/djangorestfr # Documentation # ------------------------------------------------------------------------------ sphinx==7.4.7 # https://github.com/sphinx-doc/sphinx -sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild +sphinx-autobuild==2024.9.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ From 4f9c697e599489f449ba12a297b60aeb49dc3481 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 3 Sep 2024 11:44:32 -0700 Subject: [PATCH 48/53] Update django to 5.0.9 (#5341) --- {{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 35baeceea..bc63efbb8 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.8 # pyup: < 5.1 # https://www.djangoproject.com/ +django==5.0.9 # 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.2.0 # https://github.com/pennersr/django-allauth From 16ff35eecc7710c5b684685bf652cf0b231f4b2b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Sep 2024 02:23:21 +0000 Subject: [PATCH 49/53] Release 2024.09.03 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b143432f2..a207749fa 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.09.03 + + +### Fixed + +- Pin watchdog to 4.0.2 ([#5335](https://github.com/cookiecutter/cookiecutter-django/pull/5335)) + +### Updated + +- Update django to 5.0.9 ([#5341](https://github.com/cookiecutter/cookiecutter-django/pull/5341)) + +- Update sphinx-autobuild to 2024.9.3 ([#5340](https://github.com/cookiecutter/cookiecutter-django/pull/5340)) + ## 2024.09.02 diff --git a/setup.py b/setup.py index aacd1e3b1..7bd694e58 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.09.02" +version = "2024.09.03" with open("README.md") as readme_file: long_description = readme_file.read() From fec82ed7f756a77887c3731297148aa28333505b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 08:08:18 +0100 Subject: [PATCH 50/53] Bump peter-evans/create-pull-request from 6 to 7 (#5342) --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index c01cd5141..ebd092859 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -37,7 +37,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 473ae8c05937574d519edb837f4d7c4c17ce9fae Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Sep 2024 07:29:35 -0700 Subject: [PATCH 51/53] Update django-model-utils to 5.0.0 (#5343) --- {{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 bc63efbb8..cab2fa5d3 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn-worker==0.2.0 # https://github.com/Kludex/uvicorn-worker # ------------------------------------------------------------------------------ django==5.0.9 # 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-model-utils==5.0.0 # https://github.com/jazzband/django-model-utils django-allauth[mfa]==64.2.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 From d4030f123a42f5e49d445c823554ff77b456899b Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 5 Sep 2024 02:23:46 +0000 Subject: [PATCH 52/53] Release 2024.09.04 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a207749fa..ca9dfe2b3 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.09.04 + + +### Updated + +- Update django-model-utils to 5.0.0 ([#5343](https://github.com/cookiecutter/cookiecutter-django/pull/5343)) + ## 2024.09.03 diff --git a/setup.py b/setup.py index 7bd694e58..eb3b1cc7e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.09.03" +version = "2024.09.04" with open("README.md") as readme_file: long_description = readme_file.read() From 7ab86a7c0e761a558d7d7fa0f07a91750536e007 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 5 Sep 2024 12:42:11 +0100 Subject: [PATCH 53/53] Update django-upgrade from 1.20.0 to 1.21.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6425ccde1..0e35cc7ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ ruff==0.6.3 -django-upgrade==1.20.0 +django-upgrade==1.21.0 djlint==1.35.2 pre-commit==3.8.0