From 83ceb39b50355d92f0f164b30f2c6fbca5ed36f2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 6 Apr 2024 02:10:14 +0000 Subject: [PATCH 01/13] Release 2024.04.05 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f7624ab3..e8fb2c4c6 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.04.05 + + +### Updated + +- Update django-webpack-loader to 3.1.0 ([#4965](https://github.com/cookiecutter/cookiecutter-django/pull/4965)) + ## 2024.04.03 diff --git a/setup.py b/setup.py index a9369e7ab..8dce27d0d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.04.03" +version = "2024.04.05" with open("README.md") as readme_file: long_description = readme_file.read() From 8060df4c518fd4742db05419ddd720314df85444 Mon Sep 17 00:00:00 2001 From: Arnav Choudhury Date: Sat, 6 Apr 2024 14:01:30 +0530 Subject: [PATCH 02/13] Fix syntax error in GitHub CI workflow (#4972) --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 8bd0e3307..4e6ec1cd2 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -70,7 +70,9 @@ jobs: - name: Build the Stack run: docker compose -f local.yml build django - run: docker compose -f local.yml build docs + + - name: Build the docs + run: docker compose -f docs.yml build docs - name: Run DB Migrations run: docker compose -f local.yml run --rm django python manage.py migrate From b99ad3986211b0366e269a970a5f7eaa40da24e2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 7 Apr 2024 02:13:12 +0000 Subject: [PATCH 03/13] Release 2024.04.06 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8fb2c4c6..bc97ee417 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.04.06 + + +### Fixed + +- Fix syntax error in GitHub CI workflow ([#4972](https://github.com/cookiecutter/cookiecutter-django/pull/4972)) + ## 2024.04.05 diff --git a/setup.py b/setup.py index 8dce27d0d..85f58e163 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.04.05" +version = "2024.04.06" with open("README.md") as readme_file: long_description = readme_file.read() From eae5c9c1cdd11822cf6cbadc7974eef95eec5832 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 7 Apr 2024 09:11:22 +0200 Subject: [PATCH 04/13] Auto-update pre-commit hooks (#4974) 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 9d0fd0f25..61924dfad 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index ece70ffe7..b1725ebc4 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -6,7 +6,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer From 681c13e0fa2a51b65c7026f0d431d34327cf8578 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 8 Apr 2024 02:12:34 +0000 Subject: [PATCH 05/13] Release 2024.04.07 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc97ee417..8a542d9f1 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.04.07 + + +### Updated + +- Auto-update pre-commit hooks ([#4974](https://github.com/cookiecutter/cookiecutter-django/pull/4974)) + ## 2024.04.06 diff --git a/setup.py b/setup.py index 85f58e163..de4fd53b4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.04.06" +version = "2024.04.07" with open("README.md") as readme_file: long_description = readme_file.read() From 5916cf0d3075f79947c4a6e2cd4a2fef1170af63 Mon Sep 17 00:00:00 2001 From: farwill Date: Tue, 9 Apr 2024 21:53:08 +0800 Subject: [PATCH 06/13] Fix start command for docs (#4978) --- docs/document.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/document.rst b/docs/document.rst index 26f5d56a1..f93f2b60e 100644 --- a/docs/document.rst +++ b/docs/document.rst @@ -11,7 +11,7 @@ After you have set up to `develop locally`_, run the following command from the If you set up your project to `develop locally with docker`_, run the following command: :: - $ docker compose -f local.yml up docs + $ docker compose -f docs.yml up Navigate to port 9000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. From 0e63336ddb4a0ac070ecad81ce86c010c867641b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 9 Apr 2024 13:53:53 +0000 Subject: [PATCH 07/13] 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 eebde5e91..e7bee5dee 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1553,5 +1553,10 @@ "name": "David Păcioianu", "github_login": "DavidPacioianu", "twitter_username": "" + }, + { + "name": "farwill", + "github_login": "farwill", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b30e27e7b..a8a09b098 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -817,6 +817,13 @@ Listed in alphabetical order. fabaff + + farwill + + farwill + + + Fateme Fouladkar From f6081a32f750edaf4220b57f5d935b06006f9b26 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 Apr 2024 02:11:37 +0000 Subject: [PATCH 08/13] Release 2024.04.09 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a542d9f1..f38c91025 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.04.09 + + +### Documentation + +- Fix start command for docs ([#4978](https://github.com/cookiecutter/cookiecutter-django/pull/4978)) + ## 2024.04.07 diff --git a/setup.py b/setup.py index de4fd53b4..3cec71606 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.04.07" +version = "2024.04.09" with open("README.md") as readme_file: long_description = readme_file.read() From d8ade3be0d4084343194455ec960d83ad5b4da33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:14:10 +0100 Subject: [PATCH 09/13] Bump python from 3.12.2 to 3.12.3 in production (#4980) Bumps python from 3.12.2-slim-bookworm to 3.12.3-slim-bookworm. --- updated-dependencies: - dependency-name: python 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> --- .../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 19b2cb0aa..671eb4635 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.2-slim-bookworm as python +FROM docker.io/python:3.12.3-slim-bookworm as python # Python build stage FROM python as python-build-stage From df0d91c87303b0922fb884916d0e104d31f4f03b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:14:26 +0100 Subject: [PATCH 10/13] Bump python from 3.12.2 to 3.12.3 in local (#4981) Bumps python from 3.12.2-slim-bookworm to 3.12.3-slim-bookworm. --- updated-dependencies: - dependency-name: python 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/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 0897ab95d..88ccb7491 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.2-slim-bookworm as python +FROM docker.io/python:3.12.3-slim-bookworm as python # Python build stage FROM python as python-build-stage From 8492ebe631febb48e2cbbc5aadb54174a0b59ed3 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 10 Apr 2024 09:16:14 +0100 Subject: [PATCH 11/13] Update Heroku runtime from Python 3.12.2 to Python 3.12.3 --- {{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 6e797d468..4ddc7cd66 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.12.2 +python-3.12.3 From 8a2eb3142f7cd3befef099c94a096aa57e8804ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:15:26 +0100 Subject: [PATCH 12/13] Bump python in /{{cookiecutter.project_slug}}/compose/local/docs (#4979) Bumps python from 3.12.2-slim-bookworm to 3.12.3-slim-bookworm. --- updated-dependencies: - dependency-name: python 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> Co-authored-by: Bruno Alla --- {{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 9251effba..35565042d 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.2-slim-bookworm as python +FROM docker.io/python:3.12.3-slim-bookworm as python # Python build stage From 7d032d730383ed8af6fef130bde2dedc06f9332a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 11 Apr 2024 02:12:36 +0000 Subject: [PATCH 13/13] Release 2024.04.10 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f38c91025..781dfc848 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.04.10 + + +### Updated + +- Bump python from 3.12.2 to 3.12.3 in docs ([#4979](https://github.com/cookiecutter/cookiecutter-django/pull/4979)) + +- Bump python from 3.12.2 to 3.12.3 in local ([#4981](https://github.com/cookiecutter/cookiecutter-django/pull/4981)) + +- Bump python from 3.12.2 to 3.12.3 in production ([#4980](https://github.com/cookiecutter/cookiecutter-django/pull/4980)) + ## 2024.04.09 diff --git a/setup.py b/setup.py index 3cec71606..9cd064a0f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2024.04.09" +version = "2024.04.10" with open("README.md") as readme_file: long_description = readme_file.read()