From a464856234fd9f8f68d17d72fe01f35868179790 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 2 Dec 2022 05:43:02 -0500 Subject: [PATCH 01/11] Update flake8 to 6.0.0 (#3974) --- 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 88c8176f1..684ec91e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ binaryornot==0.4.4 # ------------------------------------------------------------------------------ black==22.10.0 isort==5.10.1 -flake8==5.0.4 +flake8==6.0.0 flake8-isort==5.0.3 pre-commit==2.20.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e7674ce93..a55b1019a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -flake8==5.0.4 # https://github.com/PyCQA/flake8 +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 From 8ad762cbc654219824cc596b1eb456452b7b1b39 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 3 Dec 2022 02:21:12 +0000 Subject: [PATCH 02/11] Release 2022.12.02 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45e784f8b..7a78b7cf4 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.02 + +### Updated +- Update flake8 to 6.0.0 ([#3974](https://github.com/cookiecutter/cookiecutter-django/pull/3974)) + ## 2022.11.30 ### Changed diff --git a/setup.py b/setup.py index a388c0b61..0fa4ba7ca 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.30" +version = "2022.12.02" with open("README.rst") as readme_file: long_description = readme_file.read() From 600783c89bd2fbb0cc459d103ca42bd8c791fb78 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 3 Dec 2022 11:36:29 +0000 Subject: [PATCH 03/11] Auto-update pre-commit hooks (#3975) 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 75d2409cd..e8d055772 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.2.3 + rev: v3.3.0 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 e8e69627d..516323b42 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.2.3 + rev: v3.3.0 hooks: - id: pyupgrade args: [--py310-plus] From 3deb4d90f2e5884f183b1270b416f7f41cd3f5b1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 3 Dec 2022 19:12:25 -0500 Subject: [PATCH 04/11] Update django-debug-toolbar to 3.8.1 (#3976) --- {{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 a55b1019a..ba8db0339 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,7 +42,7 @@ pre-commit==2.20.0 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.7.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.8.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions django-coverage-plugin==2.0.4 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From b5ccdf104174edfc3ff7f55b98a2fc5ee3c093ff Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 4 Dec 2022 02:27:06 +0000 Subject: [PATCH 05/11] Release 2022.12.03 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a78b7cf4..dd8a4e0d1 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.03 + +### Updated +- Auto-update pre-commit hooks ([#3975](https://github.com/cookiecutter/cookiecutter-django/pull/3975)) + ## 2022.12.02 ### Updated diff --git a/setup.py b/setup.py index 0fa4ba7ca..6d0fccd46 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.02" +version = "2022.12.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 0336f08da1709b503043e902237d8e5caa12ee96 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 4 Dec 2022 09:10:58 -0500 Subject: [PATCH 06/11] Update redis to 4.4.0 (#3977) --- {{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 0817c4262..827530be9 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.2.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.3.5 # https://github.com/redis/redis-py +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 {%- endif %} From 82e0c275f846c3996d66251dab49007d46b47945 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 5 Dec 2022 02:26:01 +0000 Subject: [PATCH 07/11] Release 2022.12.04 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd8a4e0d1..b0e1e6690 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.04 + +### Updated +- Update redis to 4.4.0 ([#3977](https://github.com/cookiecutter/cookiecutter-django/pull/3977)) +- Update django-debug-toolbar to 3.8.1 ([#3976](https://github.com/cookiecutter/cookiecutter-django/pull/3976)) + ## 2022.12.03 ### Updated diff --git a/setup.py b/setup.py index 6d0fccd46..e187601c3 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.03" +version = "2022.12.04" with open("README.rst") as readme_file: long_description = readme_file.read() From b2deb65c0dedc336e2e7259026cb5b36478e4590 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 09:41:28 +0000 Subject: [PATCH 08/11] Bump stefanzweifel/git-auto-commit-action from 4.15.4 to 4.16.0 (#3978) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 571bdcd02..952486c1b 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -31,7 +31,7 @@ jobs: run: python scripts/update_contributors.py - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.15.4 + uses: stefanzweifel/git-auto-commit-action@v4.16.0 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From d272d9752d0c8a6ba8d0c189549355a9a1e3d2dc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 6 Dec 2022 06:37:50 -0500 Subject: [PATCH 09/11] Update django-coverage-plugin to 3.0.0 (#3979) --- {{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 ba8db0339..6082a72c8 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -44,5 +44,5 @@ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.8.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions -django-coverage-plugin==2.0.4 # https://github.com/nedbat/django_coverage_plugin +django-coverage-plugin==3.0.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From 33af8e3988067811f48f73f8a589002b136aad1a Mon Sep 17 00:00:00 2001 From: Adin Hodovic Date: Tue, 6 Dec 2022 20:04:38 +0100 Subject: [PATCH 10/11] 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 11/11] 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... # ------------------------------------------------------------------------------