From d4030f123a42f5e49d445c823554ff77b456899b Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 5 Sep 2024 02:23:46 +0000 Subject: [PATCH 01/26] 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 02/26] 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 From 1a141ef29b971ee6215fb1a466c8a84cf8cf8bd4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 6 Sep 2024 02:23:41 +0000 Subject: [PATCH 03/26] Release 2024.09.05 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca9dfe2b3..a8ba79a48 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.05 + + +### Updated + +- Update django-upgrade to 1.21.0 ([#5348](https://github.com/cookiecutter/cookiecutter-django/pull/5348)) + ## 2024.09.04 diff --git a/setup.py b/setup.py index eb3b1cc7e..d4762ae39 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.04" +version = "2024.09.05" with open("README.md") as readme_file: long_description = readme_file.read() From 2d0a8fb4f75940ff2990dcdd2703c6325c705286 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:07:44 +0100 Subject: [PATCH 04/26] Auto-update pre-commit hooks (#5353) 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 2f1e42828..8bbcf3856 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.20.0' + rev: '1.21.0' hooks: - id: django-upgrade args: ['--target-version', '5.0'] # Run the Ruff linter. - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.3 + rev: v0.6.4 hooks: # Linter - id: ruff From 9b289081af045df9b25c7d5e2e2090713d153ab1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 6 Sep 2024 02:08:14 -0700 Subject: [PATCH 05/26] Update django-allauth to 64.2.1 (#5352) --- {{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 cab2fa5d3..7ea91c806 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.9 # pyup: < 5.1 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ 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-allauth[mfa]==64.2.1 # 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 e2a47bf83f5969595590793cc14c407b3b8246d8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 6 Sep 2024 04:45:03 -0700 Subject: [PATCH 06/26] Update ruff to 0.6.4 (#5354) --- 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 0e35cc7ea..67e61da56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.3 +ruff==0.6.4 django-upgrade==1.21.0 djlint==1.35.2 pre-commit==3.8.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 864fad447..6fd60ca39 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2024.9.3 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -ruff==0.6.3 # https://github.com/astral-sh/ruff +ruff==0.6.4 # 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 ea4cd48e6cfdcc21f33b92092eebb36dbedd1e4b Mon Sep 17 00:00:00 2001 From: Jelmer Date: Fri, 6 Sep 2024 14:05:26 +0200 Subject: [PATCH 07/26] Merge setup.py in pyproject.toml (#5351) * Merge setup.py into pyproject.toml and add pyproject-fmt pre-commit hook for formatting it --- .pre-commit-config.yaml | 5 +++ pyproject.toml | 71 +++++++++++++++++++++++++++---------- scripts/update_changelog.py | 2 +- setup.py | 41 --------------------- 4 files changed, 58 insertions(+), 61 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d8d601e92..06c073565 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,6 +47,11 @@ repos: hooks: - id: flake8 + - repo: https://github.com/tox-dev/pyproject-fmt + rev: "2.0.4" + hooks: + - id: pyproject-fmt + ci: autoupdate_schedule: weekly skip: [] diff --git a/pyproject.toml b/pyproject.toml index 6e68762f7..04d40a217 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,35 +1,68 @@ -# ==== pytest ==== -[tool.pytest.ini_options] -addopts = "-v --tb=short" -norecursedirs = [ - ".tox", - ".git", - "*/migrations/*", - "*/static/*", - "docs", - "venv", - "*/{{cookiecutter.project_slug}}/*", +[project] +name = "cookiecutter-django" +version = "2024.09.05" +description = "A Cookiecutter template for creating production-ready Django projects quickly." +readme = "README.md" +keywords = [ + "cookiecutter", + "django", + "project template", + "scaffolding", + "skeleton", ] +license = { text = "BSD" } +authors = [ + { name = "Daniel Roy Greenfeld", email = "pydanny@gmail.com" }, +] +requires-python = "==3.12" +classifiers = [ + "Development Status :: 4 - Beta", + "Environment :: Console", + "Framework :: Django :: 5.0", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "Natural Language :: English", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: Implementation :: CPython", + "Topic :: Software Development", +] +urls = { Repository = "https://github.com/cookiecutter/cookiecutter-django" } - -# ==== black ==== [tool.black] line-length = 119 -target-version = ['py312'] - +target-version = [ + 'py312', +] # ==== isort ==== + [tool.isort] profile = "black" line_length = 119 known_first_party = [ - "tests", - "scripts", - "hooks", + "tests", + "scripts", + "hooks", ] - # ==== djLint ==== + +[tool.pytest.ini_options] +addopts = "-v --tb=short" +norecursedirs = [ + ".tox", + ".git", + "*/migrations/*", + "*/static/*", + "docs", + "venv", + "*/{{cookiecutter.project_slug}}/*", +] + +# ==== black ==== + [tool.djlint] blank_line_after_tag = "load,extends" close_void_tags = true diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py index 5f3ad5ec3..9909b1eee 100644 --- a/scripts/update_changelog.py +++ b/scripts/update_changelog.py @@ -47,7 +47,7 @@ def main() -> None: print(f"Wrote {changelog_path}") # Update version - setup_py_path = ROOT / "setup.py" + setup_py_path = ROOT / "pyproject.toml" update_version(setup_py_path, release) print(f"Updated version in {setup_py_path}") diff --git a/setup.py b/setup.py index d4762ae39..e69de29bb 100644 --- a/setup.py +++ b/setup.py @@ -1,41 +0,0 @@ -#!/usr/bin/env python -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - -# We use calendar versioning -version = "2024.09.05" - -with open("README.md") as readme_file: - long_description = readme_file.read() - -setup( - name="cookiecutter-django", - version=version, - description=("A Cookiecutter template for creating production-ready " "Django projects quickly."), - long_description=long_description, - author="Daniel Roy Greenfeld", - author_email="pydanny@gmail.com", - url="https://github.com/cookiecutter/cookiecutter-django", - packages=[], - license="BSD", - zip_safe=False, - classifiers=[ - "Development Status :: 4 - Beta", - "Environment :: Console", - "Framework :: Django :: 5.0", - "Intended Audience :: Developers", - "Natural Language :: English", - "License :: OSI Approved :: BSD License", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: Implementation :: CPython", - "Topic :: Software Development", - ], - keywords=( - "cookiecutter, Python, projects, project templates, django, " - "skeleton, scaffolding, project directory, setup.py" - ), -) From d6f18f04a9a2f3c0b7c85b783b8f360fbcb453e5 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Fri, 6 Sep 2024 17:30:55 +0200 Subject: [PATCH 08/26] Remove empty setup.py and references to it (#5355) --- scripts/update_changelog.py | 2 +- setup.py | 0 tox.ini | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 setup.py diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py index 9909b1eee..988370e43 100644 --- a/scripts/update_changelog.py +++ b/scripts/update_changelog.py @@ -124,7 +124,7 @@ def write_changelog(file_path: Path, release: str, content: str) -> None: def update_version(file_path: Path, release: str) -> None: - """Update template version in setup.py.""" + """Update template version in pyproject.toml.""" old_content = file_path.read_text() updated_content = re.sub( r'\nversion = "\d+\.\d+\.\d+"\n', diff --git a/setup.py b/setup.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tox.ini b/tox.ini index 3b7a95088..a1034eb3d 100644 --- a/tox.ini +++ b/tox.ini @@ -9,4 +9,4 @@ commands = pytest -n auto {posargs:./tests} [testenv:black-template] deps = black -commands = black --check hooks tests setup.py docs scripts +commands = black --check hooks tests docs scripts From 1a2bcc5c47378d721af65d12aa59a1f8a8f6b1b5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 7 Sep 2024 02:21:48 +0000 Subject: [PATCH 09/26] Release 2024.09.06 --- CHANGELOG.md | 11 +++++++++++ pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8ba79a48..174214506 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.06 + + +### Updated + +- Update ruff to 0.6.4 ([#5354](https://github.com/cookiecutter/cookiecutter-django/pull/5354)) + +- Update django-allauth to 64.2.1 ([#5352](https://github.com/cookiecutter/cookiecutter-django/pull/5352)) + +- Auto-update pre-commit hooks ([#5353](https://github.com/cookiecutter/cookiecutter-django/pull/5353)) + ## 2024.09.05 diff --git a/pyproject.toml b/pyproject.toml index 04d40a217..93b367947 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.05" +version = "2024.09.06" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From ab84c2181acf5fb0dc1329cb8749a108f23256a5 Mon Sep 17 00:00:00 2001 From: rxm7706 <95496360+rxm7706@users.noreply.github.com> Date: Sat, 7 Sep 2024 18:44:46 -0500 Subject: [PATCH 10/26] Fix Requires Python to allow minor versions (#5360) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 93b367947..73a67e3fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ license = { text = "BSD" } authors = [ { name = "Daniel Roy Greenfeld", email = "pydanny@gmail.com" }, ] -requires-python = "==3.12" +requires-python = ">=3.12" classifiers = [ "Development Status :: 4 - Beta", "Environment :: Console", From e956b831a5e9b0ed32e072af6b69cd92543a4973 Mon Sep 17 00:00:00 2001 From: foarsitter Date: Sat, 7 Sep 2024 23:45:21 +0000 Subject: [PATCH 11/26] 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 15e7b84ba..21284ce93 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1628,5 +1628,10 @@ "name": "Will", "github_login": "novucs", "twitter_username": "" + }, + { + "name": "rxm7706", + "github_login": "rxm7706", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 75f2d832d..df7293128 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1923,6 +1923,13 @@ Listed in alphabetical order. + + rxm7706 + + rxm7706 + + + Ryan Fitch From a437e493b1bfae987a2b546174e14086002fe220 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 8 Sep 2024 02:27:07 +0000 Subject: [PATCH 12/26] Release 2024.09.07 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 174214506..78051652e 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.07 + + +### Changed + +- Fix Requires Python to allow minor versions ([#5360](https://github.com/cookiecutter/cookiecutter-django/pull/5360)) + ## 2024.09.06 diff --git a/pyproject.toml b/pyproject.toml index 73a67e3fe..04ca2f22a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.06" +version = "2024.09.07" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 66ebc4ecaa460e2fd810532bfbc46703c9eaa02c Mon Sep 17 00:00:00 2001 From: Marlon Castillo Date: Sun, 8 Sep 2024 15:22:16 +0000 Subject: [PATCH 13/26] Remove storages from `INSTALLED_APPS` (#5361) "storages" does not need to be added to INSTALLED_APPS: https://github.com/jschneier/django-storages/pull/547 --- {{cookiecutter.project_slug}}/config/settings/production.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 706d04e0a..034d588e0 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -78,12 +78,6 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool( default=True, ) -{% if cookiecutter.cloud_provider != 'None' -%} -# STORAGES -# ------------------------------------------------------------------------------ -# https://django-storages.readthedocs.io/en/latest/#installation -INSTALLED_APPS += ["storages"] -{%- endif -%} {% if cookiecutter.cloud_provider == 'AWS' %} # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings AWS_ACCESS_KEY_ID = env("DJANGO_AWS_ACCESS_KEY_ID") From ef53145219e948d132619a08a7faddd62c9142c4 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 8 Sep 2024 15:22:51 +0000 Subject: [PATCH 14/26] 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 21284ce93..b135fe90f 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1633,5 +1633,10 @@ "name": "rxm7706", "github_login": "rxm7706", "twitter_username": "" + }, + { + "name": "Marlon Castillo", + "github_login": "mcastle", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index df7293128..b913b67f3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1468,6 +1468,13 @@ Listed in alphabetical order. + + Marlon Castillo + + mcastle + + + Martin Blech From 1f7fa64df575329297f5dd83b0adfd94237dd00b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 8 Sep 2024 09:28:06 -0700 Subject: [PATCH 15/26] Update tox from 4.18.0 to 4.18.1 (#5358) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 67e61da56..e3fa7a89c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.8.0 # Testing # ------------------------------------------------------------------------------ -tox==4.18.0 +tox==4.18.1 pytest==8.3.2 pytest-xdist==3.6.1 pytest-cookies==0.7.0 From 8559078fd4e055932355ea73a368cd735b557d54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 17:28:34 +0100 Subject: [PATCH 16/26] Auto-update pre-commit hooks (#5357) --- .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 06c073565..39b8802aa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,7 @@ repos: - id: flake8 - repo: https://github.com/tox-dev/pyproject-fmt - rev: "2.0.4" + rev: "2.2.1" hooks: - id: pyproject-fmt From 2c90ff55a3beb9cd9c09b3d1cd07c1d95ce8c159 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 9 Sep 2024 02:26:25 +0000 Subject: [PATCH 17/26] Release 2024.09.08 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78051652e..315e050b3 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.08 + + +### Changed + +- Remove "storages" from `INSTALLED_APPS` ([#5361](https://github.com/cookiecutter/cookiecutter-django/pull/5361)) + ## 2024.09.07 diff --git a/pyproject.toml b/pyproject.toml index 04ca2f22a..17822d88d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.07" +version = "2024.09.08" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 3e253ccb1a0139be7d0aef7863170300ab378527 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:12:09 +0100 Subject: [PATCH 18/26] Auto-update pre-commit hooks (#5362) 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 39b8802aa..21b4ff216 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,7 @@ repos: - id: flake8 - repo: https://github.com/tox-dev/pyproject-fmt - rev: "2.2.1" + rev: "2.2.3" hooks: - id: pyproject-fmt From ab36a6112e6c92f7966ec6ef0d82066cc6cdd6e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:27:35 +0100 Subject: [PATCH 19/26] Bump tiangolo/issue-manager from 0.5.0 to 0.5.1 (#5364) --- .github/workflows/issue-manager.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml index 103612cfe..42579d06e 100644 --- a/.github/workflows/issue-manager.yml +++ b/.github/workflows/issue-manager.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: tiangolo/issue-manager@0.5.0 + - uses: tiangolo/issue-manager@0.5.1 with: token: ${{ secrets.GITHUB_TOKEN }} config: > From 8f8f87df51767b58f67697dc5c9091fce6df3341 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 9 Sep 2024 07:54:22 -0700 Subject: [PATCH 20/26] Update sentry-sdk to 2.14.0 (#5365) --- {{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 824927ca6..ce52c2e01 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.13.0 # https://github.com/getsentry/sentry-python +sentry-sdk==2.14.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 50a8c2b498f33ee3f8236d229aefa784e098f302 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 10 Sep 2024 02:24:49 +0000 Subject: [PATCH 21/26] Release 2024.09.09 --- CHANGELOG.md | 7 +++++++ pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 315e050b3..aedb99d90 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.09 + + +### Updated + +- Update sentry-sdk to 2.14.0 ([#5365](https://github.com/cookiecutter/cookiecutter-django/pull/5365)) + ## 2024.09.08 diff --git a/pyproject.toml b/pyproject.toml index 17822d88d..70e15a616 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cookiecutter-django" -version = "2024.09.08" +version = "2024.09.09" description = "A Cookiecutter template for creating production-ready Django projects quickly." readme = "README.md" keywords = [ From 9f1037ab1844b1e789dcb869ff6658e5a5808b08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:04:37 +0100 Subject: [PATCH 22/26] Bump python to 3.12.6 in docs Docker image (#5369) --- {{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 49e25cba9..ed1b1dd2a 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.5-slim-bookworm AS python +FROM docker.io/python:3.12.6-slim-bookworm AS python # Python build stage From 40de2dea1d9734c49f20c80a2272d8c550f9c265 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:04:55 +0100 Subject: [PATCH 23/26] Bump python to 3.12.6 in production Docker (#5367) --- .../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 3e0859c24..86aae67d5 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.5-slim-bookworm AS python +FROM docker.io/python:3.12.6-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From 4865e056c552400331e903b9498022ccbd14a13b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:05:08 +0100 Subject: [PATCH 24/26] Bump python to 3.12.6 in local Docker (#5370) --- {{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 ddec2d4e7..fbb62e239 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.5-slim-bookworm AS python +FROM docker.io/python:3.12.6-slim-bookworm AS python # Python build stage FROM python AS python-build-stage From d841c79d48a7e956b81d48a13b6bc4dfcc5bba94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:07:45 +0100 Subject: [PATCH 25/26] Bump concurrently from 8.2.2 to 9.0.0 (#5363) --- {{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 a93b3fa5f..915e29b78 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -11,7 +11,7 @@ "browser-sync": "^3.0.2", "css-loader": "^7.1.2", "gulp-concat": "^2.6.1", - "concurrently": "^8.0.1", + "concurrently": "^9.0.0", "cssnano": "^7.0.0", "gulp": "^4.0.2", "gulp-imagemin": "^7.1.0", From e567d058b319dcce73805abf076d3887534863a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:09:16 +0100 Subject: [PATCH 26/26] Bump postcss-preset-env from 9.6.0 to 10.0.3 (#5368) --- {{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 915e29b78..94861c4eb 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -25,7 +25,7 @@ "pixrem": "^5.0.0", "postcss": "^8.3.11", "postcss-loader": "^8.0.0", - "postcss-preset-env": "^9.0.0", + "postcss-preset-env": "^10.0.3", "sass": "^1.43.4", "sass-loader": "^16.0.1", "webpack": "^5.65.0",