From 7abf93616f70737de9e280503bf1805cadf65092 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 9 May 2023 02:19:03 +0000 Subject: [PATCH 01/94] Release 2023.05.08 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bccf5bb1e..df851ccb2 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.05.08 + + +### Updated + +- Auto-update pre-commit hooks ([#4320](https://github.com/cookiecutter/cookiecutter-django/pull/4320)) + +- Update sentry-sdk to 1.22.2 ([#4321](https://github.com/cookiecutter/cookiecutter-django/pull/4321)) + ## 2023.05.04 diff --git a/setup.py b/setup.py index ad838117f..39d4532e4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.04" +version = "2023.05.08" with open("README.rst") as readme_file: long_description = readme_file.read() From a06298121355ef0a9954982d289f1610a42496e0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 9 May 2023 11:31:35 -0500 Subject: [PATCH 02/94] Update werkzeug from 2.3.3 to 2.3.4 (#4325) --- {{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 0fb0bce9d..f5fc21d49 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r base.txt -Werkzeug[watchdog]==2.3.3 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.3.4 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 From b2de9cc5d9d0be82ebaa59e09c99cf5ceb8cfdf8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 9 May 2023 11:31:48 -0500 Subject: [PATCH 03/94] Update pygithub from 1.58.1 to 1.58.2 (#4326) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a92562508..2b4736def 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.58.1 +PyGithub==1.58.2 gitpython==3.1.31 jinja2==3.1.2 requests==2.30.0 From b5717dd82ba5d4c72cfc2214ad8a4843c862aa18 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 May 2023 02:17:49 +0000 Subject: [PATCH 04/94] Release 2023.05.09 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df851ccb2..39e3c2037 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.05.09 + + +### Updated + +- Update werkzeug to 2.3.4 ([#4325](https://github.com/cookiecutter/cookiecutter-django/pull/4325)) + ## 2023.05.08 diff --git a/setup.py b/setup.py index 39d4532e4..79e73e17a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.08" +version = "2023.05.09" with open("README.rst") as readme_file: long_description = readme_file.read() From 54d78f733ef97e3077418affa54cac7b74dbb35d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 14 May 2023 21:56:17 +0100 Subject: [PATCH 05/94] Use single quotes in pre-commit config --- {{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 44e2cd349..3a0411d81 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -25,10 +25,10 @@ repos: exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/adamchainz/django-upgrade - rev: "1.13.0" + rev: '1.13.0' hooks: - id: django-upgrade - args: ["--target-version", "4.1"] + args: ['--target-version', '4.1'] - repo: https://github.com/asottile/pyupgrade rev: v3.4.0 From f76c2afb0c2f5200d99c2bf958c391ff8082cefe Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 May 2023 13:14:07 -0500 Subject: [PATCH 06/94] Update pytest-xdist from 3.2.1 to 3.3.0 (#4336) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2b4736def..459172945 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pre-commit==3.3.1 # ------------------------------------------------------------------------------ tox==4.5.1 pytest==7.3.1 -pytest-xdist==3.2.1 +pytest-xdist==3.3.0 pytest-cookies==0.7.0 pytest-instafail==0.5.0 pyyaml==6.0 From 36b92f4f0d4e0943c692bb58550f749e0d98a6b7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 May 2023 14:36:17 -0500 Subject: [PATCH 07/94] Update sentry-sdk from 1.22.2 to 1.23.0 (#4337) --- {{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 7c22dcd6f..6ea48f78e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.22.2 # https://github.com/getsentry/sentry-python +sentry-sdk==1.23.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py From 8ec0f365876c212bee11e16497886ad3b7db4f33 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 May 2023 15:21:25 -0500 Subject: [PATCH 08/94] Update django-cors-headers from 3.14.0 to 4.0.0 (#4329) --- {{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 59a82b398..0c4b58bf2 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,7 +41,7 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework -django-cors-headers==3.14.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==4.0.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation drf-spectacular==0.26.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 3949f7392284181eb973eea7133a341ff0021aed Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 May 2023 18:33:36 -0500 Subject: [PATCH 09/94] Update sh to 2.0.4 (#4338) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 459172945..f308aef60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==2.1.1 -sh==2.0.3; sys_platform != "win32" +sh==2.0.4; sys_platform != "win32" binaryornot==0.4.4 # Code quality From d3d19264d7236dc704273a555e3741b26d0f848a Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 16 May 2023 02:19:27 +0000 Subject: [PATCH 10/94] Release 2023.05.15 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39e3c2037..16b0786d7 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.05.15 + + +### Updated + +- Update django-cors-headers to 4.0.0 ([#4329](https://github.com/cookiecutter/cookiecutter-django/pull/4329)) + +- Update sentry-sdk to 1.23.0 ([#4337](https://github.com/cookiecutter/cookiecutter-django/pull/4337)) + ## 2023.05.09 diff --git a/setup.py b/setup.py index 79e73e17a..f1933ad27 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.09" +version = "2023.05.15" with open("README.rst") as readme_file: long_description = readme_file.read() From 3bd669a80d2fd2bc10b2a8b9288f1d47121f4d09 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 17 May 2023 14:03:03 -0500 Subject: [PATCH 11/94] Update sentry-sdk from 1.23.0 to 1.23.1 (#4341) --- {{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 6ea48f78e..5c140ff6f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.23.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.23.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py From bc2d4ed80d781f89d8f6b8ee191e38edcfaea17e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 18 May 2023 02:18:40 +0000 Subject: [PATCH 12/94] Release 2023.05.17 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16b0786d7..20e34019e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.05.17 + + +### Updated + +- Update sentry-sdk to 1.23.1 ([#4341](https://github.com/cookiecutter/cookiecutter-django/pull/4341)) + ## 2023.05.15 diff --git a/setup.py b/setup.py index f1933ad27..da8ffb55a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.15" +version = "2023.05.17" with open("README.rst") as readme_file: long_description = readme_file.read() From 6f308d4e503359856d7d2bbc0a83cbfb686a564c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 18 May 2023 11:29:05 -0500 Subject: [PATCH 13/94] Update pre-commit to 3.3.2 (#4342) * Update pre-commit from 3.3.1 to 3.3.2 * Update pre-commit from 3.3.1 to 3.3.2 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f308aef60..c924285e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.3.0 isort==5.12.0 flake8==6.0.0 django-upgrade==1.13.0 -pre-commit==3.3.1 +pre-commit==3.3.2 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index f5fc21d49..89a3b3b42 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.3.1 # https://github.com/pre-commit/pre-commit +pre-commit==3.3.2 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 7a35191a76f2ce6b4b0709d004580e17ce626601 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 19 May 2023 02:18:55 +0000 Subject: [PATCH 14/94] Release 2023.05.18 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20e34019e..1fcdedef9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.05.18 + + +### Updated + +- Update pre-commit to 3.3.2 ([#4342](https://github.com/cookiecutter/cookiecutter-django/pull/4342)) + ## 2023.05.17 diff --git a/setup.py b/setup.py index da8ffb55a..6adcd3657 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.17" +version = "2023.05.18" with open("README.rst") as readme_file: long_description = readme_file.read() From b0d8916e61d4456ef8a41ee49011c8d20edaab2e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 23 May 2023 07:39:38 -0500 Subject: [PATCH 15/94] Update requests from 2.30.0 to 2.31.0 (#4346) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c924285e3..f37b6fef5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,4 +24,4 @@ pyyaml==6.0 PyGithub==1.58.2 gitpython==3.1.31 jinja2==3.1.2 -requests==2.30.0 +requests==2.31.0 From 52c2b0575c73e6414e0bbb2b9fb7a84b5f00dc51 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 23 May 2023 07:40:07 -0500 Subject: [PATCH 16/94] Update pytest-xdist from 3.3.0 to 3.3.1 (#4344) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f37b6fef5..c06987a2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pre-commit==3.3.2 # ------------------------------------------------------------------------------ tox==4.5.1 pytest==7.3.1 -pytest-xdist==3.3.0 +pytest-xdist==3.3.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 pyyaml==6.0 From 2dab4630dfd66072c6f4fec3e287333a2de31aef Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 23 May 2023 07:42:30 -0500 Subject: [PATCH 17/94] Update django-webpack-loader from 1.8.1 to 2.0.0 (#4345) --- {{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 0c4b58bf2..ee00cda7b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -46,5 +46,5 @@ django-cors-headers==4.0.0 # https://github.com/adamchainz/django-cors-headers drf-spectacular==0.26.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} {%- if cookiecutter.frontend_pipeline == 'Webpack' %} -django-webpack-loader==1.8.1 # https://github.com/django-webpack/django-webpack-loader +django-webpack-loader==2.0.0 # https://github.com/django-webpack/django-webpack-loader {%- endif %} From 60a3ee78b891ee5a372f4e1267732ee7e369d9ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 12:32:48 -0300 Subject: [PATCH 18/94] Bump webpack-bundle-tracker in /{{cookiecutter.project_slug}} (#4347) Bumps [webpack-bundle-tracker](https://github.com/django-webpack/webpack-bundle-tracker) from 1.8.1 to 2.0.0. - [Release notes](https://github.com/django-webpack/webpack-bundle-tracker/releases) - [Commits](https://github.com/django-webpack/webpack-bundle-tracker/compare/1.8.1...2.0.0) --- updated-dependencies: - dependency-name: webpack-bundle-tracker dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{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 affcd2e01..fdfd26bf3 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -29,7 +29,7 @@ "sass": "^1.43.4", "sass-loader": "^13.2.0", "webpack": "^5.65.0", - "webpack-bundle-tracker": "^1.4.0", + "webpack-bundle-tracker": "^2.0.0", "webpack-cli": "^5.0.1", "webpack-dev-server": "^4.6.0", "webpack-merge": "^5.8.0" From 65abf6165ae035fe44938d22e8f04a72211af5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Tue, 23 May 2023 12:57:52 -0300 Subject: [PATCH 19/94] Fix compatibility webpack-bundle-tracker>=2.0.0 js library (#4350) required after upgrade django-webpack-loader to >=2.0.0 --- {{cookiecutter.project_slug}}/webpack/common.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/webpack/common.config.js b/{{cookiecutter.project_slug}}/webpack/common.config.js index 6aba2bc77..d95434dbd 100644 --- a/{{cookiecutter.project_slug}}/webpack/common.config.js +++ b/{{cookiecutter.project_slug}}/webpack/common.config.js @@ -20,7 +20,8 @@ module.exports = { }, plugins: [ new BundleTracker({ - filename: path.resolve(__dirname, '../webpack-stats.json'), + path: path.resolve(path.join(__dirname, '../')), + filename: 'webpack-stats.json', }), new MiniCssExtractPlugin({ filename: 'css/[name].[contenthash].css' }), ], From ff0bedc0d4c845c20246334e5165ddbc9444dcc1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 23 May 2023 11:07:05 -0500 Subject: [PATCH 20/94] Update sentry-sdk from 1.23.1 to 1.24.0 (#4349) --- {{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 5c140ff6f..663619693 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.23.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.24.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py From 1be71b8b95ea91c1c8ad8a94f29479316b036b55 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 23 May 2023 11:10:26 -0500 Subject: [PATCH 21/94] Update sphinx-rtd-theme from 1.2.0 to 1.2.1 (#4348) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index d3dd61dc6..e37d638b0 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ sphinx==6.2.1 -sphinx-rtd-theme==1.2.0 +sphinx-rtd-theme==1.2.1 myst-parser==1.0.0 From 58980d9b4df7a7fc93ed57938f978489781877f4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 24 May 2023 02:21:17 +0000 Subject: [PATCH 22/94] Release 2023.05.23 --- CHANGELOG.md | 21 +++++++++++++++++++++ setup.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fcdedef9..aa4ab1e39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.05.23 + + +### Changed + +- Fix compatibility webpack-bundle-tracker>=2.0.0 js library required after upgrade django-webpack-loader>=2.0.0 ([#4350](https://github.com/cookiecutter/cookiecutter-django/pull/4350)) + +### Updated + +- Update sphinx-rtd-theme to 1.2.1 ([#4348](https://github.com/cookiecutter/cookiecutter-django/pull/4348)) + +- Update sentry-sdk to 1.24.0 ([#4349](https://github.com/cookiecutter/cookiecutter-django/pull/4349)) + +- Bump webpack-bundle-tracker from 1.8.1 to 2.0.0 in /{{cookiecutter.project_slug}} ([#4347](https://github.com/cookiecutter/cookiecutter-django/pull/4347)) + +- Update django-webpack-loader to 2.0.0 ([#4345](https://github.com/cookiecutter/cookiecutter-django/pull/4345)) + +- Update pytest-xdist to 3.3.1 ([#4344](https://github.com/cookiecutter/cookiecutter-django/pull/4344)) + +- Update requests to 2.31.0 ([#4346](https://github.com/cookiecutter/cookiecutter-django/pull/4346)) + ## 2023.05.18 diff --git a/setup.py b/setup.py index 6adcd3657..6cc61b94c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.18" +version = "2023.05.23" with open("README.rst") as readme_file: long_description = readme_file.read() From 02d2d24b6907ae4fcfdd9c74482615ae7d36c42f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 May 2023 02:10:13 -0500 Subject: [PATCH 23/94] Update coverage from 7.2.5 to 7.2.6 (#4351) --- {{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 89a3b3b42..431ab9701 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.2.5 # https://github.com/nedbat/coveragepy +coverage==7.2.6 # https://github.com/nedbat/coveragepy black==23.3.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 8d64f1749461310b04a2b512184bb0623fb22ba0 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 24 May 2023 15:51:38 +0100 Subject: [PATCH 24/94] Prevent Celery restarts on media file changes (#4352) Fix #4318 --- .../compose/local/django/celery/beat/start | 2 +- .../compose/local/django/celery/flower/start | 2 +- .../compose/local/django/celery/worker/start | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start index 61f83968b..8adc4891a 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start @@ -5,4 +5,4 @@ set -o nounset rm -f './celerybeat.pid' -exec watchfiles celery.__main__.main --args '-A config.celery_app beat -l INFO' +exec watchfiles --filter python celery.__main__.main --args '-A config.celery_app beat -l INFO' diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index ac3cc6b36..b4783d2f0 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -3,6 +3,6 @@ set -o errexit set -o nounset -exec watchfiles celery.__main__.main \ +exec watchfiles --filter python celery.__main__.main \ --args \ "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\"" diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start index 16341fdd1..183a80159 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start @@ -4,4 +4,4 @@ set -o errexit set -o nounset -exec watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO' +exec watchfiles --filter python celery.__main__.main --args '-A config.celery_app worker -l INFO' From ee31a1eb639722a88a4b03af4db31aea8b682488 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 25 May 2023 02:19:11 +0000 Subject: [PATCH 25/94] Release 2023.05.24 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa4ab1e39..fbb4ca121 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.05.24 + + +### Fixed + +- Prevent Celery restarts on media file changes ([#4352](https://github.com/cookiecutter/cookiecutter-django/pull/4352)) + +### Updated + +- Update coverage to 7.2.6 ([#4351](https://github.com/cookiecutter/cookiecutter-django/pull/4351)) + ## 2023.05.23 diff --git a/setup.py b/setup.py index 6cc61b94c..1c19b5b5c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.23" +version = "2023.05.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 7585febf580cf9d3bcaff50a8712d4b30f23947e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 28 May 2023 05:23:26 -0500 Subject: [PATCH 26/94] Update tox from 4.5.1 to 4.5.2 (#4354) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c06987a2e..4b05c1b1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.3.2 # Testing # ------------------------------------------------------------------------------ -tox==4.5.1 +tox==4.5.2 pytest==7.3.1 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 4b7cf3e80e402f94afd5504411bb85d96b83fa9d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 29 May 2023 02:22:46 +0000 Subject: [PATCH 27/94] Release 2023.05.28 --- CHANGELOG.md | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbb4ca121..19c925b52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.05.28 + + ## 2023.05.24 diff --git a/setup.py b/setup.py index 1c19b5b5c..3f1c6457a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.24" +version = "2023.05.28" with open("README.rst") as readme_file: long_description = readme_file.read() From cb290a6d43b43971bc0e890f8c1bcfbc5ab33078 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 30 May 2023 09:47:46 -0500 Subject: [PATCH 28/94] Update coverage to 7.2.7 (#4356) --- {{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 431ab9701..187409552 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.2.6 # https://github.com/nedbat/coveragepy +coverage==7.2.7 # https://github.com/nedbat/coveragepy black==23.3.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 332fa9afa21a99998520297b40b7dd4a5a476351 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 30 May 2023 10:04:26 -0500 Subject: [PATCH 29/94] Update django-anymail to 10.0 (#4357) * Update django-anymail from 9.2 to 10.0 * Update django-anymail from 9.2 to 10.0 * Update django-anymail from 9.2 to 10.0 * Update django-anymail from 9.2 to 10.0 * Update django-anymail from 9.2 to 10.0 * Update django-anymail from 9.2 to 10.0 * Update django-anymail from 9.2 to 10.0 * Update django-anymail from 9.2 to 10.0 * Update django-anymail from 9.2 to 10.0 * Update the 'extra' for Amazon SES --------- Co-authored-by: Bruno Alla --- .../requirements/production.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 663619693..9f0e742af 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,21 +24,21 @@ django-storages[google]==1.13.2 # https://github.com/jschneier/django-storages django-storages[azure]==1.13.2 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==9.2 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==10.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==9.2 # https://github.com/anymail/django-anymail +django-anymail[amazon-ses]==10.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==9.2 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==10.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==9.2 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==10.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==9.2 # https://github.com/anymail/django-anymail +django-anymail[postmark]==10.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==9.2 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==10.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==9.2 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==10.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==9.2 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==10.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==9.2 # https://github.com/anymail/django-anymail +django-anymail==10.0 # https://github.com/anymail/django-anymail {%- endif %} From 062c942ab68571ac488b011040bf39613324cc30 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 30 May 2023 10:04:46 -0500 Subject: [PATCH 30/94] Update redis to 4.5.5 (#4358) --- {{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 ee00cda7b..73185f355 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.4.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.5.4 # https://github.com/redis/redis-py +redis==4.5.5 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.2.2 # https://github.com/redis/hiredis-py {%- endif %} From 8d0ad800e751c52f20d25bb1355f04307c92327e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 30 May 2023 10:05:20 -0500 Subject: [PATCH 31/94] Update django-debug-toolbar to 4.1.0 (#4359) --- {{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 187409552..073160be3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,7 +42,7 @@ pre-commit==3.3.2 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==4.0.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==4.1.0 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.0.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From 0e89b70e948040174fc3d8900d8dde754570217d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 30 May 2023 10:05:37 -0500 Subject: [PATCH 32/94] Update hiredis to 2.2.3 (#4360) * Update hiredis from 2.2.2 to 2.2.3 * Update hiredis from 2.2.2 to 2.2.3 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 73185f355..6f33acb7e 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -13,7 +13,7 @@ whitenoise==6.4.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.5.5 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} -hiredis==2.2.2 # https://github.com/redis/hiredis-py +hiredis==2.2.3 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 9f0e742af..bbe502ba5 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ Collectfast==2.2.0 # https://github.com/antonagestam/collectfast sentry-sdk==1.24.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} -hiredis==2.2.2 # https://github.com/redis/hiredis-py +hiredis==2.2.3 # https://github.com/redis/hiredis-py {%- endif %} # Django From 00b22bc02d6c1668972cf61a6632dbbb200b8a86 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 31 May 2023 02:31:12 +0000 Subject: [PATCH 33/94] Release 2023.05.30 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19c925b52..c99a80f2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.05.30 + + +### Updated + +- Update hiredis to 2.2.3 ([#4360](https://github.com/cookiecutter/cookiecutter-django/pull/4360)) + +- Update django-debug-toolbar to 4.1.0 ([#4359](https://github.com/cookiecutter/cookiecutter-django/pull/4359)) + +- Update redis to 4.5.5 ([#4358](https://github.com/cookiecutter/cookiecutter-django/pull/4358)) + +- Update django-anymail to 10.0 ([#4357](https://github.com/cookiecutter/cookiecutter-django/pull/4357)) + +- Update coverage to 7.2.7 ([#4356](https://github.com/cookiecutter/cookiecutter-django/pull/4356)) + ## 2023.05.28 diff --git a/setup.py b/setup.py index 3f1c6457a..e6c5c99f8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.28" +version = "2023.05.30" with open("README.rst") as readme_file: long_description = readme_file.read() From 752dbffdceb681c27916a2d0b0ccee1d17fb2a55 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 2 Jun 2023 08:55:43 -0500 Subject: [PATCH 34/94] Update sentry-sdk to 1.25.0 (#4364) --- {{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 bbe502ba5..2714fe6f8 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.24.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.25.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From c56451e268d0107255209690d15d10a8d81f96c5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 2 Jun 2023 18:18:37 +0200 Subject: [PATCH 35/94] Update django-stubs from 4.2.0 to 4.2.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 073160be3..398788e58 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.2.0 # https://github.com/python/mypy -django-stubs==4.2.0 # https://github.com/typeddjango/django-stubs +django-stubs==4.2.1 # https://github.com/typeddjango/django-stubs pytest==7.3.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 0f7485f7c46ce89ece4533f7489282d5957eda6c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 2 Jun 2023 18:18:40 +0200 Subject: [PATCH 36/94] Update djangorestframework-stubs from 3.14.0 to 3.14.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 073160be3..1462804fe 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs==4.2.0 # https://github.com/typeddjango/django-stubs pytest==7.3.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs==3.14.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==3.14.1 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From d085363ae9e0d8bc596c777d45b8be7bf05d3532 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 3 Jun 2023 02:27:09 +0000 Subject: [PATCH 37/94] Release 2023.06.02 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c99a80f2e..06441cb95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.02 + + +### Updated + +- Update sentry-sdk to 1.25.0 ([#4364](https://github.com/cookiecutter/cookiecutter-django/pull/4364)) + ## 2023.05.30 diff --git a/setup.py b/setup.py index e6c5c99f8..19820f7bc 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.05.30" +version = "2023.06.02" with open("README.rst") as readme_file: long_description = readme_file.read() From 72887ed6733ea8add5ddbd41148cec20f21a5776 Mon Sep 17 00:00:00 2001 From: Matheus Jardim Bernardes Date: Wed, 7 Jun 2023 05:50:30 -0300 Subject: [PATCH 38/94] add pt_BR .po file (#4367) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add pt_BR .po file * add ptBR strings * update docs * add README.rst info for i18n * Update {{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po Co-authored-by: Fábio C. Barrionuevo da Luz --------- Co-authored-by: Matheus Jardim Co-authored-by: Fábio C. Barrionuevo da Luz --- .../config/settings/base.py | 6 + .../locale/README.rst | 12 +- .../locale/pt_BR/LC_MESSAGES/django.po | 321 ++++++++++++++++++ 3 files changed, 337 insertions(+), 2 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index c0ca31f36..487669e0a 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -26,6 +26,12 @@ DEBUG = env.bool("DJANGO_DEBUG", False) TIME_ZONE = "{{ cookiecutter.timezone }}" # https://docs.djangoproject.com/en/dev/ref/settings/#language-code LANGUAGE_CODE = "en-us" +# https://docs.djangoproject.com/en/dev/ref/settings/#languages +# from django.utils.translation import gettext_lazy as _ +# LANGUAGES = [ +# ('en', _('English')), +# ('pt-br', _('Português')), +# ] # https://docs.djangoproject.com/en/dev/ref/settings/#site-id SITE_ID = 1 # https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n diff --git a/{{cookiecutter.project_slug}}/locale/README.rst b/{{cookiecutter.project_slug}}/locale/README.rst index c2f1dcd6f..a501b7a18 100644 --- a/{{cookiecutter.project_slug}}/locale/README.rst +++ b/{{cookiecutter.project_slug}}/locale/README.rst @@ -1,6 +1,14 @@ Translations ============ -Translations will be placed in this folder when running:: +Start by configuring `LANGUAGES` at settings, by uncommenting languages you are willing to support. - python manage.py makemessages +Translations will be placed in this folder when running: + + python manage.py makemessages --all + +Then you should edit the .po files providing proper translations and then run the following for compiling the messages: + + python manage.py compilemessages + +Note: You may need to restart the django server for changes to take effect. diff --git a/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po new file mode 100644 index 000000000..fc17c6a61 --- /dev/null +++ b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po @@ -0,0 +1,321 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-06-04 21:42+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:5 +#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:8 +msgid "Account Inactive" +msgstr "Conta Inativa" + +#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:10 +msgid "This account is inactive." +msgstr "Esta conta está inativa." + +#: {{cookiecutter.project_slug}}/templates/account/email.html:7 +msgid "Account" +msgstr "Conta" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:10 +msgid "E-mail Addresses" +msgstr "Endereços de E-mail" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:13 +msgid "The following e-mail addresses are associated with your account:" +msgstr "Os seguintes endereços de e-mail estão associados à sua conta:" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:27 +msgid "Verified" +msgstr "Verificado" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:29 +msgid "Unverified" +msgstr "Não verificado" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:31 +msgid "Primary" +msgstr "Primário" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:37 +msgid "Make Primary" +msgstr "Tornar Primário" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:38 +msgid "Re-send Verification" +msgstr "Reenviar verificação" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:39 +msgid "Remove" +msgstr "Remover" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:46 +msgid "Warning:" +msgstr "Aviso:" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:46 +msgid "" +"You currently do not have any e-mail address set up. You should really add " +"an e-mail address so you can receive notifications, reset your password, etc." +msgstr "" +"No momento, você não tem nenhum endereço de e-mail configurado. Você " +"realmente deve adicionar um endereço de e-mail para receber notificações, " +"redefinir sua senha etc." + +#: {{cookiecutter.project_slug}}/templates/account/email.html:51 +msgid "Add E-mail Address" +msgstr "Adicionar Endereço de E-mail" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:56 +msgid "Add E-mail" +msgstr "Adicionar E-mail" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:66 +msgid "Do you really want to remove the selected e-mail address?" +msgstr "Você realmente deseja remover o endereço de e-mail selecionado?" + +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:6 +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:10 +msgid "Confirm E-mail Address" +msgstr "Confirme o endereço de e-mail" + +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:16 +#, python-format +msgid "" +"Please confirm that %(email)s is an e-mail " +"address for user %(user_display)s." +msgstr "" +"Confirme se %(email)s é um endereço de " +"e-mail do usuário %(user_display)s." + +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:20 +msgid "Confirm" +msgstr "Confirmar" + +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:27 +#, python-format +msgid "" +"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request." +msgstr "Este link de confirmação de e-mail expirou ou é inválido. " +"Por favor, emita um novo pedido de confirmação por e-mail." + +#: {{cookiecutter.project_slug}}/templates/account/login.html:7 +#: {{cookiecutter.project_slug}}/templates/account/login.html:11 +#: {{cookiecutter.project_slug}}/templates/account/login.html:56 +#: {{cookiecutter.project_slug}}/templates/base.html:72 +msgid "Sign In" +msgstr "Entrar" + +#: {{cookiecutter.project_slug}}/templates/account/login.html:17 +msgid "Please sign in with one of your existing third party accounts:" +msgstr "Faça login com uma de suas contas de terceiros existentes:" + +#: {{cookiecutter.project_slug}}/templates/account/login.html:19 +#, python-format +msgid "" +"Or, sign up for a %(site_name)s account and " +"sign in below:" +msgstr "Ou, cadastre-se para uma conta em %(site_name)s e entre abaixo:" + +#: {{cookiecutter.project_slug}}/templates/account/login.html:32 +msgid "or" +msgstr "or" + +#: {{cookiecutter.project_slug}}/templates/account/login.html:41 +#, python-format +msgid "" +"If you have not created an account yet, then please sign up first." +msgstr "Se você ainda não criou uma conta, registre-se primeiro." + +#: {{cookiecutter.project_slug}}/templates/account/login.html:55 +msgid "Forgot Password?" +msgstr "Esqueceu sua senha?" + +#: {{cookiecutter.project_slug}}/templates/account/logout.html:5 +#: {{cookiecutter.project_slug}}/templates/account/logout.html:8 +#: {{cookiecutter.project_slug}}/templates/account/logout.html:17 +#: {{cookiecutter.project_slug}}/templates/base.html:61 +msgid "Sign Out" +msgstr "Sair" + +#: {{cookiecutter.project_slug}}/templates/account/logout.html:10 +msgid "Are you sure you want to sign out?" +msgstr "Você tem certeza que deseja sair?" + +#: {{cookiecutter.project_slug}}/templates/account/password_change.html:6 +#: {{cookiecutter.project_slug}}/templates/account/password_change.html:9 +#: {{cookiecutter.project_slug}}/templates/account/password_change.html:14 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:5 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:8 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:4 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:7 +msgid "Change Password" +msgstr "Alterar Senha" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:7 +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:11 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:6 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:9 +msgid "Password Reset" +msgstr "Redefinição de senha" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:16 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll send you " +"an e-mail allowing you to reset it." +msgstr "Esqueceu sua senha? Digite seu endereço de e-mail abaixo e enviaremos um e-mail permitindo que você o redefina." + +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:21 +msgid "Reset My Password" +msgstr "Redefinir minha senha" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:24 +msgid "Please contact us if you have any trouble resetting your password." +msgstr "Entre em contato conosco se tiver algum problema para redefinir sua senha." + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:15 +msgid "" +"We have sent you an e-mail. Please contact us if you do not receive it " +"within a few minutes." +msgstr "Enviamos um e-mail para você. Entre em contato conosco se você não recebê-lo dentro de alguns minutos." + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:8 +msgid "Bad Token" +msgstr "Token Inválido" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:12 +#, python-format +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "O link de redefinição de senha era inválido, possivelmente porque já foi usado. " +"Solicite uma nova redefinição de senha." + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:18 +msgid "change password" +msgstr "alterar senha" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:21 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:8 +msgid "Your password is now changed." +msgstr "Sua senha agora foi alterada." + +#: {{cookiecutter.project_slug}}/templates/account/password_set.html:6 +#: {{cookiecutter.project_slug}}/templates/account/password_set.html:9 +#: {{cookiecutter.project_slug}}/templates/account/password_set.html:14 +msgid "Set Password" +msgstr "Definir Senha" + +#: {{cookiecutter.project_slug}}/templates/account/signup.html:6 +msgid "Signup" +msgstr "Cadastro" + +#: {{cookiecutter.project_slug}}/templates/account/signup.html:9 +#: {{cookiecutter.project_slug}}/templates/account/signup.html:19 +#: {{cookiecutter.project_slug}}/templates/base.html:67 +msgid "Sign Up" +msgstr "Cadastro" + +#: {{cookiecutter.project_slug}}/templates/account/signup.html:11 +#, python-format +msgid "" +"Already have an account? Then please sign in." +msgstr "já tem uma conta? Então, por favor, faça login." + +#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:5 +#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:8 +msgid "Sign Up Closed" +msgstr "Inscrições encerradas" + +#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:10 +msgid "We are sorry, but the sign up is currently closed." +msgstr "Lamentamos, mas as inscrições estão encerradas no momento." + +#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:5 +#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:8 +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:5 +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:8 +msgid "Verify Your E-mail Address" +msgstr "Verifique seu endereço de e-mail" + +#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:10 +msgid "" +"We have sent an e-mail to you for verification. Follow the link provided to " +"finalize the signup process. Please contact us if you do not receive it " +"within a few minutes." +msgstr "Enviamos um e-mail para você para verificação. Siga o link fornecido para finalizar o processo de inscrição. Entre em contato conosco se você não recebê-lo dentro de alguns minutos." + +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:12 +msgid "" +"This part of the site requires us to verify that\n" +"you are who you claim to be. For this purpose, we require that you\n" +"verify ownership of your e-mail address. " +msgstr "Esta parte do site exige que verifiquemos se você é quem afirma ser.\n" +"Para esse fim, exigimos que você verifique a propriedade\n" +"do seu endereço de e-mail." + +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:16 +msgid "" +"We have sent an e-mail to you for\n" +"verification. Please click on the link inside this e-mail. Please\n" +"contact us if you do not receive it within a few minutes." +msgstr "Enviamos um e-mail para você para verificação.\n" +"Por favor, clique no link dentro deste e-mail.\n" +"Entre em contato conosco se você não recebê-lo dentro de alguns minutos." + +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:20 +#, python-format +msgid "" +"Note: you can still change your e-" +"mail address." +msgstr "Nota: você ainda pode alterar seu endereço de e-mail." + +#: {{cookiecutter.project_slug}}/templates/base.html:57 +msgid "My Profile" +msgstr "Meu perfil" + +#: {{cookiecutter.project_slug}}/users/admin.py:17 +msgid "Personal info" +msgstr "Informação pessoal" + +#: {{cookiecutter.project_slug}}/users/admin.py:19 +msgid "Permissions" +msgstr "Permissões" + +#: {{cookiecutter.project_slug}}/users/admin.py:30 +msgid "Important dates" +msgstr "Datas importantes" + +#: {{cookiecutter.project_slug}}/users/apps.py:7 +msgid "Users" +msgstr "Usuários" + +#: {{cookiecutter.project_slug}}/users/forms.py:24 +#: {{cookiecutter.project_slug}}/users/tests/test_forms.py:36 +msgid "This username has already been taken." +msgstr "Este nome de usuário já foi usado." + +#: {{cookiecutter.project_slug}}/users/models.py:15 +msgid "Name of User" +msgstr "Nome do Usuário" + +#: {{cookiecutter.project_slug}}/users/views.py:23 +msgid "Information successfully updated" +msgstr "Informação atualizada com sucesso" From fbc2373bcc8d7205541d37eb5e2934ace0fcc59d Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 7 Jun 2023 08:51:12 +0000 Subject: [PATCH 39/94] 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 37c85e1bc..13c4eafd3 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1392,5 +1392,10 @@ "name": "Birtibu", "github_login": "Birtibu", "twitter_username": "" + }, + { + "name": "Matheus Jardim Bernardes", + "github_login": "matheusjardimb", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 340588a9a..4e2f1fb31 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1314,6 +1314,13 @@ Listed in alphabetical order. + + Matheus Jardim Bernardes + + matheusjardimb + + + Mathijs Hoogland From 45c407d47a42c29221adae6493f05c8b5c1aa1f6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 10 May 2023 18:05:25 +0100 Subject: [PATCH 40/94] Update mypy from 1.2.0 to 1.3.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 073160be3..277b09cfb 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==1.2.0 # https://github.com/python/mypy +mypy==1.3.0 # https://github.com/python/mypy django-stubs==4.2.0 # https://github.com/typeddjango/django-stubs pytest==7.3.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar From e96955656fcb1a7e2a687f09fa773ff268e2415f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Jun 2023 04:15:10 -0500 Subject: [PATCH 41/94] Update tox to 4.6.0 (#4371) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4b05c1b1e..f964e4ac7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.3.2 # Testing # ------------------------------------------------------------------------------ -tox==4.5.2 +tox==4.6.0 pytest==7.3.1 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 36b5606823e83b4570a0120d3a6b412682cdfdf7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Jun 2023 04:17:09 -0500 Subject: [PATCH 42/94] Update django-extensions to 3.2.3 (#4372) --- {{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 c427ae22f..4728ffbde 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -43,6 +43,6 @@ pre-commit==3.3.2 # https://github.com/pre-commit/pre-commit factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==4.1.0 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions +django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.0.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From 5bf90a43a9a28fb3306b268d4d02a9a44efa4426 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 7 Jun 2023 17:12:01 +0100 Subject: [PATCH 43/94] Replace `runserver` with `runserver_plus` (#4373) This reverts commit f93a9f78d9a249718acd20e297fb02b177353912 In #4255, `runserver_plus` was replaced by `runserver` due to some bugs in django-extensions, preventing us to upgrade Django. In #4372, django-extensions was upgraded to a version with a fix, so we can go back to using `runserver_plus`. --- hooks/post_gen_project.py | 4 ++- .../runConfigurations/runserver_plus.xml | 33 +++++++++++++++++++ .../compose/local/django/start | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index b79985a82..927419f8c 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -194,7 +194,9 @@ def handle_js_runner(choice, use_docker, use_async): "gulp-uglify-es", ] if not use_docker: - dev_django_cmd = "uvicorn config.asgi:application --reload" if use_async else "python manage.py runserver" + dev_django_cmd = ( + "uvicorn config.asgi:application --reload" if use_async else "python manage.py runserver_plus" + ) scripts.update( { "dev": "concurrently npm:dev:*", diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml new file mode 100644 index 000000000..242f861a6 --- /dev/null +++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start index 6415d7fb4..ec57dc8e4 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/start @@ -9,5 +9,5 @@ python manage.py migrate {%- if cookiecutter.use_async == 'y' %} exec uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html' {%- else %} -exec python manage.py runserver 0.0.0.0:8000 +exec python manage.py runserver_plus 0.0.0.0:8000 {%- endif %} From 34e97530ded6841520cd01b65058dd34696abd3d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Jun 2023 11:14:04 -0500 Subject: [PATCH 44/94] Update sphinx-rtd-theme from 1.2.1 to 1.2.2 (#4375) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index e37d638b0..1ae530fa7 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ sphinx==6.2.1 -sphinx-rtd-theme==1.2.1 +sphinx-rtd-theme==1.2.2 myst-parser==1.0.0 From d6c8c760e7a679f7d4140fe26c796cfcbc14f623 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Jun 2023 11:55:10 -0500 Subject: [PATCH 45/94] Update sentry-sdk from 1.25.0 to 1.25.1 (#4376) --- {{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 2714fe6f8..aec79b3d3 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.25.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.25.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From e4915d62acc86154cd95e13b9498770d16690a29 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 8 Jun 2023 02:31:36 +0000 Subject: [PATCH 46/94] Release 2023.06.07 --- CHANGELOG.md | 21 +++++++++++++++++++++ setup.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06441cb95..4b56dc7c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.07 + + +### Changed + +- Replace `runserver` with `runserver_plus` ([#4373](https://github.com/cookiecutter/cookiecutter-django/pull/4373)) + +- Add translations for Brazilian Portuguese ([#4367](https://github.com/cookiecutter/cookiecutter-django/pull/4367)) + +### Updated + +- Update sentry-sdk to 1.25.1 ([#4376](https://github.com/cookiecutter/cookiecutter-django/pull/4376)) + +- Update django-extensions to 3.2.3 ([#4372](https://github.com/cookiecutter/cookiecutter-django/pull/4372)) + +- Update djangorestframework-stubs to 3.14.1 ([#4366](https://github.com/cookiecutter/cookiecutter-django/pull/4366)) + +- Update django-stubs to 4.2.1 ([#4365](https://github.com/cookiecutter/cookiecutter-django/pull/4365)) + +- Update mypy to 1.3.0 ([#4327](https://github.com/cookiecutter/cookiecutter-django/pull/4327)) + ## 2023.06.02 diff --git a/setup.py b/setup.py index 19820f7bc..f9d6222d5 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.02" +version = "2023.06.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 135ea503e4e662a7aaba760b2758bed07ac10162 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 8 Jun 2023 05:15:42 -0500 Subject: [PATCH 47/94] Update werkzeug from 2.3.4 to 2.3.5 (#4377) --- {{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 4728ffbde..3e8b13133 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r base.txt -Werkzeug[watchdog]==2.3.4 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.3.5 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 From 1025d7308362bf7094fa2303ce22b4b51f27770f Mon Sep 17 00:00:00 2001 From: mpsantos Date: Thu, 8 Jun 2023 12:41:35 -0300 Subject: [PATCH 48/94] Translate fixed message in test (#4374) --- .../{{cookiecutter.project_slug}}/users/tests/test_views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py index 0cd0021ff..2c1027038 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py @@ -7,6 +7,7 @@ from django.contrib.sessions.middleware import SessionMiddleware from django.http import HttpRequest, HttpResponseRedirect from django.test import RequestFactory from django.urls import reverse +from django.utils.translation import gettext_lazy as _ from {{ cookiecutter.project_slug }}.users.forms import UserAdminChangeForm from {{ cookiecutter.project_slug }}.users.models import User @@ -72,7 +73,7 @@ class TestUserUpdateView: view.form_valid(form) messages_sent = [m.message for m in messages.get_messages(request)] - assert messages_sent == ["Information successfully updated"] + assert messages_sent == [_("Information successfully updated")] class TestUserRedirectView: From 74b98844c2d68b82a2286d6a0c89217e92071684 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 8 Jun 2023 10:43:28 -0500 Subject: [PATCH 49/94] Update celery to 5.3.0 (#4369) --- {{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 6f33acb7e..9b2159edf 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -16,7 +16,7 @@ redis==4.5.5 # https://github.com/redis/redis-py hiredis==2.2.3 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} -celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery +celery==5.3.0 # pyup: < 6.0 # https://github.com/celery/celery django-celery-beat==2.5.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==1.2.0 # https://github.com/mher/flower From b2dfd2683456460a455d0f3031249710a30b5e5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 16:47:37 +0100 Subject: [PATCH 50/94] Update to Python 3.11.4 in local Docker compose (#4380) Bumps python from 3.11.3-slim-bullseye to 3.11.4-slim-bullseye. --- 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 db48870d8..b1f459ba5 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 python:3.11.3-slim-bullseye as python +FROM python:3.11.4-slim-bullseye as python # Python build stage FROM python as python-build-stage From 4e4ca84519b5015217fd7b6e7a53c49aa7601df9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 16:47:43 +0100 Subject: [PATCH 51/94] Update to Python 3.11.4 in docs Docker compose (#4379) Bumps python from 3.11.3-slim-bullseye to 3.11.4-slim-bullseye. --- 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/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 8239a6635..f9895a083 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 python:3.11.3-slim-bullseye as python +FROM python:3.11.4-slim-bullseye as python # Python build stage From ca780d5665ab46df1ccd7b9fffdcff16f7a3eb0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 16:47:50 +0100 Subject: [PATCH 52/94] Update to Python 3.11.4 in production Docker compose (#4378) Bumps python from 3.11.3-slim-bullseye to 3.11.4-slim-bullseye. --- 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 4c8695a57..bbe459839 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 python:3.11.3-slim-bullseye as python +FROM python:3.11.4-slim-bullseye as python # Python build stage FROM python as python-build-stage From 61ebd31e5d5be3401e0b842b0a151c7fc7aa6b91 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 8 Jun 2023 16:49:59 +0100 Subject: [PATCH 53/94] Update Heroku runtime to Python 3.11.4 --- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index afe12ad1b..431fc7e8c 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.11.3 +python-3.11.4 From 932c7b6145712c42006dccfe4f4570a66faff759 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 9 Jun 2023 02:32:22 +0000 Subject: [PATCH 54/94] Release 2023.06.08 --- CHANGELOG.md | 19 +++++++++++++++++++ setup.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b56dc7c2..f572bd79e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.08 + + +### Fixed + +- Fix failure in user view test caused by translations ([#4374](https://github.com/cookiecutter/cookiecutter-django/pull/4374)) + +### Updated + +- Update to Python 3.11.4 in production Docker compose ([#4378](https://github.com/cookiecutter/cookiecutter-django/pull/4378)) + +- Update to Python 3.11.4 in docs Docker compose ([#4379](https://github.com/cookiecutter/cookiecutter-django/pull/4379)) + +- Update to Python 3.11.4 in local Docker compose ([#4380](https://github.com/cookiecutter/cookiecutter-django/pull/4380)) + +- Update celery to 5.3.0 ([#4369](https://github.com/cookiecutter/cookiecutter-django/pull/4369)) + +- Update werkzeug to 2.3.5 ([#4377](https://github.com/cookiecutter/cookiecutter-django/pull/4377)) + ## 2023.06.07 diff --git a/setup.py b/setup.py index f9d6222d5..f541bdee6 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.07" +version = "2023.06.08" with open("README.rst") as readme_file: long_description = readme_file.read() From 2e561ed6c4c7ed8950334eaa63eca70a32dac055 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 9 Jun 2023 11:12:44 +0100 Subject: [PATCH 55/94] Fix missing `compilemessages` step before deploying to prod (#4363) * Update readme on internationalization * Run compilemessages when building production image * Run compilemessages when deploying to Heroku * Always keep Heroku post-compile hooks * Add empty po file for en-US language * Update instructions for Docker * Update default po file * Convert locale readme to markdown and expand a bit the instructions * Don't compile translations for 3rd party packages * Use simplified settings & set env variables for compiling translations * Update README for translations * Improve metadata for Brazilian Portuguese translations * Fix condition for django compressor on Heroku * Fix condition for Django Compressor --- hooks/post_gen_project.py | 6 ---- .../bin/post_compile | 4 +++ .../compose/production/django/Dockerfile | 4 +++ .../locale/README.md | 32 +++++++++++++++++++ .../locale/README.rst | 14 -------- .../locale/en_US/LC_MESSAGES/django.po | 12 +++++++ .../locale/pt_BR/LC_MESSAGES/django.po | 16 +++------- 7 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/locale/README.md delete mode 100644 {{cookiecutter.project_slug}}/locale/README.rst create mode 100644 {{cookiecutter.project_slug}}/locale/en_US/LC_MESSAGES/django.po diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 927419f8c..11f165b78 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -96,10 +96,6 @@ def remove_heroku_files(): # don't remove the file if we are using travisci but not using heroku continue os.remove(file_name) - remove_heroku_build_hooks() - - -def remove_heroku_build_hooks(): shutil.rmtree("bin") @@ -444,8 +440,6 @@ def main(): if "{{ cookiecutter.use_heroku }}".lower() == "n": remove_heroku_files() - elif "{{ cookiecutter.frontend_pipeline }}" != "Django Compressor": - remove_heroku_build_hooks() if "{{ cookiecutter.use_docker }}".lower() == "n" and "{{ cookiecutter.use_heroku }}".lower() == "n": if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y": diff --git a/{{cookiecutter.project_slug}}/bin/post_compile b/{{cookiecutter.project_slug}}/bin/post_compile index a9c94b39a..16719f493 100644 --- a/{{cookiecutter.project_slug}}/bin/post_compile +++ b/{{cookiecutter.project_slug}}/bin/post_compile @@ -1,4 +1,5 @@ #!/usr/bin/env bash +{%- if cookiecutter.frontend_pipeline == "Django Compressor" %} compress_enabled() { python << END @@ -19,4 +20,7 @@ if compress_enabled then python manage.py compress fi +{%- endif %} + python manage.py collectstatic --noinput +python manage.py compilemessages -i site-packages diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index bbe459839..5a863ddc5 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -121,4 +121,8 @@ RUN chown django:django ${APP_HOME} USER django +RUN DATABASE_URL="" \ + DJANGO_SETTINGS_MODULE="config.settings.test" \ + python manage.py compilemessages + ENTRYPOINT ["/entrypoint"] diff --git a/{{cookiecutter.project_slug}}/locale/README.md b/{{cookiecutter.project_slug}}/locale/README.md new file mode 100644 index 000000000..b2a8a0ef2 --- /dev/null +++ b/{{cookiecutter.project_slug}}/locale/README.md @@ -0,0 +1,32 @@ +# Translations + +Start by configuring the `LANGUAGES` settings in `base.py`, by uncommenting languages you are willing to support. Then, translations strings will be placed in this folder when running: + +```bash +{% if cookiecutter.use_docker == 'y' %}docker-compose -f local.yml run --rm django {% endif %}python manage.py makemessages -all --no-location +``` + +This should generate `django.po` (stands for Portable Object) files under each locale `/LC_MESSAGES/django.po`. Each translatable string in the codebase is collected with its `msgid` and need to be translated as `msgstr`, for example: + +```po +msgid "users" +msgstr "utilisateurs" +``` + +Once all translations are done, they need to be compiled into `.mo` files (stands for Machine Object), which are the actual binary files used by the application: + +```bash +{% if cookiecutter.use_docker == 'y' %}docker-compose -f local.yml run --rm django {% endif %}python manage.py compilemessages +``` + +Note that the `.po` files are NOT used by the application directly, so if the `.mo` files are out of dates, the content won't appear as translated even if the `.po` files are up-to-date. + +## Production + +The production image runs `compilemessages` automatically at build time, so as long as your translated source files (PO) are up-to-date, you're good to go. + +## Add a new language + +1. Update the [`LANGUAGES` setting](https://docs.djangoproject.com/en/stable/ref/settings/#std-setting-LANGUAGES) to your project's base settings. +2. Create the locale folder for the language next to this file, e.g. `fr_FR` for French. Make sure the case is correct. +3. Run `makemessages` (as instructed above) to generate the PO files for the new language. diff --git a/{{cookiecutter.project_slug}}/locale/README.rst b/{{cookiecutter.project_slug}}/locale/README.rst deleted file mode 100644 index a501b7a18..000000000 --- a/{{cookiecutter.project_slug}}/locale/README.rst +++ /dev/null @@ -1,14 +0,0 @@ -Translations -============ - -Start by configuring `LANGUAGES` at settings, by uncommenting languages you are willing to support. - -Translations will be placed in this folder when running: - - python manage.py makemessages --all - -Then you should edit the .po files providing proper translations and then run the following for compiling the messages: - - python manage.py compilemessages - -Note: You may need to restart the django server for changes to take effect. diff --git a/{{cookiecutter.project_slug}}/locale/en_US/LC_MESSAGES/django.po b/{{cookiecutter.project_slug}}/locale/en_US/LC_MESSAGES/django.po new file mode 100644 index 000000000..6a4aa2e0b --- /dev/null +++ b/{{cookiecutter.project_slug}}/locale/en_US/LC_MESSAGES/django.po @@ -0,0 +1,12 @@ +# Translations for the {{ cookiecutter.project_name }} project +# Copyright (C) {% now 'utc', '%Y' %} {{ cookiecutter.author_name }} +# {{ cookiecutter.author_name }} <{{ cookiecutter.email }}>, {% now 'utc', '%Y' %}. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: {{ cookiecutter.version }}\n" +"Language: en-US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" diff --git a/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po index fc17c6a61..2556abba8 100644 --- a/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po +++ b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po @@ -1,18 +1,12 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Translations for the {{ cookiecutter.project_name }} project +# Copyright (C) {% now 'utc', '%Y' %} {{ cookiecutter.author_name }} +# {{ cookiecutter.author_name }} <{{ cookiecutter.email }}>, {% now 'utc', '%Y' %}. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-04 21:42+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"Project-Id-Version: {{ cookiecutter.version }}\n" +"Language: pt-BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" From f643dffa733dbb114eeda42aa02c375f8b0dd9bb Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 10 Jun 2023 02:27:27 +0000 Subject: [PATCH 56/94] Release 2023.06.09 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f572bd79e..a32895aa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.09 + + +### Fixed + +- Fix missing `compilemessages` step before deploying to prod ([#4363](https://github.com/cookiecutter/cookiecutter-django/pull/4363)) + ## 2023.06.08 diff --git a/setup.py b/setup.py index f541bdee6..9271e944e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.08" +version = "2023.06.09" with open("README.rst") as readme_file: long_description = readme_file.read() From 9bb27586d5cefac5d06d3fcddc63ea2f4f3c8065 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 11 Jun 2023 09:15:29 +0100 Subject: [PATCH 57/94] Auto-update pre-commit hooks (#4385) Co-authored-by: browniebroke --- .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 2c7876d3c..98afc14e0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.4.0 + rev: v3.6.0 hooks: - id: pyupgrade args: [--py311-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 3a0411d81..91a50b97d 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: args: ['--target-version', '4.1'] - repo: https://github.com/asottile/pyupgrade - rev: v3.4.0 + rev: v3.6.0 hooks: - id: pyupgrade args: [--py311-plus] From 733f5b95442be0a164fc20cda474dc3683a8ec2a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 11 Jun 2023 03:16:04 -0500 Subject: [PATCH 58/94] Update pytest to 7.3.2 (#4384) * Update pytest from 7.3.1 to 7.3.2 * Update pytest from 7.3.1 to 7.3.2 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f964e4ac7..61faaa59e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.3.2 # Testing # ------------------------------------------------------------------------------ tox==4.6.0 -pytest==7.3.1 +pytest==7.3.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 3e8b13133..2c72a0866 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.3.0 # https://github.com/python/mypy django-stubs==4.2.1 # https://github.com/typeddjango/django-stubs -pytest==7.3.1 # https://github.com/pytest-dev/pytest +pytest==7.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==3.14.1 # https://github.com/typeddjango/djangorestframework-stubs From 554edd43b14a45b6b9767ad3b58c5b909807272e Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 12 Jun 2023 02:31:28 +0000 Subject: [PATCH 59/94] Release 2023.06.11 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a32895aa7..60c1ce384 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.06.11 + + +### Updated + +- Update pytest to 7.3.2 ([#4384](https://github.com/cookiecutter/cookiecutter-django/pull/4384)) + +- Auto-update pre-commit hooks ([#4385](https://github.com/cookiecutter/cookiecutter-django/pull/4385)) + ## 2023.06.09 diff --git a/setup.py b/setup.py index 9271e944e..cc429c0e0 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.09" +version = "2023.06.11" with open("README.rst") as readme_file: long_description = readme_file.read() From fa096673e4909528528ed7a63678a9ea2244be22 Mon Sep 17 00:00:00 2001 From: Jelmer Draaijer Date: Tue, 13 Jun 2023 21:08:21 +0200 Subject: [PATCH 60/94] Add @foarsitter as core contributor --- .github/contributors.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/contributors.json b/.github/contributors.json index 13c4eafd3..b6eb7d639 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -53,6 +53,12 @@ "twitter_username": "sfdye", "is_core": true }, + { + "name": "Jelmer Draaijer", + "github_login": "foarsitter", + "twitter_username": "", + "is_core": true + }, { "name": "18", "github_login": "dezoito", @@ -553,11 +559,6 @@ "github_login": "jvanbrug", "twitter_username": "" }, - { - "name": "Jelmer Draaijer", - "github_login": "foarsitter", - "twitter_username": "" - }, { "name": "Jerome Caisip", "github_login": "jeromecaisip", @@ -1398,4 +1399,4 @@ "github_login": "matheusjardimb", "twitter_username": "" } -] \ No newline at end of file +] From dc61beecba271019ad72f28096c8e4b9db5ba2a4 Mon Sep 17 00:00:00 2001 From: foarsitter Date: Tue, 13 Jun 2023 20:06:25 +0000 Subject: [PATCH 61/94] Update Contributors --- .github/contributors.json | 2 +- CONTRIBUTORS.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/contributors.json b/.github/contributors.json index b6eb7d639..f5d7a4df6 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1399,4 +1399,4 @@ "github_login": "matheusjardimb", "twitter_username": "" } -] +] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4e2f1fb31..52072d8e2 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -74,6 +74,13 @@ accept and merge pull requests. sfdye + + Jelmer Draaijer + + foarsitter + + + _Audrey is also the creator of Cookiecutter. Audrey and Daniel are on @@ -1006,13 +1013,6 @@ Listed in alphabetical order. - - Jelmer Draaijer - - foarsitter - - - Jens Nilsson From 0d308fa2eeaa7bb1b4c1e9387af6e838e0c8e083 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 14 Jun 2023 00:54:36 -0500 Subject: [PATCH 62/94] Update pre-commit to 3.3.3 (#4390) * Update pre-commit from 3.3.2 to 3.3.3 * Update pre-commit from 3.3.2 to 3.3.3 --- 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 61faaa59e..3f33db7db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.3.0 isort==5.12.0 flake8==6.0.0 django-upgrade==1.13.0 -pre-commit==3.3.2 +pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 2c72a0866..983f96cb9 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.3.2 # https://github.com/pre-commit/pre-commit +pre-commit==3.3.3 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 1c399167adf90b28589a88018dd8f33c06fdb49b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 14 Jun 2023 13:54:22 +0100 Subject: [PATCH 63/94] Update django-webpack-loader from 2.0.0 to 2.0.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9b2159edf..293defde1 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -46,5 +46,5 @@ django-cors-headers==4.0.0 # https://github.com/adamchainz/django-cors-headers drf-spectacular==0.26.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} {%- if cookiecutter.frontend_pipeline == 'Webpack' %} -django-webpack-loader==2.0.0 # https://github.com/django-webpack/django-webpack-loader +django-webpack-loader==2.0.1 # https://github.com/django-webpack/django-webpack-loader {%- endif %} From da308877951e1697d3e4267bae06675eaf1989c2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 14 Jun 2023 12:27:57 -0500 Subject: [PATCH 64/94] Update django-upgrade from 1.13.0 to 1.14.0 (#4394) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3f33db7db..0b59babfd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==23.3.0 isort==5.12.0 flake8==6.0.0 -django-upgrade==1.13.0 +django-upgrade==1.14.0 pre-commit==3.3.3 # Testing From 61ee4c3e30cfd70f53af89f1df18af037a4a9f8a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 14 Jun 2023 14:49:07 -0500 Subject: [PATCH 65/94] Update django-cors-headers from 4.0.0 to 4.1.0 (#4391) --- {{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 293defde1..7d733ed7f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,7 +41,7 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework -django-cors-headers==4.0.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==4.1.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation drf-spectacular==0.26.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 6d9cfeb0997ac3a4c3d9f8f5cad9a03d68fb2ac9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 15 Jun 2023 02:24:08 +0000 Subject: [PATCH 66/94] Release 2023.06.14 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60c1ce384..ad0e5acc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.14 + + +### Updated + +- Update django-cors-headers to 4.1.0 ([#4391](https://github.com/cookiecutter/cookiecutter-django/pull/4391)) + +- Update django-upgrade to 1.14.0 ([#4394](https://github.com/cookiecutter/cookiecutter-django/pull/4394)) + +- Update django-webpack-loader to 2.0.1 ([#4392](https://github.com/cookiecutter/cookiecutter-django/pull/4392)) + +- Update pre-commit to 3.3.3 ([#4390](https://github.com/cookiecutter/cookiecutter-django/pull/4390)) + ## 2023.06.11 diff --git a/setup.py b/setup.py index cc429c0e0..e6ad617c9 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.11" +version = "2023.06.14" with open("README.rst") as readme_file: long_description = readme_file.read() From 8c93ad4dd0cf24253e9e30256cd1d8118fdccc15 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 07:41:56 +0100 Subject: [PATCH 67/94] Auto-update pre-commit hooks (#4395) Co-authored-by: browniebroke --- {{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 91a50b97d..99b08271c 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/adamchainz/django-upgrade - rev: '1.13.0' + rev: '1.14.0' hooks: - id: django-upgrade args: ['--target-version', '4.1'] From d6b46df30a52f02faf35aa90f2812fc3f80ef958 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 16 Jun 2023 01:43:17 -0500 Subject: [PATCH 68/94] Update tox from 4.6.0 to 4.6.1 (#4398) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0b59babfd..e9253922d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ -tox==4.6.0 +tox==4.6.1 pytest==7.3.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 9b3c4e7a94f3c3657127ac9f67f9314a531622ad Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 16 Jun 2023 14:55:01 +0100 Subject: [PATCH 69/94] Update django-redis from 5.2.0 to 5.3.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 7d733ed7f..22130752f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -37,7 +37,7 @@ crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstra {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} django-compressor==4.3.1 # https://github.com/django-compressor/django-compressor {%- endif %} -django-redis==5.2.0 # https://github.com/jazzband/django-redis +django-redis==5.3.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework From 9c8913ef4790d46c4b659137d65840f2ffcbb871 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 16 Jun 2023 15:10:09 -0500 Subject: [PATCH 70/94] Update whitenoise from 6.4.0 to 6.5.0 (#4400) --- {{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 22130752f..92d6b2a0d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -9,7 +9,7 @@ rcssmin==1.1.1 # https://github.com/ndparker/rcssmin {%- endif %} argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} -whitenoise==6.4.0 # https://github.com/evansd/whitenoise +whitenoise==6.5.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.5.5 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From fc96e3859161635807b9a874925ff1543dffce0d Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 17 Jun 2023 02:21:32 +0000 Subject: [PATCH 71/94] Release 2023.06.16 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad0e5acc5..a90c1fecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.16 + + +### Updated + +- Update whitenoise to 6.5.0 ([#4400](https://github.com/cookiecutter/cookiecutter-django/pull/4400)) + +- Update django-redis to 5.3.0 ([#4399](https://github.com/cookiecutter/cookiecutter-django/pull/4399)) + +- Auto-update pre-commit hooks ([#4395](https://github.com/cookiecutter/cookiecutter-django/pull/4395)) + ## 2023.06.14 diff --git a/setup.py b/setup.py index e6ad617c9..717d19913 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.14" +version = "2023.06.16" with open("README.rst") as readme_file: long_description = readme_file.read() From ba9d73ce2139d9755f504e8452c7d34fcfad7ff9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 17 Jun 2023 13:38:53 -0500 Subject: [PATCH 72/94] Update myst-parser from 1.0.0 to 2.0.0 (#4388) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 1ae530fa7..d06b651b3 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ sphinx==6.2.1 sphinx-rtd-theme==1.2.2 -myst-parser==1.0.0 +myst-parser==2.0.0 From 0b92189b61a51dbaaf990c7cc547bd52b156c7eb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 17 Jun 2023 13:39:30 -0500 Subject: [PATCH 73/94] Update tox from 4.6.1 to 4.6.2 (#4401) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e9253922d..95b3d8cdc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ -tox==4.6.1 +tox==4.6.2 pytest==7.3.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 1e40d7908fcc5e3e276db37e0e1f630f7fba2b78 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 18 Jun 2023 02:31:49 +0000 Subject: [PATCH 74/94] Release 2023.06.17 --- CHANGELOG.md | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a90c1fecd..1ed82b9a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.17 + + ## 2023.06.16 diff --git a/setup.py b/setup.py index 717d19913..f03a87a09 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.16" +version = "2023.06.17" with open("README.rst") as readme_file: long_description = readme_file.read() From 7ad2e1fdae82e011fa823f5f42590bf6ce3638ee Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 18 Jun 2023 13:03:36 +0100 Subject: [PATCH 75/94] Fix missing celery env variable when running compilemessages (#4403) --- .../compose/production/django/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 5a863ddc5..a48cbc4af 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -122,6 +122,9 @@ RUN chown django:django ${APP_HOME} USER django RUN DATABASE_URL="" \ + {%- if cookiecutter.use_celery == "y" %} + CELERY_BROKER_URL="" \ + {%- endif %} DJANGO_SETTINGS_MODULE="config.settings.test" \ python manage.py compilemessages From 224f31e7f34ab9daaa8e8394e9c6823e7657fd58 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 18 Jun 2023 07:32:36 -0500 Subject: [PATCH 76/94] Update flower from 1.2.0 to 2.0.0 (#4402) --- {{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 92d6b2a0d..6a9b57013 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -19,7 +19,7 @@ hiredis==2.2.3 # https://github.com/redis/hiredis-py celery==5.3.0 # pyup: < 6.0 # https://github.com/celery/celery django-celery-beat==2.5.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} -flower==1.2.0 # https://github.com/mher/flower +flower==2.0.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} From 95353f07a975a201cd90088ad1b1905611b94d11 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 19 Jun 2023 02:26:21 +0000 Subject: [PATCH 77/94] Release 2023.06.18 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ed82b9a1..6eabf5799 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.18 + + +### Changed + +- Fix missing celery env variable when running compilemessages ([#4403](https://github.com/cookiecutter/cookiecutter-django/pull/4403)) + +### Updated + +- Update flower to 2.0.0 ([#4402](https://github.com/cookiecutter/cookiecutter-django/pull/4402)) + ## 2023.06.17 diff --git a/setup.py b/setup.py index f03a87a09..335b1cc66 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.17" +version = "2023.06.18" with open("README.rst") as readme_file: long_description = readme_file.read() From 2bff4b8a8376cece7268af0635f100fc0c71c9c0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 19 Jun 2023 04:11:17 -0500 Subject: [PATCH 78/94] Update celery to 5.3.1 (#4404) --- {{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 6a9b57013..5e7f7d28d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -16,7 +16,7 @@ redis==4.5.5 # https://github.com/redis/redis-py hiredis==2.2.3 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} -celery==5.3.0 # pyup: < 6.0 # https://github.com/celery/celery +celery==5.3.1 # pyup: < 6.0 # https://github.com/celery/celery django-celery-beat==2.5.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==2.0.0 # https://github.com/mher/flower From 5de0e05490cd28cf517d71b5f19c9aa0afb8889b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 10:11:35 +0100 Subject: [PATCH 79/94] Auto-update pre-commit hooks (#4405) Co-authored-by: browniebroke --- .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 98afc14e0..b35eae073 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.6.0 + rev: v3.7.0 hooks: - id: pyupgrade args: [--py311-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 99b08271c..f16a87fd2 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: args: ['--target-version', '4.1'] - repo: https://github.com/asottile/pyupgrade - rev: v3.6.0 + rev: v3.7.0 hooks: - id: pyupgrade args: [--py311-plus] From 399a080c5b708ba72cb53eefa6a270c7a4de5218 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 20 Jun 2023 02:21:32 +0000 Subject: [PATCH 80/94] Release 2023.06.19 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eabf5799..d35d947ac 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.06.19 + + +### Updated + +- Auto-update pre-commit hooks ([#4405](https://github.com/cookiecutter/cookiecutter-django/pull/4405)) + +- Update celery to 5.3.1 ([#4404](https://github.com/cookiecutter/cookiecutter-django/pull/4404)) + ## 2023.06.18 diff --git a/setup.py b/setup.py index 335b1cc66..64027dad9 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.18" +version = "2023.06.19" with open("README.rst") as readme_file: long_description = readme_file.read() From b4c705f16e1e0c2cd7e070a731e2c900a3e5247a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:36:44 +0100 Subject: [PATCH 81/94] Upgrade traefik to 2.10.3 (#4408) Bumps traefik from 2.10.1 to 2.10.3. --- 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 581bbfebd..bdedff720 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM traefik:2.10.1 +FROM traefik:2.10.3 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From 91cc9e2f3a654b1fee051a24030aa42d907923bb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Jun 2023 04:37:05 -0500 Subject: [PATCH 82/94] Update tox to 4.6.3 (#4407) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 95b3d8cdc..084f870f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ -tox==4.6.2 +tox==4.6.3 pytest==7.3.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From c2afdae77a958eb34ea0113304a3969376149562 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Jun 2023 02:26:04 +0000 Subject: [PATCH 83/94] Release 2023.06.21 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d35d947ac..7d563b1a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.21 + + +### Updated + +- Upgrade traefik to 2.10.3 ([#4408](https://github.com/cookiecutter/cookiecutter-django/pull/4408)) + ## 2023.06.19 diff --git a/setup.py b/setup.py index 64027dad9..3d6c87f92 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.19" +version = "2023.06.21" with open("README.rst") as readme_file: long_description = readme_file.read() From 9f9a88670855490d7026e998f7d9443efbb50467 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 22 Jun 2023 10:28:21 -0500 Subject: [PATCH 84/94] Update sentry-sdk from 1.25.1 to 1.26.0 (#4409) --- {{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 aec79b3d3..36f6e74f5 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.25.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.26.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From a99e28702403bd04e2c44cf760d880a719266c28 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 22 Jun 2023 14:24:23 -0500 Subject: [PATCH 85/94] Update drf-spectacular from 0.26.2 to 0.26.3 (#4411) --- {{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 5e7f7d28d..a032f404d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -43,7 +43,7 @@ django-redis==5.3.0 # https://github.com/jazzband/django-redis djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework django-cors-headers==4.1.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation -drf-spectacular==0.26.2 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.26.3 # https://github.com/tfranzel/drf-spectacular {%- endif %} {%- if cookiecutter.frontend_pipeline == 'Webpack' %} django-webpack-loader==2.0.1 # https://github.com/django-webpack/django-webpack-loader From 2c5342c36d8a917c229249e6c5668e49a0855f62 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 22 Jun 2023 14:24:38 -0500 Subject: [PATCH 86/94] Update pygithub from 1.58.2 to 1.59.0 (#4410) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 084f870f4..15497ac2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.58.2 +PyGithub==1.59.0 gitpython==3.1.31 jinja2==3.1.2 requests==2.31.0 From d45ecc53f11f540a9f15e63722878957ace31607 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 23 Jun 2023 02:32:39 +0000 Subject: [PATCH 87/94] Release 2023.06.22 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d563b1a9..56fa84c30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.22 + + +### Updated + +- Update pygithub to 1.59.0 ([#4410](https://github.com/cookiecutter/cookiecutter-django/pull/4410)) + +- Update drf-spectacular to 0.26.3 ([#4411](https://github.com/cookiecutter/cookiecutter-django/pull/4411)) + +- Update sentry-sdk to 1.26.0 ([#4409](https://github.com/cookiecutter/cookiecutter-django/pull/4409)) + ## 2023.06.21 diff --git a/setup.py b/setup.py index 3d6c87f92..9ab3a64bb 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.21" +version = "2023.06.22" with open("README.rst") as readme_file: long_description = readme_file.read() From 2b9c56cf3995ae1695a1b084a19de0c4b21e192a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 23 Jun 2023 10:21:53 +0100 Subject: [PATCH 88/94] Add open-collective to funding file --- .github/FUNDING.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 53a486671..23ca7a37f 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -2,11 +2,4 @@ github: [pydanny, browniebroke] patreon: feldroy -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: ["https://www.patreon.com/browniebroke"] +open_collective: cookiecutter-django From d4824e1934cdf1f4d923e490b2e7119371bf1baa Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 23 Jun 2023 10:35:44 +0100 Subject: [PATCH 89/94] Link to OpenCollective in README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d718ee34c..bab5aa041 100644 --- a/README.md +++ b/README.md @@ -56,10 +56,11 @@ _These features can be enabled during initial project setup._ ## Support this Project! -This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django: +This project is an open source project run by volunteers. You can sponsor us via [OpenCollective](https://opencollective.com/cookiecutter-django) or individually via GitHub Sponsors: - Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB. - Fabio C. Barrionuevo, Core Developer ([GitHub](https://github.com/luzfcb)): expertise in Python/Django, hands-on DevOps and frontend experience. +- Bruno Alla, Core Developer ([GitHub](https://github.com/browniebroke)): expertise in Python/Django and DevOps. - Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience. Projects that provide financial support to the maintainers: From a126dfb96f0143adf3c9cc644f7f79a2c3186476 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 23 Jun 2023 18:48:31 +0100 Subject: [PATCH 90/94] Update pytest from 7.3.2 to 7.4.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 15497ac2e..c547458b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ tox==4.6.3 -pytest==7.3.2 +pytest==7.4.0 pytest-xdist==3.3.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 From b2642ac37d12eaa8e94c15214233d51a329e4cdb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 23 Jun 2023 18:48:31 +0100 Subject: [PATCH 91/94] Update pytest from 7.3.2 to 7.4.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 983f96cb9..b3a3e7c74 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.3.0 # https://github.com/python/mypy django-stubs==4.2.1 # https://github.com/typeddjango/django-stubs -pytest==7.3.2 # https://github.com/pytest-dev/pytest +pytest==7.4.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==3.14.1 # https://github.com/typeddjango/djangorestframework-stubs From f0357e2ad04628bb99e8a41d4eadd47eb443d4dc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 25 Jun 2023 16:38:42 +0100 Subject: [PATCH 92/94] Update redis from 4.5.5 to 4.6.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 a032f404d..d23da8c61 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.5.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.5.5 # https://github.com/redis/redis-py +redis==4.6.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py {%- endif %} From da6fadd99ea1a6da02d9130727a5e530a38caf2f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 26 Jun 2023 02:35:34 +0100 Subject: [PATCH 93/94] Update mypy from 1.3.0 to 1.4.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 983f96cb9..b3f53a140 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==1.3.0 # https://github.com/python/mypy +mypy==1.4.1 # https://github.com/python/mypy django-stubs==4.2.1 # https://github.com/typeddjango/django-stubs pytest==7.3.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar From 541ef05fc80706291ed1f4c0ca559ab73358eb97 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Jun 2023 02:33:15 +0000 Subject: [PATCH 94/94] Release 2023.06.26 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56fa84c30..309f62a26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.06.26 + + +### Updated + +- Update pytest to 7.4.0 ([#4412](https://github.com/cookiecutter/cookiecutter-django/pull/4412)) + +- Update redis to 4.6.0 ([#4415](https://github.com/cookiecutter/cookiecutter-django/pull/4415)) + +- Update mypy to 1.4.1 ([#4416](https://github.com/cookiecutter/cookiecutter-django/pull/4416)) + ## 2023.06.22 diff --git a/setup.py b/setup.py index 9ab3a64bb..bf58e0239 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.06.22" +version = "2023.06.26" with open("README.rst") as readme_file: long_description = readme_file.read()