From 33af8e3988067811f48f73f8a589002b136aad1a Mon Sep 17 00:00:00 2001 From: Adin Hodovic Date: Tue, 6 Dec 2022 20:04:38 +0100 Subject: [PATCH 01/93] Simplify production `DATABASES` setting to extend base definition (#3969) --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 40d3f19cc..15d3a7683 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -22,8 +22,6 @@ ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["{{ cookiecutter.domai # DATABASES # ------------------------------------------------------------------------------ -DATABASES["default"] = env.db("DATABASE_URL") # noqa F405 -DATABASES["default"]["ATOMIC_REQUESTS"] = True # noqa F405 DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60) # noqa F405 # CACHES From fc081ce1fef82d71e1f8e948821623354884b147 Mon Sep 17 00:00:00 2001 From: ghazi-git Date: Tue, 6 Dec 2022 14:26:24 -0500 Subject: [PATCH 02/93] set SERVERS in production settings instead of base settings (#3609) fixes https://github.com/cookiecutter/cookiecutter-django/issues/3593 --- {{cookiecutter.project_slug}}/config/settings/base.py | 4 ---- .../config/settings/production.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 52798146e..1989fd8cb 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -350,10 +350,6 @@ SPECTACULAR_SETTINGS = { "DESCRIPTION": "Documentation of API endpoints of {{ cookiecutter.project_name }}", "VERSION": "1.0.0", "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"], - "SERVERS": [ - {"url": "http://127.0.0.1:8000", "description": "Local Development server"}, - {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"}, - ], } {%- endif %} # Your stuff... diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 15d3a7683..5de0529e2 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -368,5 +368,15 @@ sentry_sdk.init( traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE", default=0.0), ) {% endif %} +{% if cookiecutter.use_drf == "y" -%} + +# django-rest-framework +# ------------------------------------------------------------------------------- +# Tools that generate code samples can use SERVERS to point to the correct domain +SPECTACULAR_SETTINGS["SERVERS"] = [ # noqa F405 + {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"} +] + +{%- endif %} # Your stuff... # ------------------------------------------------------------------------------ From eff4969a39876d8d30dd5232a911f4c8e9fc3ec5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 7 Dec 2022 02:50:13 +0000 Subject: [PATCH 03/93] Release 2022.12.06 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0e1e6690..5654520ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.06 + +### Changed +- Simplify production `DATABASES` setting to extend base definition ([#3969](https://github.com/cookiecutter/cookiecutter-django/pull/3969)) +### Fixed +- Only set `SERVERS` for `drf-spectacular` in production ([#3609](https://github.com/cookiecutter/cookiecutter-django/pull/3609)) +### Updated +- Update django-coverage-plugin to 3.0.0 ([#3979](https://github.com/cookiecutter/cookiecutter-django/pull/3979)) +- Bump stefanzweifel/git-auto-commit-action from 4.15.4 to 4.16.0 ([#3978](https://github.com/cookiecutter/cookiecutter-django/pull/3978)) + ## 2022.12.04 ### Updated diff --git a/setup.py b/setup.py index e187601c3..b7bc61890 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.04" +version = "2022.12.06" with open("README.rst") as readme_file: long_description = readme_file.read() From 57496c56c57659bde9d9523d532f96ee9d79fc28 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 07:48:50 +0000 Subject: [PATCH 04/93] Auto-update pre-commit hooks (#3983) 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 e8d055772..5669b756e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: check-yaml - repo: https://github.com/asottile/pyupgrade - rev: v3.3.0 + rev: v3.3.1 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 516323b42..1b0150c4a 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: check-yaml - repo: https://github.com/asottile/pyupgrade - rev: v3.3.0 + rev: v3.3.1 hooks: - id: pyupgrade args: [--py310-plus] From aa318af1fc3cf9a74af6edfcaaaddd9e64ec4be2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 8 Dec 2022 02:45:51 +0000 Subject: [PATCH 05/93] Release 2022.12.07 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5654520ff..415ccd23f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.07 + +### Updated +- Auto-update pre-commit hooks ([#3983](https://github.com/cookiecutter/cookiecutter-django/pull/3983)) + ## 2022.12.06 ### Changed diff --git a/setup.py b/setup.py index b7bc61890..151b1e356 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.06" +version = "2022.12.07" with open("README.rst") as readme_file: long_description = readme_file.read() From d15465a5821d2565467f5a390007285dd967732b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 8 Dec 2022 08:16:33 -0500 Subject: [PATCH 06/93] Update django-stubs to 1.13.1 (#3986) --- {{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 6082a72c8..bacfdbbe5 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==0.982 # https://github.com/python/mypy -django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs +django-stubs==1.13.1 # https://github.com/typeddjango/django-stubs pytest==7.2.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 585620eca732aad7bd0e67a1cba025b58003f823 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 8 Dec 2022 08:17:00 -0500 Subject: [PATCH 07/93] Update tox to 4.0.2 (#3985) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 684ec91e0..f428f623b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==3.27.1 +tox==4.0.2 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From b2d6ddbc480d791eb8bdd1bc9cf86b27759badb7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 8 Dec 2022 17:07:18 -0500 Subject: [PATCH 08/93] Update tox from 4.0.2 to 4.0.3 (#3987) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f428f623b..c35de3b6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.2 +tox==4.0.3 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From c2602032c8203d5e71fb71bc111e04b86a242af0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 9 Dec 2022 02:45:59 +0000 Subject: [PATCH 09/93] Release 2022.12.08 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 415ccd23f..132fd96fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.08 + +### Updated +- Update tox to 4.0.3 ([#3987](https://github.com/cookiecutter/cookiecutter-django/pull/3987)) +- Update tox to 4.0.2 ([#3985](https://github.com/cookiecutter/cookiecutter-django/pull/3985)) +- Update django-stubs to 1.13.1 ([#3986](https://github.com/cookiecutter/cookiecutter-django/pull/3986)) + ## 2022.12.07 ### Updated diff --git a/setup.py b/setup.py index 151b1e356..558ea522a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.07" +version = "2022.12.08" with open("README.rst") as readme_file: long_description = readme_file.read() From 2f92644fce097a64a4a47205e24d4ac653cb199c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 9 Dec 2022 22:04:12 +0000 Subject: [PATCH 10/93] Remove bind mounts for docker compose volumes (#3981) Fix #3685 --- {{cookiecutter.project_slug}}/local.yml | 4 ++-- {{cookiecutter.project_slug}}/production.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 33a8db07a..38b9d77d3 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -35,8 +35,8 @@ services: image: {{ cookiecutter.project_slug }}_production_postgres container_name: {{ cookiecutter.project_slug }}_local_postgres volumes: - - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/data:Z - - {{ cookiecutter.project_slug }}_local_postgres_data_backups:/backups:z + - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/data + - {{ cookiecutter.project_slug }}_local_postgres_data_backups:/backups env_file: - ./.envs/.local/.postgres diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index ea4292a0d..cc4c9bca1 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -25,8 +25,8 @@ services: dockerfile: ./compose/production/postgres/Dockerfile image: {{ cookiecutter.project_slug }}_production_postgres volumes: - - production_postgres_data:/var/lib/postgresql/data:Z - - production_postgres_data_backups:/backups:z + - production_postgres_data:/var/lib/postgresql/data + - production_postgres_data_backups:/backups env_file: - ./.envs/.production/.postgres @@ -38,7 +38,7 @@ services: depends_on: - django volumes: - - production_traefik:/etc/traefik/acme:z + - production_traefik:/etc/traefik/acme ports: - "0.0.0.0:80:80" - "0.0.0.0:443:443" From a9c3b56e5f6de3c9d216847e3bd404c80ae67c63 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 9 Dec 2022 17:04:36 -0500 Subject: [PATCH 11/93] Update black to 22.12.0 (#3988) * Update black from 22.10.0 to 22.12.0 * Update black from 22.10.0 to 22.12.0 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c35de3b6d..0aedb48e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==22.10.0 +black==22.12.0 isort==5.10.1 flake8==6.0.0 flake8-isort==5.0.3 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index bacfdbbe5..e02ea203e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort coverage==6.5.0 # https://github.com/nedbat/coveragepy -black==22.10.0 # https://github.com/psf/black +black==22.12.0 # https://github.com/psf/black 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 From 20b7ca105bbdc21d21c267427c5974515b6cba5e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 9 Dec 2022 17:18:10 -0500 Subject: [PATCH 12/93] Update djangorestframework-stubs to 1.8.0 (#3990) --- {{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 e02ea203e..6b073194c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs==1.13.1 # https://github.com/typeddjango/django-stubs pytest==7.2.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==1.8.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From db048af2d34dea0b2c92d962f88453be458ede7d Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 10 Dec 2022 02:24:07 +0000 Subject: [PATCH 13/93] Release 2022.12.09 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 132fd96fb..8ae474316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.09 + +### Changed +- Remove bind option mounts for docker compose volumes ([#3981](https://github.com/cookiecutter/cookiecutter-django/pull/3981)) +### Updated +- Update djangorestframework-stubs to 1.8.0 ([#3990](https://github.com/cookiecutter/cookiecutter-django/pull/3990)) +- Update black to 22.12.0 ([#3988](https://github.com/cookiecutter/cookiecutter-django/pull/3988)) + ## 2022.12.08 ### Updated diff --git a/setup.py b/setup.py index 558ea522a..42af5a0dc 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.08" +version = "2022.12.09" with open("README.rst") as readme_file: long_description = readme_file.read() From 8b9c719a31039e200526087c0b43e289a47619dd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 10 Dec 2022 15:13:10 +0000 Subject: [PATCH 14/93] Auto-update pre-commit hooks (#3991) 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 5669b756e..b256f5bff 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: exclude: hooks/ - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 22.12.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 1b0150c4a..18301b233 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: args: [--py310-plus] - repo: https://github.com/psf/black - rev: 22.10.0 + rev: 22.12.0 hooks: - id: black From 8f84d146e35ba4feb131c9786cb2a5abde5fb35a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 10 Dec 2022 10:13:41 -0500 Subject: [PATCH 15/93] Update tox from 4.0.3 to 4.0.5 (#3993) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0aedb48e8..0ec11e7b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.3 +tox==4.0.5 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 026165d52ea779d507856564bd87971dd1de7301 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 11 Dec 2022 02:30:45 +0000 Subject: [PATCH 16/93] Release 2022.12.10 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ae474316..74ed1e650 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.10 + +### Updated +- Update tox to 4.0.5 ([#3993](https://github.com/cookiecutter/cookiecutter-django/pull/3993)) +- Auto-update pre-commit hooks ([#3991](https://github.com/cookiecutter/cookiecutter-django/pull/3991)) + ## 2022.12.09 ### Changed diff --git a/setup.py b/setup.py index 42af5a0dc..15ed7ce23 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.09" +version = "2022.12.10" with open("README.rst") as readme_file: long_description = readme_file.read() From 5ccf73843afd7f0af383f30f4c1f55a6605b673a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 13 Dec 2022 04:05:57 -0500 Subject: [PATCH 17/93] Update isort from 5.10.1 to 5.11.0 (#3997) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0ec11e7b5..7f53de8ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==22.12.0 -isort==5.10.1 +isort==5.11.0 flake8==6.0.0 flake8-isort==5.0.3 pre-commit==2.20.0 From 2cadf20adf25173acf8e2e95137f69953b5f4410 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 09:06:12 +0000 Subject: [PATCH 18/93] Auto-update pre-commit hooks (#3998) 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 b256f5bff..fedfdc47f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.11.1 hooks: - id: isort diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 18301b233..f0231004c 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.11.1 hooks: - id: isort From a04558a7d5ad31e26edd0111c20b23d48b62899a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 13 Dec 2022 04:48:21 -0500 Subject: [PATCH 19/93] Update isort from 5.11.0 to 5.11.1 (#3999) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7f53de8ca..62d71b3b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==22.12.0 -isort==5.11.0 +isort==5.11.1 flake8==6.0.0 flake8-isort==5.0.3 pre-commit==2.20.0 From ed90ead15f56493723e1fc0590c9bdb0bdccea01 Mon Sep 17 00:00:00 2001 From: Omer-5 <61422607+Omer-5@users.noreply.github.com> Date: Tue, 13 Dec 2022 23:32:57 +0200 Subject: [PATCH 20/93] Improve documentation for Getting started with Docker (#4003) Fix https://github.com/cookiecutter/cookiecutter-django/issues/3971 --- docs/developing-locally-docker.rst | 9 ++++++--- docs/developing-locally.rst | 6 +++--- docs/generate-project-block.rst | 7 +++++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 docs/generate-project-block.rst diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 4bb5d9032..a7d77e108 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -3,9 +3,6 @@ Getting Up and Running Locally With Docker .. index:: Docker -The steps below will get you up and running with a local development environment. -All of these commands assume you are in the root of your generated project. - .. note:: If you're new to Docker, please be aware that some resources are cached system-wide @@ -19,10 +16,16 @@ Prerequisites * Docker; if you don't have it yet, follow the `installation instructions`_; * Docker Compose; refer to the official documentation for the `installation guide`_. * Pre-commit; refer to the official documentation for the `pre-commit`_. +* Cookiecutter; refer to the official GitHub repository of `Cookiecutter`_ .. _`installation instructions`: https://docs.docker.com/install/#supported-platforms .. _`installation guide`: https://docs.docker.com/compose/install/ .. _`pre-commit`: https://pre-commit.com/#install +.. _`Cookiecutter`: https://github.com/cookiecutter/cookiecutter + +Before Getting Started +---------------------- +.. include:: generate-project-block.rst Build the Stack --------------- diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index c9d28ff73..e1c946268 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -24,9 +24,8 @@ First things first. $ source /bin/activate -#. Install cookiecutter-django: :: - - $ cookiecutter gh:cookiecutter/cookiecutter-django +#. + .. include:: generate-project-block.rst #. Install development requirements: :: @@ -43,6 +42,7 @@ First things first. #. Create a new PostgreSQL database using createdb_: :: $ createdb --username=postgres + ``project_slug`` is what you have entered as the project_slug at the setup stage. .. note:: diff --git a/docs/generate-project-block.rst b/docs/generate-project-block.rst new file mode 100644 index 000000000..2842b551d --- /dev/null +++ b/docs/generate-project-block.rst @@ -0,0 +1,7 @@ +Generate a new cookiecutter-django project: :: + + $ cookiecutter gh:cookiecutter/cookiecutter-django + +For more information refer to +:ref:`Project Generation Options `. + From bf9346eda57fb1ca238b7bb2569de6ec64ed6f40 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 13 Dec 2022 21:35:25 +0000 Subject: [PATCH 21/93] Fix update contributors workflow --- .github/workflows/update-contributors.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 952486c1b..83c651a46 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -29,6 +29,8 @@ jobs: pip install -r requirements.txt - name: Update list run: python scripts/update_contributors.py + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Commit changes uses: stefanzweifel/git-auto-commit-action@v4.16.0 From 7af6f69b2899d30cc977aa69838fdce64f835093 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 13 Dec 2022 21:35:58 +0000 Subject: [PATCH 22/93] 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 49ebfe4d8..68f1b4c2d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1322,5 +1322,10 @@ "name": "rguptar", "github_login": "rguptar", "twitter_username": "" + }, + { + "name": "Omer-5", + "github_login": "Omer-5", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d97324708..d8a9d8190 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1447,6 +1447,13 @@ Listed in alphabetical order. + + Omer-5 + + Omer-5 + + + Pablo From 882f5052891c1a414386172ba1063eb309e512be Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Dec 2022 02:29:57 +0000 Subject: [PATCH 23/93] Release 2022.12.13 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74ed1e650..5ee4a4757 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.13 + +### Changed +- Improve documentation for Getting started with Docker ([#4003](https://github.com/cookiecutter/cookiecutter-django/pull/4003)) +### Updated +- Update isort to 5.11.1 ([#3999](https://github.com/cookiecutter/cookiecutter-django/pull/3999)) +- Auto-update pre-commit hooks ([#3998](https://github.com/cookiecutter/cookiecutter-django/pull/3998)) +- Update isort to 5.11.0 ([#3997](https://github.com/cookiecutter/cookiecutter-django/pull/3997)) + ## 2022.12.10 ### Updated diff --git a/setup.py b/setup.py index 15ed7ce23..680a75c09 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.10" +version = "2022.12.13" with open("README.rst") as readme_file: long_description = readme_file.read() From d3bd184aaaf326a172e719a238f9ebe14cfb3184 Mon Sep 17 00:00:00 2001 From: TAKAHASHI Shuuji Date: Wed, 21 Dec 2022 18:47:51 +0900 Subject: [PATCH 24/93] Update image URL for build status shield badge (#4018) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27fc6e0e1..eaac817a3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cookiecutter Django -[![Build Status](https://img.shields.io/github/workflow/status/cookiecutter/cookiecutter-django/CI/master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI) +[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI) [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest) [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/) [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a) From ebec4dc44db9dfd43d2cdcddb2d3aaf4d8e8ebe7 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 21 Dec 2022 09:48:24 +0000 Subject: [PATCH 25/93] 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 68f1b4c2d..5c8b1f753 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1327,5 +1327,10 @@ "name": "Omer-5", "github_login": "Omer-5", "twitter_username": "" + }, + { + "name": "TAKAHASHI Shuuji", + "github_login": "shuuji3", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d8a9d8190..dba721de6 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1671,6 +1671,13 @@ Listed in alphabetical order. + + TAKAHASHI Shuuji + + shuuji3 + + + Tames McTigue From 9b9bc9bec175490f8ed0016ca938fca5e08c5167 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 21 Dec 2022 09:49:45 +0000 Subject: [PATCH 26/93] Update target URL for build badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eaac817a3..38724caff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cookiecutter Django -[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI) +[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)]([https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=workflow%3ACI+branch%3Amaster)) [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest) [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/) [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a) From 2c914c203220206d028b88208cf4a7a8a4d002e3 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 21 Dec 2022 09:51:17 +0000 Subject: [PATCH 27/93] Fix URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38724caff..d8fc58ec4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Cookiecutter Django -[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)]([https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=workflow%3ACI+branch%3Amaster)) +[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=branch%3Amaster) [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest) [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/) [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a) From 7a6435695b82c86e6895862f5d2c0c0b5a0a57f6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 04:52:05 -0500 Subject: [PATCH 28/93] Update hiredis to 2.1.0 (#4006) --- {{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 827530be9..6aa2b6558 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -14,7 +14,7 @@ whitenoise==6.2.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.4.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} -hiredis==2.0.0 # https://github.com/redis/hiredis-py +hiredis==2.1.0 # 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 c9b5b88a7..1d199b125 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.11.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} -hiredis==2.0.0 # https://github.com/redis/hiredis-py +hiredis==2.1.0 # https://github.com/redis/hiredis-py {%- endif %} # Django From 256a967087e7a1bc945be18be43cc36adfc65522 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 06:02:04 -0500 Subject: [PATCH 29/93] Update drf-spectacular to 0.25.1 (#4009) --- {{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 6aa2b6558..e5aafcd73 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -44,5 +44,5 @@ 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.13.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation -drf-spectacular==0.24.2 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.25.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} From d26fc164e7e384c6d1532c815d7d21467f8f972c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 06:16:43 -0500 Subject: [PATCH 30/93] Update isort to 5.11.3 (#4010) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 62d71b3b4..1a1688a6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==22.12.0 -isort==5.11.1 +isort==5.11.3 flake8==6.0.0 flake8-isort==5.0.3 pre-commit==2.20.0 From e101fbc5215dbe7f5571e308c043b480d8867bc0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 11:20:19 +0000 Subject: [PATCH 31/93] Auto-update pre-commit hooks (#4005) 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 fedfdc47f..6400b593e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: 5.11.1 + rev: v5.11.3 hooks: - id: isort diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index f0231004c..8cec23181 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: 5.11.1 + rev: v5.11.3 hooks: - id: isort From 81309a610fcf8901a736689740b3f67cbecc2cab Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 06:20:42 -0500 Subject: [PATCH 32/93] Update django-anymail to 9.0 (#4012) --- .../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 1d199b125..adb7dbcdf 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,21 +24,21 @@ django-storages[google]==1.13.1 # https://github.com/jschneier/django-storages django-storages[azure]==1.13.1 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==8.6 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==8.6 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==8.6 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==8.6 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==8.6 # https://github.com/anymail/django-anymail +django-anymail[postmark]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==8.6 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==8.6 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==8.6 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==9.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==8.6 # https://github.com/anymail/django-anymail +django-anymail==9.0 # https://github.com/anymail/django-anymail {%- endif %} From dd1f3a6d12d3e9e1a4b8fb0cb3e9d0046c38f702 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 08:57:20 -0500 Subject: [PATCH 33/93] Update coverage to 7.0.0 (#4013) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6b073194c..91994de00 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==5.0.3 # https://github.com/gforcada/flake8-isort -coverage==6.5.0 # https://github.com/nedbat/coveragepy +coverage==7.0.0 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index 3bec1fbee..b99bba644 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -34,7 +34,7 @@ django_settings_module = config.settings.test ignore_errors = True [coverage:run] -include = {{cookiecutter.project_slug}}/* +include = {{cookiecutter.project_slug}}/** omit = *migrations*, *tests* plugins = django_coverage_plugin From 31a1de9bfb9f991019b6c541daa20723b887dcdb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 08:58:04 -0500 Subject: [PATCH 34/93] Update sentry-sdk to 1.12.1 (#4014) --- {{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 adb7dbcdf..b7d73819b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.11.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.12.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.1.0 # https://github.com/redis/hiredis-py From 9bc388dd0d323a299cf786b61133d63f437ef80e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 08:58:53 -0500 Subject: [PATCH 35/93] Update tox to 4.0.16 (#4017) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1a1688a6b..3f5b0a6d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.5 +tox==4.0.16 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From e869ab7cc40da5bd482d4410b2befd2fac668263 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 09:22:37 -0500 Subject: [PATCH 36/93] Update ipdb to 0.13.11 (#4019) --- {{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 91994de00..3732a3f18 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ -r base.txt Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug -ipdb==0.13.9 # https://github.com/gotcha/ipdb +ipdb==0.13.11 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 {%- else %} From 7fc0b1d16738ad8441833c369d75c6c7f107d0f5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2022 09:24:02 -0500 Subject: [PATCH 37/93] Update pytz to 2022.7 (#4020) --- {{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 e5aafcd73..9acae6a80 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.6 # https://github.com/stub42/pytz +pytz==2022.7 # https://github.com/stub42/pytz python-slugify==7.0.0 # https://github.com/un33k/python-slugify Pillow==9.3.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 93c0769516b7e64e8f5471bbe79f5e3dfa7cdd62 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 21 Dec 2022 15:39:54 +0100 Subject: [PATCH 38/93] Retry when trying to store a Celery result in backend (#3996) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/config/settings/base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 1989fd8cb..6bf6a6e5c 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -283,6 +283,11 @@ CELERY_BROKER_URL = env("CELERY_BROKER_URL") CELERY_RESULT_BACKEND = CELERY_BROKER_URL # https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended CELERY_RESULT_EXTENDED = True +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-backend-always-retry +# https://github.com/celery/celery/pull/6122 +CELERY_RESULT_BACKEND_ALWAYS_RETRY = True +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-backend-max-retries +CELERY_RESULT_BACKEND_MAX_RETRIES = 10 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-accept_content CELERY_ACCEPT_CONTENT = ["json"] # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer From be69fadefcba0de477d94d4695e26722bc93992a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Dec 2022 02:21:52 +0000 Subject: [PATCH 39/93] Release 2022.12.21 --- CHANGELOG.md | 17 +++++++++++++++++ setup.py | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ee4a4757..150b750b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.21 + +### Changed +- Retry when trying to store a Celery result in backend ([#3996](https://github.com/cookiecutter/cookiecutter-django/pull/3996)) +- Update image URL for build status shield badge ([#4018](https://github.com/cookiecutter/cookiecutter-django/pull/4018)) +### Updated +- Update pytz to 2022.7 ([#4020](https://github.com/cookiecutter/cookiecutter-django/pull/4020)) +- Update ipdb to 0.13.11 ([#4019](https://github.com/cookiecutter/cookiecutter-django/pull/4019)) +- Update tox to 4.0.16 ([#4017](https://github.com/cookiecutter/cookiecutter-django/pull/4017)) +- Update sentry-sdk to 1.12.1 ([#4014](https://github.com/cookiecutter/cookiecutter-django/pull/4014)) +- Update coverage to 7.0.0 ([#4013](https://github.com/cookiecutter/cookiecutter-django/pull/4013)) +- Update django-anymail to 9.0 ([#4012](https://github.com/cookiecutter/cookiecutter-django/pull/4012)) +- Auto-update pre-commit hooks ([#4005](https://github.com/cookiecutter/cookiecutter-django/pull/4005)) +- Update isort to 5.11.3 ([#4010](https://github.com/cookiecutter/cookiecutter-django/pull/4010)) +- Update drf-spectacular to 0.25.1 ([#4009](https://github.com/cookiecutter/cookiecutter-django/pull/4009)) +- Update hiredis to 2.1.0 ([#4006](https://github.com/cookiecutter/cookiecutter-django/pull/4006)) + ## 2022.12.13 ### Changed diff --git a/setup.py b/setup.py index 680a75c09..7adacfaee 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.13" +version = "2022.12.21" with open("README.rst") as readme_file: long_description = readme_file.read() From bd2d3edd314a90147dc7280781830b358a1e5616 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 24 Dec 2022 06:25:53 -0500 Subject: [PATCH 40/93] Update coverage from 7.0.0 to 7.0.1 (#4024) --- {{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 3732a3f18..adba4a0f7 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==5.0.3 # https://github.com/gforcada/flake8-isort -coverage==7.0.0 # https://github.com/nedbat/coveragepy +coverage==7.0.1 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 5e098901510b845c781bdae3e7f498898b61da9e Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 25 Dec 2022 02:24:44 +0000 Subject: [PATCH 41/93] Release 2022.12.24 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 150b750b7..17c7fffbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.24 + +### Updated +- Update coverage to 7.0.1 ([#4024](https://github.com/cookiecutter/cookiecutter-django/pull/4024)) + ## 2022.12.21 ### Changed diff --git a/setup.py b/setup.py index 7adacfaee..5bdf3eeb3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.21" +version = "2022.12.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 5c30b67df1145c4b009981e27c0a21257c26ed50 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 25 Dec 2022 09:33:59 +0000 Subject: [PATCH 42/93] Auto-update pre-commit hooks (#4021) 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 6400b593e..ca86e7eb5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: v5.11.3 + rev: 5.11.4 hooks: - id: isort diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 8cec23181..c1aaf0d9f 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: black - repo: https://github.com/PyCQA/isort - rev: v5.11.3 + rev: 5.11.4 hooks: - id: isort From 88370e648849e3d4fb68f68b19450f5021bf3af2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 26 Dec 2022 02:22:40 +0000 Subject: [PATCH 43/93] Release 2022.12.25 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17c7fffbc..75cbf2ade 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.25 + +### Updated +- Auto-update pre-commit hooks ([#4021](https://github.com/cookiecutter/cookiecutter-django/pull/4021)) + ## 2022.12.24 ### Updated diff --git a/setup.py b/setup.py index 5bdf3eeb3..e41708a8e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.24" +version = "2022.12.25" with open("README.rst") as readme_file: long_description = readme_file.read() From 019efba2e1cc44aa1b4aa9627cf49729c3dea24d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Dec 2022 05:03:43 -0500 Subject: [PATCH 44/93] Update pre-commit to 2.21.0 (#4026) * Update pre-commit from 2.20.0 to 2.21.0 * Update pre-commit from 2.20.0 to 2.21.0 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3f5b0a6d8..27cdeeb11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==22.12.0 isort==5.11.3 flake8==6.0.0 flake8-isort==5.0.3 -pre-commit==2.20.0 +pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index adba4a0f7..22b0f0fa3 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==2.20.0 # https://github.com/pre-commit/pre-commit +pre-commit==2.21.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From f1b5056f4a02a29de23a3d20be422fffc2c1fa30 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Dec 2022 05:03:58 -0500 Subject: [PATCH 45/93] Update tox from 4.0.16 to 4.0.17 (#4027) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 27cdeeb11..ec14de1c6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.16 +tox==4.0.17 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 6b3b5cd067995dd4a199d17c259ae18ed55ec50f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Dec 2022 02:20:11 +0000 Subject: [PATCH 46/93] Release 2022.12.26 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75cbf2ade..9ff6f2286 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.26 + +### Updated +- Update tox to 4.0.17 ([#4027](https://github.com/cookiecutter/cookiecutter-django/pull/4027)) +- Update pre-commit to 2.21.0 ([#4026](https://github.com/cookiecutter/cookiecutter-django/pull/4026)) + ## 2022.12.25 ### Updated diff --git a/setup.py b/setup.py index e41708a8e..e7ec62436 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.25" +version = "2022.12.26" with open("README.rst") as readme_file: long_description = readme_file.read() From c72818063133cd3da8fcb13d0d62a49379c6ed00 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 29 Dec 2022 00:18:41 -0800 Subject: [PATCH 47/93] Update gitpython from 3.1.29 to 3.1.30 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ec14de1c6..04852f01c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.57 -gitpython==3.1.29 +gitpython==3.1.30 jinja2==3.1.2 requests==2.28.1 From 5530eebfec0b7607078bdca6bd2e95cdcafbfe73 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 29 Dec 2022 02:21:49 -0800 Subject: [PATCH 48/93] Update django-allauth from 0.51.0 to 0.52.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9acae6a80..8ae17ad60 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.20.0 # https://github.com/encode/uvicorn django==4.0.8 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.51.0 # https://github.com/pennersr/django-allauth +django-allauth==0.52.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 51abef1b8dccac6e89f14abcf195dc539f3407ed Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 29 Dec 2022 13:17:02 -0500 Subject: [PATCH 49/93] Update tox from 4.0.17 to 4.0.19 (#4030) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ec14de1c6..f5e828ad0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.17 +tox==4.0.19 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From f6c44d69563e99c588598505879e24498726d145 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 29 Dec 2022 13:30:50 -0500 Subject: [PATCH 50/93] Update tox from 4.0.19 to 4.1.0 (#4035) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f5e828ad0..ef0272058 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.0.19 +tox==4.1.0 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 03e90149302cf5f17d16a57699c14f7589fe49ae Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 30 Dec 2022 02:22:45 +0000 Subject: [PATCH 51/93] Release 2022.12.29 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ff6f2286..aca668c5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.12.29 + +### Updated +- Update tox to 4.1.0 ([#4035](https://github.com/cookiecutter/cookiecutter-django/pull/4035)) +- Update tox to 4.0.19 ([#4030](https://github.com/cookiecutter/cookiecutter-django/pull/4030)) +- Update django-allauth to 0.52.0 ([#4033](https://github.com/cookiecutter/cookiecutter-django/pull/4033)) + ## 2022.12.26 ### Updated diff --git a/setup.py b/setup.py index e7ec62436..e03b72109 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.26" +version = "2022.12.29" with open("README.rst") as readme_file: long_description = readme_file.read() From a7f195680f52eec8b25eb48a59fc3d5639780592 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 1 Jan 2023 21:15:53 -0800 Subject: [PATCH 52/93] Update pillow from 9.3.0 to 9.4.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8ae17ad60..e37caf3c7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2022.7 # https://github.com/stub42/pytz python-slugify==7.0.0 # https://github.com/un33k/python-slugify -Pillow==9.3.0 # https://github.com/python-pillow/Pillow +Pillow==9.4.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.1.0 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From 522574d1b241a486ff5327d6033e0da0abea9296 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Jan 2023 16:43:31 -0800 Subject: [PATCH 53/93] Update tox from 4.1.0 to 4.1.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ef0272058..040189b28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.1.0 +tox==4.1.3 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From af625635230bffc77cc0c6c8eebacee278cfcb18 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Jan 2023 16:43:37 -0800 Subject: [PATCH 54/93] Update coverage from 7.0.1 to 7.0.2 --- {{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 22b0f0fa3..016880601 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==5.0.3 # https://github.com/gforcada/flake8-isort -coverage==7.0.1 # https://github.com/nedbat/coveragepy +coverage==7.0.2 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 3bb37120744d77cebedcec25dad12998adebbd6e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 3 Jan 2023 04:30:22 -0800 Subject: [PATCH 55/93] Update whitenoise from 6.2.0 to 6.3.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8ae17ad60..1c4507d84 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -10,7 +10,7 @@ rcssmin==1.1.0 # https://github.com/ndparker/rcssmin {%- endif %} argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} -whitenoise==6.2.0 # https://github.com/evansd/whitenoise +whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.4.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From f7b628092d5a18cbf7edc2ac58069f72a10545af Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 3 Jan 2023 13:31:12 -0500 Subject: [PATCH 56/93] Update flake8-isort to 6.0.0 (#4022) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update flake8-isort from 5.0.3 to 6.0.0 Co-authored-by: Fábio C. Barrionuevo da Luz --- 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 45167a17f..f514ad0f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==22.12.0 isort==5.11.3 flake8==6.0.0 -flake8-isort==5.0.3 +flake8-isort==6.0.0 pre-commit==2.21.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 016880601..a703dedf0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 -flake8-isort==5.0.3 # https://github.com/gforcada/flake8-isort +flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort coverage==7.0.2 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 065b994238a9cad8fa5481de021dcb08c807844b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 Jan 2023 02:24:51 +0000 Subject: [PATCH 57/93] Release 2023.01.03 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aca668c5f..69a9e780a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.03 + +### Updated +- Update flake8-isort to 6.0.0 ([#4022](https://github.com/cookiecutter/cookiecutter-django/pull/4022)) +- Update tox to 4.1.3 ([#4041](https://github.com/cookiecutter/cookiecutter-django/pull/4041)) +- Update pillow to 9.4.0 ([#4040](https://github.com/cookiecutter/cookiecutter-django/pull/4040)) +- Update gitpython to 3.1.30 ([#4032](https://github.com/cookiecutter/cookiecutter-django/pull/4032)) +- Update coverage to 7.0.2 ([#4042](https://github.com/cookiecutter/cookiecutter-django/pull/4042)) +- Update whitenoise to 6.3.0 ([#4044](https://github.com/cookiecutter/cookiecutter-django/pull/4044)) + ## 2022.12.29 ### Updated diff --git a/setup.py b/setup.py index e03b72109..90e524837 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.12.29" +version = "2023.01.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 2da98ab87cc99420557aa0e84d3834886b8cc590 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2023 07:22:18 -0500 Subject: [PATCH 58/93] Update coverage from 7.0.2 to 7.0.3 (#4047) --- {{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 a703dedf0..0bb99c1a6 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.0.2 # https://github.com/nedbat/coveragepy +coverage==7.0.3 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From b00fde9a872da1a3ae2e9771e468074ad1da427b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2023 07:24:21 -0500 Subject: [PATCH 59/93] Update tox from 4.1.3 to 4.2.1 (#4046) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f514ad0f4..412410843 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.1.3 +tox==4.2.1 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From ebcee95c8b055c9bb4bf18878badfb81b31354a1 Mon Sep 17 00:00:00 2001 From: Thomas Booij Date: Wed, 4 Jan 2023 16:33:02 +0100 Subject: [PATCH 60/93] Fix typo on the test settings (#4049) --- {{cookiecutter.project_slug}}/config/settings/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index f103eb10b..198b5aa5d 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -25,7 +25,7 @@ PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"] # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" -# DEBUGING FOR TEMPLATES +# DEBUGGING FOR TEMPLATES # ------------------------------------------------------------------------------ TEMPLATES[0]["OPTIONS"]["debug"] = True # type: ignore # noqa F405 From abf9405a59656d4bd46685e256a2778579cf0601 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Wed, 4 Jan 2023 15:33:47 +0000 Subject: [PATCH 61/93] 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 5c8b1f753..55a6df601 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1332,5 +1332,10 @@ "name": "TAKAHASHI Shuuji", "github_login": "shuuji3", "twitter_username": "" + }, + { + "name": "Thomas Booij", + "github_login": "ThomasBooij95", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index dba721de6..fbc8dd973 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1706,6 +1706,13 @@ Listed in alphabetical order. thibault + + Thomas Booij + + ThomasBooij95 + + + Théo Segonds From bd5ceb00481dfaac12e0c24e1e1011ac45c98d56 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2023 15:51:37 -0500 Subject: [PATCH 62/93] Update tox from 4.2.1 to 4.2.2 (#4050) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 412410843..7db83d824 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.1 +tox==4.2.2 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From d7485fd93e587b13570f4d7755e594470ad901e8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 5 Jan 2023 02:25:14 +0000 Subject: [PATCH 63/93] Release 2023.01.04 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69a9e780a..eb5f7b48f 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.01.04 + +### Changed +- Fix typo on test settings ([#4049](https://github.com/cookiecutter/cookiecutter-django/pull/4049)) +### Updated +- Update tox to 4.2.2 ([#4050](https://github.com/cookiecutter/cookiecutter-django/pull/4050)) +- Update tox to 4.2.1 ([#4046](https://github.com/cookiecutter/cookiecutter-django/pull/4046)) +- Update coverage to 7.0.3 ([#4047](https://github.com/cookiecutter/cookiecutter-django/pull/4047)) + ## 2023.01.03 ### Updated diff --git a/setup.py b/setup.py index 90e524837..ba0475913 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.03" +version = "2023.01.04" with open("README.rst") as readme_file: long_description = readme_file.read() From 66be5ceab463307c25d42c979825960aadca2198 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Fri, 6 Jan 2023 09:48:39 -0800 Subject: [PATCH 64/93] Fix link, add non-Docker commands (#4036) --- docs/testing.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/testing.rst b/docs/testing.rst index dd6fcb48f..bea45c6dd 100644 --- a/docs/testing.rst +++ b/docs/testing.rst @@ -28,10 +28,15 @@ Coverage You should build your tests to provide the highest level of **code coverage**. You can run the ``pytest`` with code ``coverage`` by typing in the following command: :: - $ docker-compose -f local.yml run --rm django coverage run -m pytest + $ coverage run -m pytest Once the tests are complete, in order to see the code coverage, run the following command: :: + $ coverage report + +If you're running the project locally with Docker, use these commands instead: :: + + $ docker-compose -f local.yml run --rm django coverage run -m pytest $ docker-compose -f local.yml run --rm django coverage report .. note:: @@ -53,4 +58,4 @@ Once the tests are complete, in order to see the code coverage, run the followin .. _develop locally with docker: ./developing-locally-docker.html .. _customize: https://docs.pytest.org/en/latest/customize.html .. _unittest: https://docs.python.org/3/library/unittest.html#module-unittest -.. _configuring: https://coverage.readthedocs.io/en/v4.5.x/config.html +.. _configuring: https://coverage.readthedocs.io/en/latest/config.html From d5631b7d2a6363f6520adf38f869410f4330e389 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 6 Jan 2023 17:49:08 +0000 Subject: [PATCH 65/93] 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 55a6df601..9ba9955cc 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1337,5 +1337,10 @@ "name": "Thomas Booij", "github_login": "ThomasBooij95", "twitter_username": "" + }, + { + "name": "Pamela Fox", + "github_login": "pamelafox", + "twitter_username": "pamelafox" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index fbc8dd973..e54c1f650 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1461,6 +1461,13 @@ Listed in alphabetical order. + + Pamela Fox + + pamelafox + + pamelafox + Parbhat Puri From 84851ef6096d97bcf70ea11c3c94faf682411c2d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 6 Jan 2023 12:49:41 -0500 Subject: [PATCH 66/93] Update tox to 4.2.3 (#4051) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7db83d824..5db12aac8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.2 +tox==4.2.3 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 62df4f44603e07f23f126a9e78da706c53a170f5 Mon Sep 17 00:00:00 2001 From: Robin <7276999+Kaffeetasse@users.noreply.github.com> Date: Fri, 6 Jan 2023 18:56:41 +0100 Subject: [PATCH 67/93] Add .git to .dockerignore (#4054) --- {{cookiecutter.project_slug}}/.dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore index 5518e60af..7369480e3 100644 --- a/{{cookiecutter.project_slug}}/.dockerignore +++ b/{{cookiecutter.project_slug}}/.dockerignore @@ -8,3 +8,4 @@ .readthedocs.yml .travis.yml venv +.git From b9933f54afea71f6b94181f191c4040a13e9b0eb Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 6 Jan 2023 18:06:14 +0000 Subject: [PATCH 68/93] 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 9ba9955cc..34c84979d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1342,5 +1342,10 @@ "name": "Pamela Fox", "github_login": "pamelafox", "twitter_username": "pamelafox" + }, + { + "name": "Robin", + "github_login": "Kaffeetasse", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e54c1f650..718d58c57 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1573,6 +1573,13 @@ Listed in alphabetical order. + + Robin + + Kaffeetasse + + + Roman Afanaskin From d91c2141eaa84f7fb0fe574e2d22a755169444ea Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 6 Jan 2023 10:50:05 -0800 Subject: [PATCH 69/93] Update rcssmin from 1.1.0 to 1.1.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index f4d2399de..16e96cc2b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -5,7 +5,7 @@ Pillow==9.4.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.1.0 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin {%- else %} -rcssmin==1.1.0 # https://github.com/ndparker/rcssmin +rcssmin==1.1.1 # https://github.com/ndparker/rcssmin {%- endif %} {%- endif %} argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi From 9c23a17987cc4a737780bd11a39eb617a5cd42e4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 6 Jan 2023 14:11:14 -0800 Subject: [PATCH 70/93] Update django-compressor from 4.1 to 4.3 --- {{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 f4d2399de..a20b98c18 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -36,7 +36,7 @@ django-allauth==0.52.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} -django-compressor==4.1 # https://github.com/django-compressor/django-compressor +django-compressor==4.3 # https://github.com/django-compressor/django-compressor {%- endif %} django-redis==5.2.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} From 3601d2a843f600ba5c6763825cce177c74b9b5ed Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 7 Jan 2023 02:23:16 +0000 Subject: [PATCH 71/93] Release 2023.01.06 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb5f7b48f..e84c56136 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.06 + +### Changed +- Add `.git` to `.dockerignore` ([#4054](https://github.com/cookiecutter/cookiecutter-django/pull/4054)) +- Fix link and add non-Docker commands to testing page in the docs ([#4036](https://github.com/cookiecutter/cookiecutter-django/pull/4036)) +### Updated +- Update tox to 4.2.3 ([#4051](https://github.com/cookiecutter/cookiecutter-django/pull/4051)) + ## 2023.01.04 ### Changed diff --git a/setup.py b/setup.py index ba0475913..6275646be 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.04" +version = "2023.01.06" with open("README.rst") as readme_file: long_description = readme_file.read() From 56143f7a5f8a6296cdc3b21dd5ec73f36875105b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 7 Jan 2023 08:27:47 -0500 Subject: [PATCH 72/93] Update isort to 5.11.4 (#4058) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5db12aac8..9d42222c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==22.12.0 -isort==5.11.3 +isort==5.11.4 flake8==6.0.0 flake8-isort==6.0.0 pre-commit==2.21.0 From f294c276ad8109ecdca8d0be9e3cb16fb75739a7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 7 Jan 2023 08:29:18 -0500 Subject: [PATCH 73/93] Update django-storages to 1.13.2 (#4057) --- {{cookiecutter.project_slug}}/requirements/production.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index b7d73819b..04889fc27 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,11 +17,11 @@ hiredis==2.1.0 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.13.1 # https://github.com/jschneier/django-storages +django-storages[boto3]==1.13.2 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.13.1 # https://github.com/jschneier/django-storages +django-storages[google]==1.13.2 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'Azure' %} -django-storages[azure]==1.13.1 # 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.0 # https://github.com/anymail/django-anymail From 5aecf924abd2661ab98db9c47434044f855e8669 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 7 Jan 2023 08:34:22 -0500 Subject: [PATCH 74/93] Update tox to 4.2.6 (#4064) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9d42222c7..bc164293d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.3 +tox==4.2.6 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From f6023ab21e8de386e847d03df2e6e90126ee6af6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 8 Jan 2023 02:28:02 +0000 Subject: [PATCH 75/93] Release 2023.01.07 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e84c56136..f6ac1a9d4 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.01.07 + +### Updated +- Update tox to 4.2.6 ([#4064](https://github.com/cookiecutter/cookiecutter-django/pull/4064)) +- Update django-storages to 1.13.2 ([#4057](https://github.com/cookiecutter/cookiecutter-django/pull/4057)) +- Update isort to 5.11.4 ([#4058](https://github.com/cookiecutter/cookiecutter-django/pull/4058)) +- Update rcssmin to 1.1.1 ([#4060](https://github.com/cookiecutter/cookiecutter-django/pull/4060)) +- Update django-compressor to 4.3 ([#4063](https://github.com/cookiecutter/cookiecutter-django/pull/4063)) + ## 2023.01.06 ### Changed diff --git a/setup.py b/setup.py index 6275646be..91e605619 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.06" +version = "2023.01.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 3e050c0f5b4f948734ecab11d51f626456fda5cd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 8 Jan 2023 06:10:04 -0500 Subject: [PATCH 76/93] Update coverage from 7.0.3 to 7.0.4 (#4067) --- {{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 0bb99c1a6..b9b4d2008 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.0.3 # https://github.com/nedbat/coveragepy +coverage==7.0.4 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From ce25e18a24a6acacfcafb86681dcf880adf6ff1b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 8 Jan 2023 06:10:19 -0500 Subject: [PATCH 77/93] Update redis from 4.4.0 to 4.4.1 (#4068) --- {{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 c4e809112..3a389eb08 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.4.0 # https://github.com/redis/redis-py +redis==4.4.1 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.1.0 # https://github.com/redis/hiredis-py {%- endif %} From e23fe10add86836e6a78d2d1d9f402a19ea5d76a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 9 Jan 2023 02:24:37 +0000 Subject: [PATCH 78/93] Release 2023.01.08 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6ac1a9d4..75cfa9795 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.08 + +### Updated +- Update redis to 4.4.1 ([#4068](https://github.com/cookiecutter/cookiecutter-django/pull/4068)) +- Update coverage to 7.0.4 ([#4067](https://github.com/cookiecutter/cookiecutter-django/pull/4067)) + ## 2023.01.07 ### Updated diff --git a/setup.py b/setup.py index 91e605619..ff9990b7b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.07" +version = "2023.01.08" with open("README.rst") as readme_file: long_description = readme_file.read() From 629785e1d4e43771e80c7b29375203852b95c06f Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Tue, 10 Jan 2023 00:57:05 -0800 Subject: [PATCH 79/93] Add .venv to exclude (#4069) --- {{cookiecutter.project_slug}}/setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index b99bba644..7ee60215a 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -1,10 +1,10 @@ [flake8] max-line-length = 120 -exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv +exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv [pycodestyle] max-line-length = 120 -exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv +exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv [isort] line_length = 88 From 98ca314904baffc259c856d846bdc8030c4c6c7a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 10 Jan 2023 08:21:58 -0500 Subject: [PATCH 80/93] Update hiredis to 2.1.1 (#4070) --- {{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 3a389eb08..06be3c65c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -14,7 +14,7 @@ whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.4.1 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} -hiredis==2.1.0 # https://github.com/redis/hiredis-py +hiredis==2.1.1 # 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 04889fc27..ce3e9f3fe 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.12.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} -hiredis==2.1.0 # https://github.com/redis/hiredis-py +hiredis==2.1.1 # https://github.com/redis/hiredis-py {%- endif %} # Django From c4291e7522648dbf43f5d38956afc061ddaf8131 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Tue, 10 Jan 2023 15:11:53 -0800 Subject: [PATCH 81/93] Add dump.rdb to gitignore (#4062) --- {{cookiecutter.project_slug}}/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index ede26ef72..acc484307 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -326,6 +326,9 @@ Session.vim # Auto-generated tag files tags +# Redis dump file +dump.rdb + ### Project template {%- if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %} MailHog From 7b93aac85748df72cdadc0828532bb1c3ddf748b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Jan 2023 02:42:18 +0000 Subject: [PATCH 82/93] Release 2023.01.10 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75cfa9795..ecd6023af 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.01.10 + +### Changed +- Add dump.rdb to gitignore ([#4062](https://github.com/cookiecutter/cookiecutter-django/pull/4062)) +### Fixed +- Exclude `.venv` from code style checks ([#4069](https://github.com/cookiecutter/cookiecutter-django/pull/4069)) +### Updated +- Update hiredis to 2.1.1 ([#4070](https://github.com/cookiecutter/cookiecutter-django/pull/4070)) + ## 2023.01.08 ### Updated diff --git a/setup.py b/setup.py index ff9990b7b..397500054 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.08" +version = "2023.01.10" with open("README.rst") as readme_file: long_description = readme_file.read() From 470eb70069e504940c273832dce040af843d69d4 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Wed, 11 Jan 2023 09:38:38 -0800 Subject: [PATCH 83/93] Update Celery instructions (#4061) Co-authored-by: Bruno Alla --- docs/developing-locally.rst | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index e1c946268..2b9438059 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -141,15 +141,32 @@ In production, we have Mailgun_ configured to have your back! Celery ------ -If the project is configured to use Celery as a task scheduler then by default tasks are set to run on the main thread -when developing locally. If you have the appropriate setup on your local machine then set the following -in ``config/settings/local.py``:: +If the project is configured to use Celery as a task scheduler then, by default, tasks are set to run on the main thread when developing locally instead of getting sent to a broker. However, if you have Redis setup on your local machine, you can set the following in ``config/settings/local.py``:: CELERY_TASK_ALWAYS_EAGER = False -To run Celery locally, make sure redis-server is installed (instructions are available at https://redis.io/topics/quickstart), run the server in one terminal with `redis-server`, and then start celery in another terminal with the following command:: +Next, make sure `redis-server` is installed (per the `Getting started with Redis`_ guide) and run the server in one terminal:: - celery -A config.celery_app worker --loglevel=info + $ redis-server + +Start the Celery worker by running the following command in another terminal:: + + $ celery -A config.celery_app worker --loglevel=info + +That Celery worker should be running whenever your app is running, typically as a background process, +so that it can pick up any tasks that get queued. Learn more from the `Celery Workers Guide`_. + +The project comes with a simple task for manual testing purposes, inside `/users/tasks.py`. To queue that task locally, start the Django shell, import the task, and call `delay()` on it:: + + $ python manage.py shell + >> from .users.tasks import get_users_count + >> get_users_count.delay() + +You can also use Django admin to queue up tasks, thanks to the `django-celerybeat`_ package. + +.. _Getting started with Redis guide: https://redis.io/docs/getting-started/ +.. _Celery Workers Guide: https://docs.celeryq.dev/en/stable/userguide/workers.html +.. _django-celerybeat: https://django-celery-beat.readthedocs.io/en/latest/ Sass Compilation & Live Reloading From f690119cd99903e3db62718f4534f3fe03e57163 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 11 Jan 2023 17:18:03 -0500 Subject: [PATCH 84/93] Update tox to 4.2.7 (#4073) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bc164293d..4a604db16 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.6 +tox==4.2.7 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 541c1dce9e5abf52076e39671b930efe9c834117 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 12 Jan 2023 02:41:37 +0000 Subject: [PATCH 85/93] Release 2023.01.11 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd6023af..2cb53128c 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.01.11 + +### Changed +- Update Celery instructions in the documentation ([#4061](https://github.com/cookiecutter/cookiecutter-django/pull/4061)) +### Updated +- Update tox to 4.2.7 ([#4073](https://github.com/cookiecutter/cookiecutter-django/pull/4073)) + ## 2023.01.10 ### Changed diff --git a/setup.py b/setup.py index 397500054..5b1bc3b26 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.10" +version = "2023.01.11" with open("README.rst") as readme_file: long_description = readme_file.read() From fe6e6e85cbcd6dbb78d3427a6c971a74fecd5223 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 12 Jan 2023 13:28:26 -0500 Subject: [PATCH 86/93] Update sentry-sdk to 1.13.0 (#4074) --- {{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 ce3e9f3fe..fd449d1fe 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.12.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.13.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.1.1 # https://github.com/redis/hiredis-py From f50a2a5b0f5d9aa03a815be0e0c577f40983e67c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 13 Jan 2023 02:46:24 +0000 Subject: [PATCH 87/93] Release 2023.01.12 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cb53128c..5269ac14d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.12 + +### Updated +- Update sentry-sdk to 1.13.0 ([#4074](https://github.com/cookiecutter/cookiecutter-django/pull/4074)) + ## 2023.01.11 ### Changed diff --git a/setup.py b/setup.py index 5b1bc3b26..765459067 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.11" +version = "2023.01.12" with open("README.rst") as readme_file: long_description = readme_file.read() From 54df65c7779d7e0764645acd529ba5673d0090fe Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 15 Jan 2023 06:32:56 -0500 Subject: [PATCH 88/93] Update pytz from 2022.7 to 2022.7.1 (#4078) --- {{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 06be3c65c..38f8daabf 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.7 # https://github.com/stub42/pytz +pytz==2022.7.1 # https://github.com/stub42/pytz python-slugify==7.0.0 # https://github.com/un33k/python-slugify Pillow==9.4.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 5d07f3bb7ef142b7bd7a4d7e7f062775896ea021 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 15 Jan 2023 06:33:58 -0500 Subject: [PATCH 89/93] Update pytest to 7.2.1 (#4077) * Update pytest from 7.2.0 to 7.2.1 * Update pytest from 7.2.0 to 7.2.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 4a604db16..627cfebe5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ tox==4.2.7 -pytest==7.2.0 +pytest==7.2.1 pytest-cookies==0.6.1 pytest-instafail==0.4.2 pyyaml==6.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b9b4d2008..89abc0a0e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==0.982 # https://github.com/python/mypy django-stubs==1.13.1 # https://github.com/typeddjango/django-stubs -pytest==7.2.0 # https://github.com/pytest-dev/pytest +pytest==7.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.8.0 # https://github.com/typeddjango/djangorestframework-stubs From 3f53a2695b0824a1ccd1b62e866568fce53a2c08 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 16 Jan 2023 02:26:38 +0000 Subject: [PATCH 90/93] Release 2023.01.15 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5269ac14d..00698a012 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.15 + +### Updated +- Update pytest to 7.2.1 ([#4077](https://github.com/cookiecutter/cookiecutter-django/pull/4077)) +- Update pytz to 2022.7.1 ([#4078](https://github.com/cookiecutter/cookiecutter-django/pull/4078)) + ## 2023.01.12 ### Updated diff --git a/setup.py b/setup.py index 765459067..cdbbc6929 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.12" +version = "2023.01.15" with open("README.rst") as readme_file: long_description = readme_file.read() From 52af00670683ac20d42c4119580ab4a2fbe0109d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 17 Jan 2023 04:38:25 -0500 Subject: [PATCH 91/93] Update tox to 4.3.3 (#4081) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 627cfebe5..5dc9d97ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.7 +tox==4.3.3 pytest==7.2.1 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 23b41967a854e023d0a63fa502ba13fba81ada8b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 18 Jan 2023 02:27:46 +0000 Subject: [PATCH 92/93] Release 2023.01.17 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00698a012..344978d0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.17 + +### Updated +- Update tox to 4.3.3 ([#4081](https://github.com/cookiecutter/cookiecutter-django/pull/4081)) + ## 2023.01.15 ### Updated diff --git a/setup.py b/setup.py index cdbbc6929..1b0f44843 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.15" +version = "2023.01.17" with open("README.rst") as readme_file: long_description = readme_file.read() From be8aa5c73dc88259e819534a3bdb71f9364e82b9 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Thu, 19 Jan 2023 14:45:56 -0800 Subject: [PATCH 93/93] Add sourcemaps support to Gulp (#4089) fixes https://github.com/cookiecutter/cookiecutter-django/issues/4045 --- {{cookiecutter.project_slug}}/.gitignore | 1 + {{cookiecutter.project_slug}}/gulpfile.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index acc484307..17e9249c0 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -346,4 +346,5 @@ project.css project.min.css vendors.js *.min.js +*.min.js.map {%- endif %} diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js index 680e3672e..40d367bcd 100644 --- a/{{cookiecutter.project_slug}}/gulpfile.js +++ b/{{cookiecutter.project_slug}}/gulpfile.js @@ -85,13 +85,13 @@ function scripts() { // Vendor Javascript minification function vendorScripts() { - return src(paths.vendorsJs) + return src(paths.vendorsJs, { sourcemaps: true }) .pipe(concat('vendors.js')) .pipe(dest(paths.js)) .pipe(plumber()) // Checks for errors .pipe(uglify()) // Minifies the js .pipe(rename({ suffix: '.min' })) - .pipe(dest(paths.js)) + .pipe(dest(paths.js, { sourcemaps: '.' })) } // Image compression