From a1f2a670d96d4e2ec3dfe6e9d89603d6f517cfbb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 15 Apr 2023 09:48:41 -0500 Subject: [PATCH 001/108] Update drf-spectacular to 0.26.2 (#4277) --- {{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 0fdee1f86..46b38314f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -44,7 +44,7 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework django-cors-headers==3.14.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation -drf-spectacular==0.26.1 # https://github.com/tfranzel/drf-spectacular +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 From 32474ab3674f9f98b569ec7f0a00134556eb1e39 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 15 Apr 2023 15:53:31 +0100 Subject: [PATCH 002/108] Run template tests in parallel in pytest-xdist (#4275) --- .github/workflows/ci.yml | 2 +- requirements.txt | 1 + tox.ini | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7cdda633..aee923ba4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: - name: Install dependencies run: pip install -r requirements.txt - name: Run tests - run: pytest tests + run: pytest -n auto tests docker: strategy: diff --git a/requirements.txt b/requirements.txt index 7ee3bbdea..f2216be6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,6 +13,7 @@ pre-commit==3.2.2 # ------------------------------------------------------------------------------ tox==4.4.12 pytest==7.3.1 +pytest-xdist==3.2.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 pyyaml==6.0 diff --git a/tox.ini b/tox.ini index b10d16427..903d5a53b 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = py311,black-template [testenv] deps = -rrequirements.txt passenv = AUTOFIXABLE_STYLES -commands = pytest {posargs:./tests} +commands = pytest -n auto {posargs:./tests} [testenv:black-template] deps = black From b018b7b8a8616d9c56cae231743eb351d1ecc549 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 16 Apr 2023 02:20:37 +0000 Subject: [PATCH 003/108] Release 2023.04.15 --- CHANGELOG.md | 21 +++++++++++++++++++++ setup.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 415b29a2e..77dcc36b6 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.04.15 + + +### Changed + +- Add username_type option ([#3958](https://github.com/cookiecutter/cookiecutter-django/pull/3958)) + +- Fix inconsistent line length and move configs to pyproject.toml ([#4276](https://github.com/cookiecutter/cookiecutter-django/pull/4276)) + +- Relax rules for linting of pull requests on this template ([#4273](https://github.com/cookiecutter/cookiecutter-django/pull/4273)) + +- Add more pre-commit hooks ([#4266](https://github.com/cookiecutter/cookiecutter-django/pull/4266)) + +- Upgrade Python to version 3.11 (Faster CPython) ([#4256](https://github.com/cookiecutter/cookiecutter-django/pull/4256)) + +### Updated + +- Update drf-spectacular to 0.26.2 ([#4277](https://github.com/cookiecutter/cookiecutter-django/pull/4277)) + +- Update pytest to 7.3.1 ([#4272](https://github.com/cookiecutter/cookiecutter-django/pull/4272)) + ## 2023.04.13 ### Updated diff --git a/setup.py b/setup.py index eb7d14ffd..57bd1c61b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.13" +version = "2023.04.15" with open("README.rst") as readme_file: long_description = readme_file.read() From 0a23b52b54553958ad77a302479f5159d8c72e84 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 16 Apr 2023 12:59:01 +0100 Subject: [PATCH 004/108] Fix syntax in pre-commit config --- {{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 5d8670e4a..c47b403a3 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: hooks: - id: prettier args: ['--tab-width', '2', '--single-quote'] - exclude: {{cookiecutter.project_slug}}/templates/ + exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/asottile/pyupgrade rev: v3.3.1 From 61314f2f9a993225e8db2cb5092eb54d201ed996 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 16 Apr 2023 20:45:52 +0100 Subject: [PATCH 005/108] Tweak spacing for nginx container --- {{cookiecutter.project_slug}}/production.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index 4d56fbfa8..30d72d61e 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -97,6 +97,7 @@ services: - production_postgres_data_backups:/backups:z {%- endif %} {%- if cookiecutter.cloud_provider == 'None' %} + nginx: build: context: . From 1a9d301550ebbe7b00e74438ac48713156232018 Mon Sep 17 00:00:00 2001 From: Birtibu <130974179+Birtibu@users.noreply.github.com> Date: Tue, 18 Apr 2023 21:42:15 +0200 Subject: [PATCH 006/108] Document how to add 3rd party packages with Docker (#4279) * Update developing-locally-docker.rst Add 3rd party python packages * Update docs/developing-locally-docker.rst Co-authored-by: Bruno Alla * Update docs/developing-locally-docker.rst Co-authored-by: Bruno Alla --------- Co-authored-by: Bruno Alla --- docs/developing-locally-docker.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 935e86020..3dbe6e47d 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -144,6 +144,19 @@ This tells our computer that all future commands are specifically for the dev1 m $ eval "$(docker-machine env dev1)" +Add 3rd party python packages +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To install a new 3rd party python package, you cannot use ``pip install ``, that would only add the package to the container. The container is ephemeral, so that new library won't be persisted if you run another container. Instead, you should modify the Docker image: +You have to modify the relevant requirement file: base, local or production by adding: :: + + == + +To get this change picked up, you'll need to rebuild the image(s) and restart the running container: :: + + docker-compose -f local.yml build + docker-compose -f local.yml up + Debugging ~~~~~~~~~ From dd1474989144b0f140fa9af19df18695bb103847 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 18 Apr 2023 19:42:53 +0000 Subject: [PATCH 007/108] 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 ca5762fe8..37c85e1bc 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1387,5 +1387,10 @@ "name": "Morten Kaae", "github_login": "MortenKaae", "twitter_username": "" + }, + { + "name": "Birtibu", + "github_login": "Birtibu", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 47ece91dc..340588a9a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -369,6 +369,13 @@ Listed in alphabetical order. + + Birtibu + + Birtibu + + + Bo Lopker From cbcade52ca6c7bfff57e3b80b3fd132124bef06d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 19 Apr 2023 02:19:15 +0000 Subject: [PATCH 008/108] Release 2023.04.18 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77dcc36b6..56bea8264 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.04.18 + + +### Documentation + +- Document how to add 3rd party packages with Docker ([#4279](https://github.com/cookiecutter/cookiecutter-django/pull/4279)) + ## 2023.04.15 diff --git a/setup.py b/setup.py index 57bd1c61b..caf384306 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.15" +version = "2023.04.18" with open("README.rst") as readme_file: long_description = readme_file.read() From b63d53b16d93e1e32ed4aae9ac52f50efba0cdd6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Apr 2023 10:50:42 -0500 Subject: [PATCH 009/108] Update sentry-sdk to 1.20.0 (#4282) --- {{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 42cdbf53f..f8af70666 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.19.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.20.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 46a8845467961b5e34bcdd7a829f435cea10cbba Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 20 Apr 2023 02:17:50 +0000 Subject: [PATCH 010/108] Release 2023.04.19 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56bea8264..6bcf9947c 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.04.19 + + +### Updated + +- Update sentry-sdk to 1.20.0 ([#4282](https://github.com/cookiecutter/cookiecutter-django/pull/4282)) + ## 2023.04.18 diff --git a/setup.py b/setup.py index caf384306..feb62dd81 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.18" +version = "2023.04.19" with open("README.rst") as readme_file: long_description = readme_file.read() From 7d4dd985342b59f5550dfee3480715fedf9568b0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 24 Apr 2023 01:28:46 -0500 Subject: [PATCH 011/108] Update sphinx to 6.2.0 (#4285) * Update sphinx from 6.1.3 to 6.2.0 * Update sphinx from 6.1.3 to 6.2.0 --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index c16401c84..739c1d4a6 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==6.1.3 +sphinx==6.2.0 sphinx-rtd-theme==1.2.0 myst-parser==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index a867b0673..bef7edf87 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.10.0 # https://github.com/typeddjango/djangorestfr # Documentation # ------------------------------------------------------------------------------ -sphinx==6.1.3 # https://github.com/sphinx-doc/sphinx +sphinx==6.2.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From db0d78be8ac9bd65ae0fce7aaa4f89fd5552d11f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:29:28 +0100 Subject: [PATCH 012/108] Auto-update pre-commit hooks (#4286) 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 930465a57..7b477739a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.0-alpha.6" + rev: "v3.0.0-alpha.8-for-vscode" hooks: - id: prettier args: ["--tab-width", "2"] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index c47b403a3..42bbbc2cd 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.6 + rev: v3.0.0-alpha.8-for-vscode hooks: - id: prettier args: ['--tab-width', '2', '--single-quote'] From b177e4a8f4c5c755baf4feb3a5a5ef65c0c2dc2f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 25 Apr 2023 02:18:35 +0000 Subject: [PATCH 013/108] Release 2023.04.24 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bcf9947c..44a36da44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.24 + + +### Updated + +- Auto-update pre-commit hooks ([#4286](https://github.com/cookiecutter/cookiecutter-django/pull/4286)) + +- Update sphinx to 6.2.0 ([#4285](https://github.com/cookiecutter/cookiecutter-django/pull/4285)) + ## 2023.04.19 diff --git a/setup.py b/setup.py index feb62dd81..f72aa3d27 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.19" +version = "2023.04.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 36455a3b30e184039cc10a16eef85216338bdf0f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 09:11:16 +0100 Subject: [PATCH 014/108] [pre-commit.ci] pre-commit autoupdate (#4289) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.8-for-vscode → v3.0.0-alpha.9-for-vscode](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.8-for-vscode...v3.0.0-alpha.9-for-vscode) - [github.com/asottile/pyupgrade: v3.3.1 → v3.3.2](https://github.com/asottile/pyupgrade/compare/v3.3.1...v3.3.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7b477739a..9445866f5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,13 +17,13 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.0-alpha.8-for-vscode" + rev: "v3.0.0-alpha.9-for-vscode" hooks: - id: prettier args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.3.1 + rev: v3.3.2 hooks: - id: pyupgrade args: [--py311-plus] From 9af5be6c613c0473be79e037b366606208d5d8bf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 09:11:50 +0100 Subject: [PATCH 015/108] Auto-update pre-commit hooks (#4288) Co-authored-by: browniebroke --- {{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 42bbbc2cd..d638c776b 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -18,14 +18,14 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.8-for-vscode + rev: v3.0.0-alpha.9-for-vscode hooks: - id: prettier args: ['--tab-width', '2', '--single-quote'] exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/asottile/pyupgrade - rev: v3.3.1 + rev: v3.3.2 hooks: - id: pyupgrade args: [--py311-plus] From ebbb4b36738c54bcd314112a6fbb06ebbe9d15ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 09:13:42 +0100 Subject: [PATCH 016/108] Bump traefik from 2.9.10 to 2.10.0 (#4290) Bumps traefik from 2.9.10 to 2.10.0. --- updated-dependencies: - dependency-name: traefik dependency-type: direct:production update-type: version-update:semver-minor ... 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 7b053059d..30470d029 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM traefik:2.9.10 +FROM traefik:2.10.0 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From e0d2ff7761d4936b6e2c0aaa9d61ad3a7addae4f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 25 Apr 2023 03:36:27 -0500 Subject: [PATCH 017/108] Update tox to 4.5.0 (#4287) Co-authored-by: Bruno Alla --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f2216be6d..75b377c5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.2.2 # Testing # ------------------------------------------------------------------------------ -tox==4.4.12 +tox==4.5.0 pytest==7.3.1 pytest-xdist==3.2.1 pytest-cookies==0.7.0 From 15c933c206e721b58e39f20a7bb849a079dd85f4 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 25 Apr 2023 10:44:02 +0200 Subject: [PATCH 018/108] Fix comment typos in Dockerfiles --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +- .../compose/production/django/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 1d5c14afc..db48870d8 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,4 +1,4 @@ -# define an alias for the specfic python version used in this file. +# define an alias for the specific python version used in this file. FROM python:3.11.3-slim-bullseye as python # Python build stage diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index f8bcc35bd..8239a6635 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,4 +1,4 @@ -# define an alias for the specfic python version used in this file. +# define an alias for the specific python version used in this file. FROM python:3.11.3-slim-bullseye as python diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 84c702db0..33222c524 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -24,7 +24,7 @@ ENV DJANGO_AZURE_ACCOUNT_NAME=${DJANGO_AZURE_ACCOUNT_NAME} RUN npm run build {%- endif %} -# define an alias for the specfic python version used in this file. +# define an alias for the specific python version used in this file. FROM python:3.11.3-slim-bullseye as python # Python build stage From 50364f9d1077b3b7292678b4bab0de11b0cd413f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 25 Apr 2023 12:49:21 -0500 Subject: [PATCH 019/108] Update sphinx to 6.2.1 (#4292) * Update sphinx from 6.2.0 to 6.2.1 * Update sphinx from 6.2.0 to 6.2.1 --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 739c1d4a6..d3dd61dc6 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==6.2.0 +sphinx==6.2.1 sphinx-rtd-theme==1.2.0 myst-parser==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index bef7edf87..4578903ee 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.10.0 # https://github.com/typeddjango/djangorestfr # Documentation # ------------------------------------------------------------------------------ -sphinx==6.2.0 # https://github.com/sphinx-doc/sphinx +sphinx==6.2.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 0444b6d5deb9f58a6cedc379df6eff3d1403e9b6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 25 Apr 2023 12:49:32 -0500 Subject: [PATCH 020/108] Update sentry-sdk from 1.20.0 to 1.21.0 (#4293) --- {{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 f8af70666..112dd08ec 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.20.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.21.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 6f7871d2a8c00a47dce54fa568be4481967fb849 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Apr 2023 02:18:44 +0000 Subject: [PATCH 021/108] Release 2023.04.25 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44a36da44..ca975eaee 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.04.25 + + +### Updated + +- Update sentry-sdk to 1.21.0 ([#4293](https://github.com/cookiecutter/cookiecutter-django/pull/4293)) + +- Update sphinx to 6.2.1 ([#4292](https://github.com/cookiecutter/cookiecutter-django/pull/4292)) + +- Bump traefik from 2.9.10 to 2.10.0 ([#4290](https://github.com/cookiecutter/cookiecutter-django/pull/4290)) + +- Auto-update pre-commit hooks ([#4288](https://github.com/cookiecutter/cookiecutter-django/pull/4288)) + ## 2023.04.24 diff --git a/setup.py b/setup.py index f72aa3d27..f396dff2c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.24" +version = "2023.04.25" with open("README.rst") as readme_file: long_description = readme_file.read() From 956d851039f6d8859a9e6ba9f0fc6d4124f23d1c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Apr 2023 01:54:46 -0500 Subject: [PATCH 022/108] Update werkzeug to 2.3.0 (#4296) --- {{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 4578903ee..4d15033b7 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.2.3 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.3.0 # 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 3b68594197b9881250ca27adc6e03cdf998fb004 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Apr 2023 01:55:56 -0500 Subject: [PATCH 023/108] Update mypy to 1.2.0 (#4295) --- {{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 4d15033b7..a06d6eab5 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.1.1 # https://github.com/python/mypy +mypy==1.2.0 # https://github.com/python/mypy django-stubs==1.16.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 16c203fde1d02a5d02ed2df0eac625a02f6516aa Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Apr 2023 01:57:20 -0500 Subject: [PATCH 024/108] Update coverage to 7.2.3 (#4297) --- {{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 a06d6eab5..887954a59 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.2 # https://github.com/nedbat/coveragepy +coverage==7.2.3 # 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 5bc3df765070abe2187ad3c45983c3ae73bb9d58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 08:06:56 +0100 Subject: [PATCH 025/108] Upgrade to node v18 (#4294) * Bump node in /{{cookiecutter.project_slug}}/compose/local/node Bumps node from 16-bullseye-slim to 18-bullseye-slim. --- updated-dependencies: - dependency-name: node dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Update to node 18 in prod Dockerfile * Update to node 18 in package.json * Update node version in CI * Update node version in documentation --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bruno Alla --- .github/workflows/ci.yml | 2 +- docs/developing-locally.rst | 2 +- {{cookiecutter.project_slug}}/compose/local/node/Dockerfile | 2 +- .../compose/production/django/Dockerfile | 2 +- {{cookiecutter.project_slug}}/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aee923ba4..dbda77b5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,6 +110,6 @@ jobs: run: pip install -r requirements.txt - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" - name: Bare Metal ${{ matrix.script.name }} run: sh tests/test_bare.sh ${{ matrix.script.args }} diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index b8655a84c..b79033aaa 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -174,7 +174,7 @@ Sass Compilation & Live Reloading If you've opted for Gulp or Webpack as front-end pipeline, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page. -#. Make sure that `Node.js`_ v16 is installed on your machine. +#. Make sure that `Node.js`_ v18 is installed on your machine. #. In the project root, install the JS dependencies with:: $ npm install diff --git a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile index 8062fa689..707ed0c9d 100644 --- a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-bullseye-slim +FROM node:18-bullseye-slim WORKDIR /app diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 33222c524..4c8695a57 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -1,5 +1,5 @@ {% if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] -%} -FROM node:16-bullseye-slim as client-builder +FROM node:18-bullseye-slim as client-builder ARG APP_HOME=/app WORKDIR ${APP_HOME} diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 90ac63763..a04cf41f5 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -35,7 +35,7 @@ "webpack-merge": "^5.8.0" }, "engines": { - "node": "16" + "node": "18" }, "browserslist": [ "last 2 versions" From 3198750b385195731cc638a54b023e37752626da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 08:47:17 +0100 Subject: [PATCH 026/108] Upgrade concurrently to 8.0.1 (#4237) Bumps [concurrently](https://github.com/open-cli-tools/concurrently) from 7.6.0 to 8.0.1. - [Release notes](https://github.com/open-cli-tools/concurrently/releases) - [Commits](https://github.com/open-cli-tools/concurrently/compare/v7.6.0...v8.0.1) --- updated-dependencies: - dependency-name: concurrently 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 a04cf41f5..d6cdf6a70 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -11,7 +11,7 @@ "browser-sync": "^2.27.7", "css-loader": "^6.5.1", "gulp-concat": "^2.6.1", - "concurrently": "^7.0.0", + "concurrently": "^8.0.1", "cssnano": "^5.0.11", "gulp": "^4.0.2", "gulp-imagemin": "^7.1.0", From 3a9882e92c05e184732afb933b07a9263c3f4281 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 09:22:00 +0100 Subject: [PATCH 027/108] Upgrade cssnano to v6.0.0 (#4233) Bumps [cssnano](https://github.com/cssnano/cssnano) from 5.1.15 to 6.0.0. - [Release notes](https://github.com/cssnano/cssnano/releases) - [Commits](https://github.com/cssnano/cssnano/compare/cssnano@5.1.15...cssnano@6.0.0) --- updated-dependencies: - dependency-name: cssnano 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 d6cdf6a70..c60a7243e 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -12,7 +12,7 @@ "css-loader": "^6.5.1", "gulp-concat": "^2.6.1", "concurrently": "^8.0.1", - "cssnano": "^5.0.11", + "cssnano": "^6.0.0", "gulp": "^4.0.2", "gulp-imagemin": "^7.1.0", "gulp-plumber": "^1.2.1", From 66660f41e63468b332906751ffb22f428d1d0bbf Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 26 Apr 2023 10:29:07 +0200 Subject: [PATCH 028/108] Update cdn js URLs to latest Bootstrap --- {{cookiecutter.project_slug}}/package.json | 2 +- .../{{cookiecutter.project_slug}}/templates/base.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index c60a7243e..affcd2e01 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -7,7 +7,7 @@ "@popperjs/core": "^2.10.2", "autoprefixer": "^10.4.0", "babel-loader": "^9.1.2", - "bootstrap": "^5.1.3", + "bootstrap": "^5.2.3", "browser-sync": "^2.27.7", "css-loader": "^6.5.1", "gulp-concat": "^2.6.1", diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index ad51a6e18..44f0d5c52 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -20,7 +20,7 @@ {%- if cookiecutter.frontend_pipeline in ['None', 'Django Compressor'] %} {%- raw %} - + {%- endraw %} {%- endif %} {%- raw %} @@ -51,7 +51,7 @@ {% render_bundle 'vendors' 'js' attrs='defer' %} {%- endraw %}{% else %}{% raw %} - + {%- endraw %}{% endif %}{% raw %} From 83997366016386260470d6147020192508609d4d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Apr 2023 16:09:20 -0500 Subject: [PATCH 029/108] Update tox from 4.5.0 to 4.5.1 (#4299) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 75b377c5b..bb4d2adb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ pre-commit==3.2.2 # Testing # ------------------------------------------------------------------------------ -tox==4.5.0 +tox==4.5.1 pytest==7.3.1 pytest-xdist==3.2.1 pytest-cookies==0.7.0 From f6e9f2c8182201e72dda3a8ac6f89fe85acc655f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Apr 2023 16:09:48 -0500 Subject: [PATCH 030/108] Update requests from 2.28.2 to 2.29.0 (#4300) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bb4d2adb4..0748004e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,4 @@ pyyaml==6.0 PyGithub==1.58.1 gitpython==3.1.31 jinja2==3.1.2 -requests==2.28.2 +requests==2.29.0 From 5cb3b33122b88c059c48fc33928689baa2ee47fd Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Apr 2023 02:18:40 +0000 Subject: [PATCH 031/108] Release 2023.04.26 --- CHANGELOG.md | 17 +++++++++++++++++ setup.py | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca975eaee..a204f8973 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.04.26 + + +### Updated + +- Upgrade cssnano to v6.0.0 ([#4233](https://github.com/cookiecutter/cookiecutter-django/pull/4233)) + +- Upgrade concurrently to 8.0.1 ([#4237](https://github.com/cookiecutter/cookiecutter-django/pull/4237)) + +- Upgrade to node v18 ([#4294](https://github.com/cookiecutter/cookiecutter-django/pull/4294)) + +- Update coverage to 7.2.3 ([#4297](https://github.com/cookiecutter/cookiecutter-django/pull/4297)) + +- Update mypy to 1.2.0 ([#4295](https://github.com/cookiecutter/cookiecutter-django/pull/4295)) + +- Update werkzeug to 2.3.0 ([#4296](https://github.com/cookiecutter/cookiecutter-django/pull/4296)) + ## 2023.04.25 diff --git a/setup.py b/setup.py index f396dff2c..8d97078d8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.25" +version = "2023.04.26" with open("README.rst") as readme_file: long_description = readme_file.read() From fe49a2cbe526da7627d7ab69e7b0bcbcae8aa416 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 27 Apr 2023 09:39:01 -0500 Subject: [PATCH 032/108] Update django-stubs to 4.2.0 (#4301) --- {{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 887954a59..6129fdef6 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==1.16.0 # https://github.com/typeddjango/django-stubs +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" %} From a8f5c55455cd126801be61ec06ef59c01d227e62 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 27 Apr 2023 09:56:51 -0500 Subject: [PATCH 033/108] Update werkzeug to 2.3.1 (#4302) --- {{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 6129fdef6..0b729ee56 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.0 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.3.1 # 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 d0d679bb97fa7481bd986c013a49acfe7c83cbc3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 27 Apr 2023 12:55:44 -0500 Subject: [PATCH 034/108] Update djangorestframework-stubs from 1.10.0 to 3.14.0 (#4303) --- {{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 0b729ee56..bac28ecfa 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==1.10.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==3.14.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From 9d821ee82b27ab9376d0c1f2ffb490b289fde389 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 28 Apr 2023 02:18:55 +0000 Subject: [PATCH 035/108] Release 2023.04.27 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a204f8973..093cf98ef 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.04.27 + + +### Updated + +- Update djangorestframework-stubs to 3.14.0 ([#4303](https://github.com/cookiecutter/cookiecutter-django/pull/4303)) + +- Update werkzeug to 2.3.1 ([#4302](https://github.com/cookiecutter/cookiecutter-django/pull/4302)) + +- Update django-stubs to 4.2.0 ([#4301](https://github.com/cookiecutter/cookiecutter-django/pull/4301)) + ## 2023.04.26 diff --git a/setup.py b/setup.py index 8d97078d8..bc1345965 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.26" +version = "2023.04.27" with open("README.rst") as readme_file: long_description = readme_file.read() From c88f8ef37a2fa333600ef3603d30282ae242cb1e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 28 Apr 2023 08:56:22 +0100 Subject: [PATCH 036/108] Add django-upgrade to pre-commit hooks (#4298) --- requirements.txt | 1 + tests/test_cookiecutter_generation.py | 27 +++++++++++++++++-- .../.pre-commit-config.yaml | 6 +++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0748004e8..5e3b3f468 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ binaryornot==0.4.4 black==23.3.0 isort==5.12.0 flake8==6.0.0 +django-upgrade==1.13.0 pre-commit==3.2.2 # Testing diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 9837be3ef..778e3411f 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -1,3 +1,4 @@ +import glob import os import re import sys @@ -24,6 +25,7 @@ elif sys.platform.startswith("darwin") and os.getenv("CI"): # automatically by running pre-commit after generation however they are tedious # to fix in the template, so we don't insist too much in fixing them. AUTOFIXABLE_STYLES = os.getenv("AUTOFIXABLE_STYLES") == "1" +auto_fixable = pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="auto-fixable") @pytest.fixture @@ -185,7 +187,7 @@ def test_flake8_passes(cookies, context_override): pytest.fail(e.stdout.decode()) -@pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="Black is auto-fixable") +@auto_fixable @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id) def test_black_passes(cookies, context_override): """Check whether generated project passes black style.""" @@ -204,7 +206,7 @@ def test_black_passes(cookies, context_override): pytest.fail(e.stdout.decode()) -@pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="isort is auto-fixable") +@auto_fixable @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id) def test_isort_passes(cookies, context_override): """Check whether generated project passes isort style.""" @@ -216,6 +218,27 @@ def test_isort_passes(cookies, context_override): pytest.fail(e.stdout.decode()) +@auto_fixable +@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id) +def test_django_upgrade_passes(cookies, context_override): + """Check whether generated project passes django-upgrade.""" + result = cookies.bake(extra_context=context_override) + + python_files = [ + file_path.removeprefix(f"{result.project_path}/") + for file_path in glob.glob(str(result.project_path / "**" / "*.py"), recursive=True) + ] + try: + sh.django_upgrade( + "--target-version", + "4.1", + *python_files, + _cwd=str(result.project_path), + ) + except sh.ErrorReturnCode as e: + pytest.fail(e.stdout.decode()) + + @pytest.mark.parametrize( ["use_docker", "expected_test_script"], [ diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index d638c776b..cd64098a8 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -24,6 +24,12 @@ repos: args: ['--tab-width', '2', '--single-quote'] exclude: '{{cookiecutter.project_slug}}/templates/' + - repo: https://github.com/adamchainz/django-upgrade + rev: "1.13.0" + hooks: + - id: django-upgrade + args: ["--target-version", "4.1"] + - repo: https://github.com/asottile/pyupgrade rev: v3.3.2 hooks: From c570e146ec53b46f47313dc6895be8677fa64e94 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 29 Apr 2023 02:18:04 +0000 Subject: [PATCH 037/108] Release 2023.04.28 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 093cf98ef..128c5d960 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.04.28 + + +### Changed + +- Add django-upgrade to pre-commit hooks ([#4298](https://github.com/cookiecutter/cookiecutter-django/pull/4298)) + ## 2023.04.27 diff --git a/setup.py b/setup.py index bc1345965..25f36db70 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.27" +version = "2023.04.28" with open("README.rst") as readme_file: long_description = readme_file.read() From 3240a0709b7abd6cab0cf890b854deab7ed79193 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 2 May 2023 02:30:51 -0500 Subject: [PATCH 038/108] Update werkzeug from 2.3.1 to 2.3.3 (#4307) --- {{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 bac28ecfa..a1d232925 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.1 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.3.3 # 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 964c27a8aef4d6e565b2853fb358412e15adc9fa Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 2 May 2023 02:31:47 -0500 Subject: [PATCH 039/108] Update uvicorn from 0.21.1 to 0.22.0 (#4305) --- {{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 46b38314f..23ea46dda 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.21.1 # https://github.com/encode/uvicorn +uvicorn[standard]==0.22.0 # https://github.com/encode/uvicorn {%- endif %} # Django From ffe666f2ddfc1b90bd94fc3a68a854c46a4b7e0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 16:28:54 +0100 Subject: [PATCH 040/108] Upgrade traefik to 2.10.1 (#4304) Bumps traefik from 2.10.0 to 2.10.1. --- 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 30470d029..581bbfebd 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.0 +FROM traefik:2.10.1 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From 6bf6a87e50fc7f59b2d74448bd441eed70766c7c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 3 May 2023 02:17:44 +0000 Subject: [PATCH 041/108] Release 2023.05.02 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 128c5d960..48d464f27 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.02 + + +### Updated + +- Upgrade traefik to 2.10.1 ([#4304](https://github.com/cookiecutter/cookiecutter-django/pull/4304)) + +- Update uvicorn to 0.22.0 ([#4305](https://github.com/cookiecutter/cookiecutter-django/pull/4305)) + +- Update werkzeug to 2.3.3 ([#4307](https://github.com/cookiecutter/cookiecutter-django/pull/4307)) + ## 2023.04.28 diff --git a/setup.py b/setup.py index 25f36db70..e727c951b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.04.28" +version = "2023.05.02" with open("README.rst") as readme_file: long_description = readme_file.read() From 18a8ec3a0b4ad27c6328c95afcfe16bac2fa2700 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 4 May 2023 09:02:02 +0100 Subject: [PATCH 042/108] Remove pytz from dependencies (#4309) --- {{cookiecutter.project_slug}}/requirements/base.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 23ea46dda..d54929c41 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,3 @@ -pytz==2023.3 # https://github.com/stub42/pytz python-slugify==8.0.1 # https://github.com/un33k/python-slugify Pillow==9.5.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 8284e4479f5d8d833335fd1be24cb6fba10e683e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 May 2023 03:02:47 -0500 Subject: [PATCH 043/108] Update requests from 2.29.0 to 2.30.0 (#4311) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5e3b3f468..e180bbe62 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,4 +24,4 @@ pyyaml==6.0 PyGithub==1.58.1 gitpython==3.1.31 jinja2==3.1.2 -requests==2.29.0 +requests==2.30.0 From 6af34444761d85e7910b2db4136e62574eb2e96f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 May 2023 03:04:03 -0500 Subject: [PATCH 044/108] Update sentry-sdk from 1.21.0 to 1.21.1 (#4312) --- {{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 112dd08ec..130f3fb32 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.21.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.21.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 2778552879f8ce4ce994c5569119eaec91c63f3f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 May 2023 03:12:00 -0500 Subject: [PATCH 045/108] Update django from 4.1.8 to 4.1.9 (#4313) --- {{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 d54929c41..59a82b398 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -28,7 +28,7 @@ uvicorn[standard]==0.22.0 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==4.1.8 # pyup: < 4.2 # https://www.djangoproject.com/ +django==4.1.9 # pyup: < 4.2 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.54.0 # https://github.com/pennersr/django-allauth From 56863a960bfbed7e0a49bc813a25d410b403e390 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 May 2023 03:12:44 -0500 Subject: [PATCH 046/108] Update coverage from 7.2.3 to 7.2.5 (#4314) --- {{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 a1d232925..fab8ece41 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.3 # https://github.com/nedbat/coveragepy +coverage==7.2.5 # 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 d0578306f4b54ef291d2d287b51f10997bf6caee Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 May 2023 04:14:34 -0500 Subject: [PATCH 047/108] Update pre-commit to 3.3.1 (#4315) * Update pre-commit from 3.2.2 to 3.3.1 * Update pre-commit from 3.2.2 to 3.3.1 --- 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 e180bbe62..a92562508 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.2.2 +pre-commit==3.3.1 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index fab8ece41..0fb0bce9d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,7 +36,7 @@ pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==3.2.2 # https://github.com/pre-commit/pre-commit +pre-commit==3.3.1 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 86fc36ec7ed9f3a56179c61ef971f519d30db494 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 May 2023 09:42:37 -0500 Subject: [PATCH 048/108] Update django-anymail to 9.2 (#4316) * Update django-anymail from 9.1 to 9.2 * Update django-anymail from 9.1 to 9.2 * Update django-anymail from 9.1 to 9.2 * Update django-anymail from 9.1 to 9.2 * Update django-anymail from 9.1 to 9.2 * Update django-anymail from 9.1 to 9.2 * Update django-anymail from 9.1 to 9.2 * Update django-anymail from 9.1 to 9.2 * Update django-anymail from 9.1 to 9.2 --- .../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 130f3fb32..8fe006e07 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.1 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==9.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==9.1 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==9.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==9.1 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==9.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==9.1 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==9.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==9.1 # https://github.com/anymail/django-anymail +django-anymail[postmark]==9.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==9.1 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==9.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==9.1 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==9.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==9.1 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==9.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==9.1 # https://github.com/anymail/django-anymail +django-anymail==9.2 # https://github.com/anymail/django-anymail {%- endif %} From e75453f7d8be934c8c38f7ee6cbc398c23e4d529 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 5 May 2023 02:16:40 +0000 Subject: [PATCH 049/108] Release 2023.05.04 --- CHANGELOG.md | 21 +++++++++++++++++++++ setup.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48d464f27..bccf5bb1e 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.04 + + +### Changed + +- Remove pytz from dependencies ([#4309](https://github.com/cookiecutter/cookiecutter-django/pull/4309)) + +### Updated + +- Update django-anymail to 9.2 ([#4316](https://github.com/cookiecutter/cookiecutter-django/pull/4316)) + +- Update pre-commit to 3.3.1 ([#4315](https://github.com/cookiecutter/cookiecutter-django/pull/4315)) + +- Update coverage to 7.2.5 ([#4314](https://github.com/cookiecutter/cookiecutter-django/pull/4314)) + +- Update django to 4.1.9 ([#4313](https://github.com/cookiecutter/cookiecutter-django/pull/4313)) + +- Update sentry-sdk to 1.21.1 ([#4312](https://github.com/cookiecutter/cookiecutter-django/pull/4312)) + +- Update requests to 2.30.0 ([#4311](https://github.com/cookiecutter/cookiecutter-django/pull/4311)) + ## 2023.05.02 diff --git a/setup.py b/setup.py index e727c951b..ad838117f 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.02" +version = "2023.05.04" with open("README.rst") as readme_file: long_description = readme_file.read() From c3bff996dea960e895593d54092038f6ab87df5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Fri, 5 May 2023 17:23:34 -0300 Subject: [PATCH 050/108] Add Fabio to the Support this Project! section on Readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 90cbe3379..d718ee34c 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,7 @@ _These features can be enabled during initial project setup._ This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django: - 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. - 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 244fa4ee981686e795ed215323a81c5d992bfbde Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 8 May 2023 15:41:51 +0100 Subject: [PATCH 051/108] Fix the build on RTD (#4322) * Pin urllib3 to v1 * Upgrade docs to Python 3.11 * Unpin urllib3 in docs requirements --- .readthedocs.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index beb30d845..4598ff77c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -4,12 +4,17 @@ # Required version: 2 +# Set the version of Python and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.11" + # Build documentation in the docs/ directory with Sphinx sphinx: configuration: docs/conf.py -# Version of Python and requirements required to build the docs +# Declare the Python requirements required to build your docs python: - version: "3.8" install: - requirements: docs/requirements.txt From cd2e3b7783d3a4244c6ba895faa613ea37f1a30c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 8 May 2023 09:47:13 -0500 Subject: [PATCH 052/108] Update sentry-sdk to 1.22.2 (#4321) Co-authored-by: Bruno Alla --- {{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 8fe006e07..7c22dcd6f 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.21.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.22.2 # 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 43efe9a7efce091c55a4dbfa4120e35cd6be7768 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 15:52:45 +0100 Subject: [PATCH 053/108] Auto-update pre-commit hooks (#4320) 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 9445866f5..2c7876d3c 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.3.2 + rev: v3.4.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 cd64098a8..44e2cd349 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.3.2 + rev: v3.4.0 hooks: - id: pyupgrade args: [--py311-plus] From 7abf93616f70737de9e280503bf1805cadf65092 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 9 May 2023 02:19:03 +0000 Subject: [PATCH 054/108] 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 055/108] 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 056/108] 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 057/108] 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 058/108] 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 059/108] 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 060/108] 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 061/108] 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 062/108] 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 063/108] 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 064/108] 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 065/108] 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 066/108] 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 067/108] 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 068/108] 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 069/108] 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 070/108] 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 071/108] 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 072/108] 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 073/108] 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 074/108] 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 075/108] 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 076/108] 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 077/108] 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 078/108] 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 079/108] 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 080/108] 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 081/108] 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 082/108] 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 083/108] 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 084/108] 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 085/108] 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 086/108] 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 087/108] 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 088/108] 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 089/108] 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 090/108] 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 091/108] 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 092/108] 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 093/108] 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 094/108] 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 095/108] 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 096/108] 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 097/108] 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 098/108] 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 099/108] 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 100/108] 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 101/108] 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 102/108] 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 103/108] 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 104/108] 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 105/108] 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 106/108] 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 107/108] 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 108/108] 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"