From c415c47bfb9527261c2228550634e8d599c88f8c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Apr 2023 02:10:28 +0000 Subject: [PATCH 01/14] Release 2023.04.04 --- CHANGELOG.md | 12 ++++++++++++ setup.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 872748fd3..af38a3e38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,18 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.04 + +### Changed +- Upgrade to Django 4.1 ([#4028](https://github.com/cookiecutter/cookiecutter-django/pull/4028)) +- Remove deprecated security setting ([#4247](https://github.com/cookiecutter/cookiecutter-django/pull/4247)) +### Fixed +- Replace `runserver_plus` with `runserver` ([#4255](https://github.com/cookiecutter/cookiecutter-django/pull/4255)) +- Fix traefik rule priority for media router ([#4244](https://github.com/cookiecutter/cookiecutter-django/pull/4244)) +### Updated +- Update sentry-sdk to 1.19.0 ([#4254](https://github.com/cookiecutter/cookiecutter-django/pull/4254)) +- Update django-debug-toolbar to 4.0.0 ([#4251](https://github.com/cookiecutter/cookiecutter-django/pull/4251)) + ## 2023.04.03 ### Changed diff --git a/setup.py b/setup.py index 8155fd234..c01cf9684 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.03" +version = "2023.04.04" with open("README.rst") as readme_file: long_description = readme_file.read() From 82b5137a93cb7ea98cf5163c2762b12eabfadbd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 10:32:38 +0100 Subject: [PATCH 02/14] Bump peter-evans/create-pull-request from 4 to 5 (#4257) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .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 1708e8b82..c822da30d 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@v4 + uses: peter-evans/create-pull-request@v5 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From ddd8f1c45d72ce147a940d5e532bf065dcf8a7b2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 5 Apr 2023 08:57:17 -0500 Subject: [PATCH 03/14] Update pre-commit to 3.2.2 (#4259) * Update pre-commit from 3.2.1 to 3.2.2 * Update pre-commit from 3.2.1 to 3.2.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 d635f79a9..dfd303729 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.3.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==3.2.1 +pre-commit==3.2.2 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 9503b19d4..4195114ec 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,7 +36,7 @@ pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==3.2.1 # https://github.com/pre-commit/pre-commit +pre-commit==3.2.2 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 782cee375685456f16f82a63cbf635fa100940b6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 5 Apr 2023 08:57:59 -0500 Subject: [PATCH 04/14] Update django to 4.1.8 (#4258) --- {{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 6cce06457..0fdee1f86 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.21.1 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==4.1.7 # pyup: < 4.2 # https://www.djangoproject.com/ +django==4.1.8 # pyup: < 4.2 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.54.0 # https://github.com/pennersr/django-allauth From a607284e1ff92093533ea1d7feedd40f0ead3b49 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 5 Apr 2023 21:32:05 +0100 Subject: [PATCH 05/14] Update indent for nginx config file (#4260) --- {{cookiecutter.project_slug}}/.editorconfig | 2 +- .../compose/production/nginx/default.conf | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig index 6a9a5c45d..c0ce34260 100644 --- a/{{cookiecutter.project_slug}}/.editorconfig +++ b/{{cookiecutter.project_slug}}/.editorconfig @@ -22,6 +22,6 @@ trim_trailing_whitespace = false [Makefile] indent_style = tab -[nginx.conf] +[default.conf] indent_style = space indent_size = 2 diff --git a/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf b/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf index aafdd5bee..562dba86c 100644 --- a/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf +++ b/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf @@ -1,7 +1,7 @@ server { - listen 80; - server_name localhost; - location /media/ { - alias /usr/share/nginx/media/; - } + listen 80; + server_name localhost; + location /media/ { + alias /usr/share/nginx/media/; + } } From d9efb28da3209b6209b80046f7b62df84eeac248 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 5 Apr 2023 17:53:48 -0500 Subject: [PATCH 06/14] Update tox from 4.4.8 to 4.4.11 (#4262) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index dfd303729..24c4307be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.2.2 # Testing # ------------------------------------------------------------------------------ -tox==4.4.8 +tox==4.4.11 pytest==7.2.2 pytest-cookies==0.7.0 pytest-instafail==0.5.0 From 606e0a768531951db7a69939995367d08b5aa1ab Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 6 Apr 2023 02:17:42 +0000 Subject: [PATCH 07/14] Release 2023.04.05 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af38a3e38..43841c8a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.05 + +### Changed +- Update indent for nginx config file ([#4260](https://github.com/cookiecutter/cookiecutter-django/pull/4260)) +### Updated +- Update tox to 4.4.11 ([#4262](https://github.com/cookiecutter/cookiecutter-django/pull/4262)) +- Update django to 4.1.8 ([#4258](https://github.com/cookiecutter/cookiecutter-django/pull/4258)) +- Update pre-commit to 3.2.2 ([#4259](https://github.com/cookiecutter/cookiecutter-django/pull/4259)) + ## 2023.04.04 ### Changed diff --git a/setup.py b/setup.py index c01cf9684..3e94895d0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.04" +version = "2023.04.05" with open("README.rst") as readme_file: long_description = readme_file.read() From 73b16539d4308853edc1d9e92a880061c13b7965 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Apr 2023 08:33:13 +0100 Subject: [PATCH 08/14] Upgrade traefik to 2.9.10 (#4267) --- updated-dependencies: - dependency-name: traefik 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/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 2b146cc63..7b053059d 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM traefik:2.9.9 +FROM traefik:2.9.10 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From a905fb25f7bf6580b74b604656f96952f3067908 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 8 Apr 2023 02:14:38 +0000 Subject: [PATCH 09/14] Release 2023.04.07 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43841c8a3..9c8c39c2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.07 + +### Updated +- Upgrade traefik to 2.9.10 ([#4267](https://github.com/cookiecutter/cookiecutter-django/pull/4267)) + ## 2023.04.05 ### Changed diff --git a/setup.py b/setup.py index 3e94895d0..c844f0954 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.05" +version = "2023.04.07" with open("README.rst") as readme_file: long_description = readme_file.read() From ea1b6861312224404a9c00b70361f005ecf23eda Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 10 Apr 2023 05:09:01 -0500 Subject: [PATCH 10/14] Update pytest to 7.3.0 (#4268) * Update pytest from 7.2.2 to 7.3.0 * Update pytest from 7.2.2 to 7.3.0 --- 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 24c4307be..0dc82fc75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.2.2 # Testing # ------------------------------------------------------------------------------ tox==4.4.11 -pytest==7.2.2 +pytest==7.3.0 pytest-cookies==0.7.0 pytest-instafail==0.5.0 pyyaml==6.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4195114ec..298328947 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.1.1 # https://github.com/python/mypy django-stubs==1.16.0 # https://github.com/typeddjango/django-stubs -pytest==7.2.2 # https://github.com/pytest-dev/pytest +pytest==7.3.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.10.0 # https://github.com/typeddjango/djangorestframework-stubs From 436233e8ba4c26770d60fad95718f288eff9a837 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 10 Apr 2023 09:36:59 -0500 Subject: [PATCH 11/14] Update pytest-sugar from 0.9.6 to 0.9.7 (#4269) --- {{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 298328947..a11238013 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -16,7 +16,7 @@ watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles mypy==1.1.1 # https://github.com/python/mypy django-stubs==1.16.0 # https://github.com/typeddjango/django-stubs pytest==7.3.0 # https://github.com/pytest-dev/pytest -pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar +pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.10.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} From e37192a08155fe61b8e393f1d62a756a3c84ee6f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 11 Apr 2023 02:17:41 +0000 Subject: [PATCH 12/14] Release 2023.04.10 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c8c39c2f..d51abdb58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.10 + +### Updated +- Update pytest-sugar to 0.9.7 ([#4269](https://github.com/cookiecutter/cookiecutter-django/pull/4269)) +- Update pytest to 7.3.0 ([#4268](https://github.com/cookiecutter/cookiecutter-django/pull/4268)) + ## 2023.04.07 ### Updated diff --git a/setup.py b/setup.py index c844f0954..8d26629f0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.07" +version = "2023.04.10" with open("README.rst") as readme_file: long_description = readme_file.read() From 3ddfda45b83e50cf6bb84bd8e85ae24978193f4d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 13 Apr 2023 18:38:50 -0500 Subject: [PATCH 13/14] Update tox from 4.4.11 to 4.4.12 (#4271) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0dc82fc75..c336c648d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.2.2 # Testing # ------------------------------------------------------------------------------ -tox==4.4.11 +tox==4.4.12 pytest==7.3.0 pytest-cookies==0.7.0 pytest-instafail==0.5.0 From 2571f4a994504ee8fe773ddab3c734dfeac2d880 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 14 Apr 2023 02:17:00 +0000 Subject: [PATCH 14/14] Release 2023.04.13 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d51abdb58..415b29a2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.13 + +### Updated +- Update tox to 4.4.12 ([#4271](https://github.com/cookiecutter/cookiecutter-django/pull/4271)) + ## 2023.04.10 ### Updated diff --git a/setup.py b/setup.py index 8d26629f0..d168cd13a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.10" +version = "2023.04.13" with open("README.rst") as readme_file: long_description = readme_file.read()