From c42c6f4628620cdb3e706034d5854690b61a8acf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 22 Jun 2022 10:40:52 -0500 Subject: [PATCH 01/65] Update djangorestframework-stubs to 1.7.0 (#3754) --- {{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 cd82050c6..cb88cfc2b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs==1.11.0 # https://github.com/typeddjango/django-stubs pytest==7.1.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs==1.6.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From 98faa89dd516113bd9f8288e9c6b101726da8b05 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 22 Jun 2022 10:41:05 -0500 Subject: [PATCH 02/65] Update sentry-sdk to 1.6.0 (#3756) --- {{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 ebadabf17..7b10184db 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.5.12 # https://github.com/getsentry/sentry-python +sentry-sdk==1.6.0 # 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 From 1f4340acdcd42badef04ee39fff7c1677526d7b5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 22 Jun 2022 17:06:11 -0500 Subject: [PATCH 03/65] Update django-stubs to 1.12.0 (#3757) --- {{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 cb88cfc2b..ca1caf241 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchgod==0.8.2 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ mypy==0.950 # https://github.com/python/mypy -django-stubs==1.11.0 # https://github.com/typeddjango/django-stubs +django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.1.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 43c491f59bd33c52379b5973928f91590ec161bc Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 23 Jun 2022 02:47:20 +0000 Subject: [PATCH 04/65] Release 2022.06.22 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16b67c921..7898d950a 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.06.22 + +### Updated +- Update django-stubs to 1.12.0 ([#3757](https://github.com/cookiecutter/cookiecutter-django/pull/3757)) +- Update sentry-sdk to 1.6.0 ([#3756](https://github.com/cookiecutter/cookiecutter-django/pull/3756)) +- Update djangorestframework-stubs to 1.7.0 ([#3754](https://github.com/cookiecutter/cookiecutter-django/pull/3754)) + ## 2022.06.15 ### Updated diff --git a/setup.py b/setup.py index 3f71a5d6d..eb1cb4af1 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.06.15" +version = "2022.06.22" with open("README.rst") as readme_file: long_description = readme_file.read() From 897913f392d0a998608071603c92f3e6a90d5f36 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 23 Jun 2022 17:46:48 -0500 Subject: [PATCH 05/65] Update django-debug-toolbar from 3.4.0 to 3.5.0 (#3760) --- {{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 ca1caf241..8f30a1565 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,7 +42,7 @@ pre-commit==2.19.0 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.4.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.5.0 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.1.5 # https://github.com/django-extensions/django-extensions django-coverage-plugin==2.0.3 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From 1a97e72f7d83bb292194277e62bf5d384287d276 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 24 Jun 2022 02:47:10 +0000 Subject: [PATCH 06/65] Release 2022.06.23 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7898d950a..63175708e 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.06.23 + +### Updated +- Update django-debug-toolbar to 3.5.0 ([#3760](https://github.com/cookiecutter/cookiecutter-django/pull/3760)) + ## 2022.06.22 ### Updated diff --git a/setup.py b/setup.py index eb1cb4af1..7e1a01017 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.06.22" +version = "2022.06.23" with open("README.rst") as readme_file: long_description = readme_file.read() From 24132594d70fdff69575159625f445f50a9e9eab Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 28 Jun 2022 02:22:54 -0500 Subject: [PATCH 07/65] Update black to 22.6.0 (#3764) * Update black from 22.3.0 to 22.6.0 * Update black from 22.3.0 to 22.6.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 9d9ed4460..66c8ef722 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==22.3.0 +black==22.6.0 isort==5.10.1 flake8==4.0.1 flake8-isort==4.1.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 8f30a1565..c11910ec5 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==4.0.1 # https://github.com/PyCQA/flake8 flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort coverage==6.4.1 # https://github.com/nedbat/coveragepy -black==22.3.0 # https://github.com/psf/black +black==22.6.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 ac49f4efd026cdbed633dbb67dca6e2fc251cfbb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Jun 2022 08:23:08 +0100 Subject: [PATCH 08/65] Auto-update pre-commit hooks (#3765) 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 31ed0fa8f..b7c525794 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.3.0 + rev: 22.6.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 465f76f3a..cee63c214 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: args: [--py39-plus] - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 22.6.0 hooks: - id: black From 9653b52873d8f843091d746ec49e57cf31f492c3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 29 Jun 2022 02:49:10 +0000 Subject: [PATCH 09/65] Release 2022.06.28 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63175708e..81705a15e 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.06.28 + +### Updated +- Auto-update pre-commit hooks ([#3765](https://github.com/cookiecutter/cookiecutter-django/pull/3765)) +- Update black to 22.6.0 ([#3764](https://github.com/cookiecutter/cookiecutter-django/pull/3764)) + ## 2022.06.23 ### Updated diff --git a/setup.py b/setup.py index 7e1a01017..1e705da37 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.06.23" +version = "2022.06.28" with open("README.rst") as readme_file: long_description = readme_file.read() From e7e76df4b58bf126bcc55b6adb65ce27a3019311 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 6 Jul 2022 12:11:01 -0500 Subject: [PATCH 10/65] Update django to 3.2.14 (#3768) --- {{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 2d65dc0c0..e540f13fe 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.17.6 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.2.13 # pyup: < 4.0 # https://www.djangoproject.com/ +django==3.2.14 # pyup: < 4.0 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth From 3db1e7704fee21f605abd5ad4d4682a2c3e78faf Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 7 Jul 2022 02:53:12 +0000 Subject: [PATCH 11/65] Release 2022.07.06 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81705a15e..ab604aecd 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.07.06 + +### Updated +- Update django to 3.2.14 ([#3768](https://github.com/cookiecutter/cookiecutter-django/pull/3768)) + ## 2022.06.28 ### Updated diff --git a/setup.py b/setup.py index 1e705da37..26f69e53d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.06.28" +version = "2022.07.06" with open("README.rst") as readme_file: long_description = readme_file.read() From 5008557deab8152cf3d443c815547fb2a153a615 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 10 Jul 2022 12:02:35 +0100 Subject: [PATCH 12/65] Auto-update pre-commit hooks (#3775) 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 b7c525794..60665f0ab 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: v2.34.0 + rev: v2.35.0 hooks: - id: pyupgrade args: [--py39-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index cee63c214..fe45acb85 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: v2.34.0 + rev: v2.35.0 hooks: - id: pyupgrade args: [--py39-plus] From fd3ae639fe739bbfaf02a61769c21ef14f6c1265 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 10 Jul 2022 21:44:13 +0100 Subject: [PATCH 13/65] Revert "Auto-update pre-commit hooks (#3775)" (#3778) This reverts commit 5008557deab8152cf3d443c815547fb2a153a615. --- .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 60665f0ab..b7c525794 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: v2.35.0 + rev: v2.34.0 hooks: - id: pyupgrade args: [--py39-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index fe45acb85..cee63c214 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: v2.35.0 + rev: v2.34.0 hooks: - id: pyupgrade args: [--py39-plus] From b5342f0225000733712c6b60074cc4c794b240bc Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 11 Jul 2022 02:47:38 +0000 Subject: [PATCH 14/65] Release 2022.07.10 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab604aecd..13cb3b757 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.07.10 + +### Changed +- Revert auto-update pre-commit hooks ([#3778](https://github.com/cookiecutter/cookiecutter-django/pull/3778)) +### Updated +- Auto-update pre-commit hooks ([#3775](https://github.com/cookiecutter/cookiecutter-django/pull/3775)) + ## 2022.07.06 ### Updated diff --git a/setup.py b/setup.py index 26f69e53d..ff30f8761 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.07.06" +version = "2022.07.10" with open("README.rst") as readme_file: long_description = readme_file.read() From 41e565924810b60f7e97283e9031bb757136e5b6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:39:53 -0500 Subject: [PATCH 15/65] Update requests to 2.28.1 (#3766) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 66c8ef722..07fe7fd75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,4 @@ pyyaml==6.0 PyGithub==1.55 gitpython==3.1.27 jinja2==3.1.2 -requests==2.28.0 +requests==2.28.1 From ae9203f61693f4eef7c137c2db341bb00916afa1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:40:22 -0500 Subject: [PATCH 16/65] Update redis from 4.3.3 to 4.3.4 (#3763) --- {{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 e540f13fe..62687cc8a 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.3 # https://github.com/redis/redis-py +redis==4.3.4 # 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 fc4307dfcb8d39c8462ba1a5f6daf5460ff68bee Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:41:06 -0500 Subject: [PATCH 17/65] Update uvicorn from 0.17.6 to 0.18.2 (#3762) --- {{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 62687cc8a..3bef0c201 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.0.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.17.6 # https://github.com/encode/uvicorn +uvicorn[standard]==0.18.2 # https://github.com/encode/uvicorn {%- endif %} # Django From 0996c367ad82769628159b9eaba2f34f7d130269 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:41:45 -0500 Subject: [PATCH 18/65] Update tox to 3.25.1 (#3767) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 07fe7fd75..c9e6a52e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.19.0 # Testing # ------------------------------------------------------------------------------ -tox==3.25.0 +tox==3.25.1 pytest==7.1.2 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From c764b8d4b80b9c87b1d81e9cb6af02f77c1c0ac1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:42:59 -0500 Subject: [PATCH 19/65] Update django-extensions to 3.2.0 (#3774) --- {{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 c11910ec5..18a5d6b88 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -43,6 +43,6 @@ pre-commit==2.19.0 # https://github.com/pre-commit/pre-commit factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.5.0 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.1.5 # https://github.com/django-extensions/django-extensions +django-extensions==3.2.0 # https://github.com/django-extensions/django-extensions django-coverage-plugin==2.0.3 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From 9ccee8349e915ad2ef9a16514db5a37a57a45404 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:44:38 -0500 Subject: [PATCH 20/65] Update pre-commit to 2.20.0 (#3779) * Update pre-commit from 2.19.0 to 2.20.0 * Update pre-commit from 2.19.0 to 2.20.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 c9e6a52e1..328f65d26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==22.6.0 isort==5.10.1 flake8==4.0.1 flake8-isort==4.1.1 -pre-commit==2.19.0 +pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 18a5d6b88..c9174c53e 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.19.0 # https://github.com/pre-commit/pre-commit +pre-commit==2.20.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 071a4d2458a764fac2298edceabb4445ca7dc731 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Fri, 22 Jul 2022 01:46:43 +0300 Subject: [PATCH 21/65] Always use `const` instead of `var` in `gulpfile.js` (#3786) --- {{cookiecutter.project_slug}}/gulpfile.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js index 628b838ba..680e3672e 100644 --- a/{{cookiecutter.project_slug}}/gulpfile.js +++ b/{{cookiecutter.project_slug}}/gulpfile.js @@ -42,7 +42,7 @@ function pathsConfig(appName) { } } -var paths = pathsConfig() +const paths = pathsConfig() //////////////////////////////// // Tasks @@ -50,12 +50,12 @@ var paths = pathsConfig() // Styles autoprefixing and minification function styles() { - var processCss = [ + const processCss = [ autoprefixer(), // adds vendor prefixes pixrem(), // add fallbacks for rem units ] - var minifyCss = [ + const minifyCss = [ cssnano({ preset: 'default' }) // minify result ] @@ -104,7 +104,7 @@ function imgCompression() { {%- if cookiecutter.use_async == 'y' -%} // Run django server function asyncRunServer() { - var cmd = spawn('gunicorn', [ + const cmd = spawn('gunicorn', [ 'config.asgi', '-k', 'uvicorn.workers.UvicornWorker', '--reload' ], {stdio: 'inherit'} ) @@ -115,7 +115,7 @@ function asyncRunServer() { {%- else %} // Run django server function runServer(cb) { - var cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'}) + const cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'}) cmd.on('close', function(code) { console.log('runServer exited with code ' + code) cb(code) From 8f0d301099eed27a6f534d9af6964c1815cbf5a0 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 21 Jul 2022 22:47:16 +0000 Subject: [PATCH 22/65] 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 6ee792c5b..99bb25d4a 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1262,5 +1262,10 @@ "name": "Naveen", "github_login": "naveensrinivasan", "twitter_username": "snaveen" + }, + { + "name": "Nikita Sobolev", + "github_login": "sobolevn", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 90db6689f..479aa34d7 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1363,6 +1363,13 @@ Listed in alphabetical order. moby_dick91 + + Nikita Sobolev + + sobolevn + + + Noah H From a46d94de433593a56cbfb59f5e7f95291e16b785 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:49:32 -0500 Subject: [PATCH 23/65] Update sentry-sdk to 1.8.0 (#3792) --- {{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 7b10184db..415c83b8d 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.6.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.8.0 # 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 From 78826c2d34b6c055391b0e1204ed19b7fbc595b5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:49:59 -0500 Subject: [PATCH 24/65] Update mypy to 0.971 (#3788) --- {{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 c9174c53e..a058f1fe1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchgod==0.8.2 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ -mypy==0.950 # https://github.com/python/mypy +mypy==0.971 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.1.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From ee20b4d156d2e4165d6f69331da4dcbc8c526337 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 17:50:50 -0500 Subject: [PATCH 25/65] Update coverage to 6.4.2 (#3783) --- {{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 a058f1fe1..5614bd202 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==4.0.1 # https://github.com/PyCQA/flake8 flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort -coverage==6.4.1 # https://github.com/nedbat/coveragepy +coverage==6.4.2 # https://github.com/nedbat/coveragepy black==22.6.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From b2b082d8d8c0e8ef936c7c5ad56e7f22d34e8b1a Mon Sep 17 00:00:00 2001 From: Sebastian Reyes Espinosa Date: Thu, 21 Jul 2022 18:06:35 -0500 Subject: [PATCH 26/65] Fix warning from django-coverage-plugin in tests (#3790) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/config/settings/test.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 78fb6cc66..f103eb10b 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -25,5 +25,9 @@ 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 +# ------------------------------------------------------------------------------ +TEMPLATES[0]["OPTIONS"]["debug"] = True # type: ignore # noqa F405 + # Your stuff... # ------------------------------------------------------------------------------ From 9ed990986670d7305ebbcba36d457772161724fe Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 21 Jul 2022 23:07:01 +0000 Subject: [PATCH 27/65] 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 99bb25d4a..43f60067c 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1267,5 +1267,10 @@ "name": "Nikita Sobolev", "github_login": "sobolevn", "twitter_username": "" + }, + { + "name": "Sebastian Reyes Espinosa", + "github_login": "sebastian-code", + "twitter_username": "sebastianreyese" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 479aa34d7..7153871f2 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1531,6 +1531,13 @@ Listed in alphabetical order. saschalalala + + Sebastian Reyes Espinosa + + sebastian-code + + sebastianreyese + Simon Rey From c7a8b6498c0d983c2dbca63e46366a788af04937 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 21 Jul 2022 19:09:12 -0400 Subject: [PATCH 28/65] Update view test should set user to form instance (#3776) --- .../{{cookiecutter.project_slug}}/users/tests/test_views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py index 0b47bd79f..d968d7ec9 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py @@ -64,6 +64,7 @@ class TestUserUpdateView: # Initialize the form form = UserAdminChangeForm() form.cleaned_data = {} + form.instance = user view.form_valid(form) messages_sent = [m.message for m in messages.get_messages(request)] From 4a3feb51f5c5ba504e864b64f19a5a94d6f706c5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Jul 2022 18:21:31 -0500 Subject: [PATCH 29/65] Update flower to 1.1.0 (#3796) --- {{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 3bef0c201..8d784d37a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -20,7 +20,7 @@ hiredis==2.0.0 # https://github.com/redis/hiredis-py celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery django-celery-beat==2.3.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} -flower==1.0.0 # https://github.com/mher/flower +flower==1.1.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} From 4f73cd5c016999d08a028d8e0c1009c0ca567f55 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 22 Jul 2022 02:50:47 +0000 Subject: [PATCH 30/65] Release 2022.07.21 --- CHANGELOG.md | 18 ++++++++++++++++++ setup.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13cb3b757..10846e623 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,24 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.07.21 + +### Changed +- Set user to form instance in update user view test ([#3776](https://github.com/cookiecutter/cookiecutter-django/pull/3776)) +- Fix warning from django-coverage-plugin in tests ([#3790](https://github.com/cookiecutter/cookiecutter-django/pull/3790)) +- Always use `const` instead of `var` in `gulpfile.js` ([#3786](https://github.com/cookiecutter/cookiecutter-django/pull/3786)) +### Updated +- Update flower to 1.1.0 ([#3796](https://github.com/cookiecutter/cookiecutter-django/pull/3796)) +- Update coverage to 6.4.2 ([#3783](https://github.com/cookiecutter/cookiecutter-django/pull/3783)) +- Update mypy to 0.971 ([#3788](https://github.com/cookiecutter/cookiecutter-django/pull/3788)) +- Update sentry-sdk to 1.8.0 ([#3792](https://github.com/cookiecutter/cookiecutter-django/pull/3792)) +- Update pre-commit to 2.20.0 ([#3779](https://github.com/cookiecutter/cookiecutter-django/pull/3779)) +- Update django-extensions to 3.2.0 ([#3774](https://github.com/cookiecutter/cookiecutter-django/pull/3774)) +- Update tox to 3.25.1 ([#3767](https://github.com/cookiecutter/cookiecutter-django/pull/3767)) +- Update uvicorn to 0.18.2 ([#3762](https://github.com/cookiecutter/cookiecutter-django/pull/3762)) +- Update redis to 4.3.4 ([#3763](https://github.com/cookiecutter/cookiecutter-django/pull/3763)) +- Update requests to 2.28.1 ([#3766](https://github.com/cookiecutter/cookiecutter-django/pull/3766)) + ## 2022.07.10 ### Changed diff --git a/setup.py b/setup.py index ff30f8761..3c7bc05e5 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.07.10" +version = "2022.07.21" with open("README.rst") as readme_file: long_description = readme_file.read() From 9b19891b286c3bf31cf013fea2a5d106049d57fa Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 22 Jul 2022 11:10:47 -0500 Subject: [PATCH 31/65] Update werkzeug to 2.1.2 (#3797) --- {{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 5614bd202..2dd74665a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r base.txt -Werkzeug[watchdog]==2.0.3 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.1.2 # https://github.com/pallets/werkzeug ipdb==0.13.9 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 From 8f12442c7eaace582e0aec35549c02e860aa90b9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 22 Jul 2022 11:11:05 -0500 Subject: [PATCH 32/65] Update pillow to 9.2.0 (#3799) --- {{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 8d784d37a..9bbf9653b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2022.1 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify -Pillow==9.1.1 # https://github.com/python-pillow/Pillow +Pillow==9.2.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 6f351155de56997a5b0a351bb2011133cb1ed579 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 22 Jul 2022 11:11:56 -0500 Subject: [PATCH 33/65] Update sphinx to 5.0.2 (#3801) --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index b18d014f5..d044fe689 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.0.1 +sphinx==5.0.2 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 2dd74665a..31e107269 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==5.0.1 # https://github.com/sphinx-doc/sphinx +sphinx==5.0.2 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From e3add7ef33d7edceef6e1cfff386b76ecc8bccfe Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 22 Jul 2022 11:12:56 -0500 Subject: [PATCH 34/65] Update pytest-sugar to 0.9.5 (#3800) --- {{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 31e107269..0222b6821 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -16,7 +16,7 @@ watchgod==0.8.2 # https://github.com/samuelcolvin/watchgod mypy==0.971 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.1.2 # https://github.com/pytest-dev/pytest -pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar +pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} From 119a282dad957d8763cfdbab659a335637323cf4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 23 Jul 2022 02:47:49 +0000 Subject: [PATCH 35/65] Release 2022.07.22 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10846e623..113ae012d 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.07.22 + +### Updated +- Update pytest-sugar to 0.9.5 ([#3800](https://github.com/cookiecutter/cookiecutter-django/pull/3800)) +- Update sphinx to 5.0.2 ([#3801](https://github.com/cookiecutter/cookiecutter-django/pull/3801)) +- Update pillow to 9.2.0 ([#3799](https://github.com/cookiecutter/cookiecutter-django/pull/3799)) +- Update werkzeug to 2.1.2 ([#3797](https://github.com/cookiecutter/cookiecutter-django/pull/3797)) + ## 2022.07.21 ### Changed diff --git a/setup.py b/setup.py index 3c7bc05e5..f3813f236 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.07.21" +version = "2022.07.22" with open("README.rst") as readme_file: long_description = readme_file.read() From 903fe45eca5db320cdd3063bcca3eff7f740c84e Mon Sep 17 00:00:00 2001 From: jugglinmike Date: Tue, 26 Jul 2022 18:17:45 -0400 Subject: [PATCH 36/65] Provide more context when wating for PostgreSQL takes too long (#3782) --- .../compose/production/django/entrypoint | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint index 95ab8297a..2fbcad955 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint +++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint @@ -16,30 +16,34 @@ if [ -z "${POSTGRES_USER}" ]; then fi export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}" -postgres_ready() { python << END import sys +import time import psycopg2 -try: - psycopg2.connect( - dbname="${POSTGRES_DB}", - user="${POSTGRES_USER}", - password="${POSTGRES_PASSWORD}", - host="${POSTGRES_HOST}", - port="${POSTGRES_PORT}", - ) -except psycopg2.OperationalError: - sys.exit(-1) -sys.exit(0) +suggest_unrecoverable_after = 30 +start = time.time() +while True: + try: + psycopg2.connect( + dbname="${POSTGRES_DB}", + user="${POSTGRES_USER}", + password="${POSTGRES_PASSWORD}", + host="${POSTGRES_HOST}", + port="${POSTGRES_PORT}", + ) + break + except psycopg2.OperationalError as error: + sys.stderr.write("Waiting for PostgreSQL to become available...\n") + + if time.time() - start > suggest_unrecoverable_after: + sys.stderr.write(" This is taking longer than expected. The following exception may be indicative of an unrecoverable error: '{}'\n".format(error)) + + time.sleep(1) END -} -until postgres_ready; do - >&2 echo 'Waiting for PostgreSQL to become available...' - sleep 1 -done + >&2 echo 'PostgreSQL is available' exec "$@" From c19f6008588a888488eaf559130bd8fe7aff6b95 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 26 Jul 2022 22:18:18 +0000 Subject: [PATCH 37/65] 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 43f60067c..aa844ae3b 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1272,5 +1272,10 @@ "name": "Sebastian Reyes Espinosa", "github_login": "sebastian-code", "twitter_username": "sebastianreyese" + }, + { + "name": "jugglinmike", + "github_login": "jugglinmike", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 7153871f2..490751944 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1006,6 +1006,13 @@ Listed in alphabetical order. + + jugglinmike + + jugglinmike + + + Jules Cheron From 419f6b0e87046d350f30bd0be2e49a0d338101a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 23:37:02 +0100 Subject: [PATCH 38/65] Auto-update pre-commit hooks (#3780) * Auto-update pre-commit hooks * Run 'pre-commit run -a' * Fix pyupgrade into generated project Co-authored-by: browniebroke Co-authored-by: Bruno Alla --- .pre-commit-config.yaml | 2 +- scripts/create_django_issue.py | 3 ++- scripts/update_changelog.py | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- .../merge_production_dotenvs_in_dotenv.py | 2 +- .../{{cookiecutter.project_slug}}/users/tests/factories.py | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b7c525794..ed35d59fb 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: v2.34.0 + rev: v2.37.3 hooks: - id: pyupgrade args: [--py39-plus] diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py index f1ff51a06..262618531 100644 --- a/scripts/create_django_issue.py +++ b/scripts/create_django_issue.py @@ -11,8 +11,9 @@ from __future__ import annotations import os import re import sys +from collections.abc import Iterable from pathlib import Path -from typing import TYPE_CHECKING, Any, Iterable, NamedTuple +from typing import TYPE_CHECKING, Any, NamedTuple import requests from github import Github diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py index c3c834eef..b50d25066 100644 --- a/scripts/update_changelog.py +++ b/scripts/update_changelog.py @@ -1,8 +1,8 @@ import datetime as dt import os import re +from collections.abc import Iterable from pathlib import Path -from typing import Iterable import git import github.PullRequest diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index cee63c214..0f3a2693b 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: v2.34.0 + rev: v2.37.3 hooks: - id: pyupgrade args: [--py39-plus] diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py index 09fedbb3f..d702a5f67 100644 --- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py +++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py @@ -1,6 +1,6 @@ import os +from collections.abc import Sequence from pathlib import Path -from typing import Sequence import pytest diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py index edd306cb8..e30476227 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py @@ -1,4 +1,5 @@ -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any from django.contrib.auth import get_user_model from factory import Faker, post_generation From 1f92d572a8a7ec63a7a70e9fcac86a6b079fb50b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 26 Jul 2022 17:43:17 -0500 Subject: [PATCH 39/65] Update sh to 1.14.3 (#3798) Co-authored-by: Bruno Alla --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 328f65d26..47b8aff0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==2.1.1 -sh==1.14.2 +sh==1.14.3; sys_platform != "win32" binaryornot==0.4.4 # Code quality From 122ebfc3a8d637cf217e0c9dfeb70dff1b07371b Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 27 Jul 2022 00:44:34 +0200 Subject: [PATCH 40/65] Simplify database access in tests (#3807) --- .../{{cookiecutter.project_slug}}/conftest.py | 2 +- .../{{cookiecutter.project_slug}}/users/tests/test_admin.py | 3 --- .../users/tests/test_drf_urls.py | 3 --- .../users/tests/test_drf_views.py | 3 --- .../{{cookiecutter.project_slug}}/users/tests/test_forms.py | 3 --- .../{{cookiecutter.project_slug}}/users/tests/test_models.py | 4 ---- .../{{cookiecutter.project_slug}}/users/tests/test_swagger.py | 3 +-- .../{{cookiecutter.project_slug}}/users/tests/test_urls.py | 3 --- 8 files changed, 2 insertions(+), 22 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py index 335648e07..7095a4714 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py @@ -10,5 +10,5 @@ def media_storage(settings, tmpdir): @pytest.fixture -def user() -> User: +def user(db) -> User: return UserFactory() diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py index c50a4be4c..a370784fc 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py @@ -1,10 +1,7 @@ -import pytest from django.urls import reverse from {{ cookiecutter.project_slug }}.users.models import User -pytestmark = pytest.mark.django_db - class TestUserAdmin: def test_changelist(self, admin_client): diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py index 83b623f45..7d9c444d3 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py @@ -1,10 +1,7 @@ -import pytest from django.urls import resolve, reverse from {{ cookiecutter.project_slug }}.users.models import User -pytestmark = pytest.mark.django_db - def test_user_detail(user: User): assert ( diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py index 924573089..4d163bf08 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py @@ -1,11 +1,8 @@ -import pytest from django.test import RequestFactory from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet from {{ cookiecutter.project_slug }}.users.models import User -pytestmark = pytest.mark.django_db - class TestUserViewSet: def test_get_queryset(self, user: User, rf: RequestFactory): diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py index e51bb6bf2..261f88c8c 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py @@ -1,14 +1,11 @@ """ Module for all Form Tests. """ -import pytest from django.utils.translation import gettext_lazy as _ from {{ cookiecutter.project_slug }}.users.forms import UserAdminCreationForm from {{ cookiecutter.project_slug }}.users.models import User -pytestmark = pytest.mark.django_db - class TestUserAdminCreationForm: """ diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py index 3194be1fd..b09bcdf0b 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py @@ -1,9 +1,5 @@ -import pytest - from {{ cookiecutter.project_slug }}.users.models import User -pytestmark = pytest.mark.django_db - def test_user_get_absolute_url(user: User): assert user.get_absolute_url() == f"/users/{user.username}/" diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py index 7f5b75844..f97658b55 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py @@ -1,8 +1,6 @@ import pytest from django.urls import reverse -pytestmark = pytest.mark.django_db - def test_swagger_accessible_by_admin(admin_client): url = reverse("api-docs") @@ -10,6 +8,7 @@ def test_swagger_accessible_by_admin(admin_client): assert response.status_code == 200 +@pytest.mark.django_db def test_swagger_ui_not_accessible_by_normal_user(client): url = reverse("api-docs") response = client.get(url) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py index aab6d0a87..7cd056db5 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py @@ -1,10 +1,7 @@ -import pytest from django.urls import resolve, reverse from {{ cookiecutter.project_slug }}.users.models import User -pytestmark = pytest.mark.django_db - def test_detail(user: User): assert ( From 42a81d84132362d832492c89a7d1dd1cddf0509c Mon Sep 17 00:00:00 2001 From: Sebastian Reyes Espinosa Date: Tue, 26 Jul 2022 17:47:03 -0500 Subject: [PATCH 41/65] Changed pylint configuration file (#3806) --- {{cookiecutter.project_slug}}/.pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pylintrc b/{{cookiecutter.project_slug}}/.pylintrc index 6f195c6ef..9d604334b 100644 --- a/{{cookiecutter.project_slug}}/.pylintrc +++ b/{{cookiecutter.project_slug}}/.pylintrc @@ -1,6 +1,6 @@ [MASTER] load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery{% endif %} -django-settings-module=config.settings.base +django-settings-module=config.settings.local [FORMAT] max-line-length=120 From bb4012b6cecb6391c6a800fa53850af94829c50d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 26 Jul 2022 17:51:25 -0500 Subject: [PATCH 42/65] Update sphinx to 5.1.0 (#3808) --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index d044fe689..dc70f9ac9 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.0.2 +sphinx==5.1.0 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0222b6821..9d60be8f9 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==5.0.2 # https://github.com/sphinx-doc/sphinx +sphinx==5.1.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 1ddb7c85331200bca22cbcbf729d417420139c6d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 26 Jul 2022 17:52:21 -0500 Subject: [PATCH 43/65] Update flake8-isort to 4.1.2.post0 (#3809) --- 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 47b8aff0e..08c79654c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==22.6.0 isort==5.10.1 flake8==4.0.1 -flake8-isort==4.1.1 +flake8-isort==4.1.2.post0 pre-commit==2.20.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 9d60be8f9..e684060f8 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==4.0.1 # https://github.com/PyCQA/flake8 -flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort +flake8-isort==4.1.2.post0 # https://github.com/gforcada/flake8-isort coverage==6.4.2 # https://github.com/nedbat/coveragepy black==22.6.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 6bfe2f4859e04d6e5718bbde6ddf502e16390799 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 26 Jul 2022 18:04:37 -0500 Subject: [PATCH 44/65] Update django-compressor to 4.0 (#3802) --- {{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 9bbf9653b..f2dad5307 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -36,7 +36,7 @@ django-allauth==0.51.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.6 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} -django-compressor==3.1 # https://github.com/django-compressor/django-compressor +django-compressor==4.0 # 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 26eff143080978b98777ca2c0aeb451894feada9 Mon Sep 17 00:00:00 2001 From: monosans Date: Tue, 26 Jul 2022 23:12:18 +0000 Subject: [PATCH 45/65] Switch from watchgod to watchfiles (#3791) --- .../compose/local/django/celery/worker/start | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start index d7b63cd41..4ddcfa137 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start @@ -4,4 +4,4 @@ set -o errexit set -o nounset -watchgod celery.__main__.main --args -A config.celery_app worker -l INFO +watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO' diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e684060f8..8b4f0b4e9 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 psycopg2-binary==2.9.3 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchgod==0.8.2 # https://github.com/samuelcolvin/watchgod +watchfiles==0.16.1 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From cc6a0e770ac4e9577307053a8b836fefd56e038e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 26 Jul 2022 23:12:47 +0000 Subject: [PATCH 46/65] 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 aa844ae3b..961ddc863 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1277,5 +1277,10 @@ "name": "jugglinmike", "github_login": "jugglinmike", "twitter_username": "" + }, + { + "name": "monosans", + "github_login": "monosans", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 490751944..b937e124c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1342,6 +1342,13 @@ Listed in alphabetical order. + + monosans + + monosans + + + mozillazg From b1cea690b9d4ee73883dec086305c24c858f74d9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 26 Jul 2022 16:55:57 -0700 Subject: [PATCH 47/65] Update sphinx from 5.1.0 to 5.1.1 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index dc70f9ac9..dc8f4c6e9 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.1.0 +sphinx==5.1.1 sphinx-rtd-theme==1.0.0 From 74f71095a50ffb27b490a6b743f49e4fa4a1a90f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 26 Jul 2022 16:55:58 -0700 Subject: [PATCH 48/65] Update sphinx from 5.1.0 to 5.1.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 8b4f0b4e9..0144481eb 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==5.1.0 # https://github.com/sphinx-doc/sphinx +sphinx==5.1.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 672a756f4d13d003b759af39c42cc3d7a1401d21 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Jul 2022 02:54:42 +0000 Subject: [PATCH 49/65] Release 2022.07.26 --- CHANGELOG.md | 14 ++++++++++++++ setup.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 113ae012d..6a7896225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.07.26 + +### Changed +- Switch from `watchgod` to `watchfiles` ([#3791](https://github.com/cookiecutter/cookiecutter-django/pull/3791)) +- Change Django settings file used by pylint ([#3806](https://github.com/cookiecutter/cookiecutter-django/pull/3806)) +- Simplify database access in tests ([#3807](https://github.com/cookiecutter/cookiecutter-django/pull/3807)) +- Provide more context when wating for PostgreSQL takes too long ([#3782](https://github.com/cookiecutter/cookiecutter-django/pull/3782)) +### Updated +- Update django-compressor to 4.0 ([#3802](https://github.com/cookiecutter/cookiecutter-django/pull/3802)) +- Update flake8-isort to 4.1.2.post0 ([#3809](https://github.com/cookiecutter/cookiecutter-django/pull/3809)) +- Update sphinx to 5.1.0 ([#3808](https://github.com/cookiecutter/cookiecutter-django/pull/3808)) +- Update sh to 1.14.3 ([#3798](https://github.com/cookiecutter/cookiecutter-django/pull/3798)) +- Auto-update pre-commit hooks ([#3780](https://github.com/cookiecutter/cookiecutter-django/pull/3780)) + ## 2022.07.22 ### Updated diff --git a/setup.py b/setup.py index f3813f236..7dd41a5aa 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.07.22" +version = "2022.07.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 91983075f0273a0a57e63344f7756b5b347a61f0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 27 Jul 2022 05:11:57 -0700 Subject: [PATCH 50/65] Update drf-spectacular from 0.22.1 to 0.23.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 f2dad5307..a9d60a518 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.13.1 # 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.22.1 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.23.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 4bae5f380272e77c6c41cc91b75253916598e8fe Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 27 Jul 2022 15:05:17 -0500 Subject: [PATCH 51/65] Update werkzeug to 2.2.0 (#3813) --- {{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 0144481eb..daff0ff56 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r base.txt -Werkzeug[watchdog]==2.1.2 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.2.0 # https://github.com/pallets/werkzeug ipdb==0.13.9 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 From 0e2a0428809188ee89f055f42a89c2cbbad20b82 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 28 Jul 2022 02:47:38 +0000 Subject: [PATCH 52/65] Release 2022.07.27 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a7896225..651d74fa3 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.07.27 + +### Updated +- Update werkzeug to 2.2.0 ([#3813](https://github.com/cookiecutter/cookiecutter-django/pull/3813)) +- Update sphinx to 5.1.1 ([#3811](https://github.com/cookiecutter/cookiecutter-django/pull/3811)) +- Update drf-spectacular to 0.23.1 ([#3812](https://github.com/cookiecutter/cookiecutter-django/pull/3812)) + ## 2022.07.26 ### Changed diff --git a/setup.py b/setup.py index 7dd41a5aa..2f7250bba 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.07.26" +version = "2022.07.27" with open("README.rst") as readme_file: long_description = readme_file.read() From fcfaa2df4fcfb890f2267dae49bff10613b7f38b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 28 Jul 2022 03:36:32 -0500 Subject: [PATCH 53/65] Update werkzeug from 2.2.0 to 2.2.1 (#3814) --- {{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 daff0ff56..3ce9dd619 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r base.txt -Werkzeug[watchdog]==2.2.0 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.2.1 # https://github.com/pallets/werkzeug ipdb==0.13.9 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 From 23064e632c269aebf7c0ca7e5bf1a1a787e9dcb8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 29 Jul 2022 02:54:19 +0000 Subject: [PATCH 54/65] Release 2022.07.28 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 651d74fa3..0b444c4c0 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.07.28 + +### Updated +- Update werkzeug to 2.2.1 ([#3814](https://github.com/cookiecutter/cookiecutter-django/pull/3814)) + ## 2022.07.27 ### Updated diff --git a/setup.py b/setup.py index 2f7250bba..13800338d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.07.27" +version = "2022.07.28" with open("README.rst") as readme_file: long_description = readme_file.read() From f08f055bd870c5d2e1c3b31f8c510f8abe43f6df Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 29 Jul 2022 02:16:36 -0500 Subject: [PATCH 55/65] Update sentry-sdk from 1.8.0 to 1.9.0 (#3815) --- {{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 415c83b8d..6fef91b51 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.8.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.0 # 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 From 14eb5c35d8d65d02fad191a64fbbd496ddafd52d Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 30 Jul 2022 02:50:07 +0000 Subject: [PATCH 56/65] Release 2022.07.29 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b444c4c0..dab4e0d20 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.07.29 + +### Updated +- Update sentry-sdk to 1.9.0 ([#3815](https://github.com/cookiecutter/cookiecutter-django/pull/3815)) + ## 2022.07.28 ### Updated diff --git a/setup.py b/setup.py index 13800338d..c612a7be7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.07.28" +version = "2022.07.29" with open("README.rst") as readme_file: long_description = readme_file.read() From 613b22ea81a689196b826af2a931ee2ca51f1cf1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 3 Aug 2022 03:06:04 -0700 Subject: [PATCH 57/65] Update django from 3.2.14 to 3.2.15 --- {{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 a9d60a518..cb886b631 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.18.2 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.2.14 # pyup: < 4.0 # https://www.djangoproject.com/ +django==3.2.15 # pyup: < 4.0 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth From 1312d3d24660c3476e304ef571fe75fbbb4f6a69 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 Aug 2022 02:46:02 +0000 Subject: [PATCH 58/65] Release 2022.08.03 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dab4e0d20..eb8332155 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.08.03 + +### Updated +- Update django to 3.2.15 ([#3822](https://github.com/cookiecutter/cookiecutter-django/pull/3822)) + ## 2022.07.29 ### Updated diff --git a/setup.py b/setup.py index c612a7be7..417f2b40a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.07.29" +version = "2022.08.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 15aaf2eb2a6f44a02f553ede5aaa8fd37bdb8d47 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 Aug 2022 16:58:39 -0500 Subject: [PATCH 59/65] Update flake8-isort to 4.2.0 (#3828) --- 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 08c79654c..1b9ee5581 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==22.6.0 isort==5.10.1 flake8==4.0.1 -flake8-isort==4.1.2.post0 +flake8-isort==4.2.0 pre-commit==2.20.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 3ce9dd619..b4ef249ea 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==4.0.1 # https://github.com/PyCQA/flake8 -flake8-isort==4.1.2.post0 # https://github.com/gforcada/flake8-isort +flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort coverage==6.4.2 # https://github.com/nedbat/coveragepy black==22.6.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 0b44dd7534ca3584ffcd54a16bba6c3124660bf7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 Aug 2022 17:01:29 -0500 Subject: [PATCH 60/65] Update django-compressor to 4.1 (#3823) --- {{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 cb886b631..a0ad278b4 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -36,7 +36,7 @@ django-allauth==0.51.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.6 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} -django-compressor==4.0 # https://github.com/django-compressor/django-compressor +django-compressor==4.1 # 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 37f91171d16e14f4ca5564b023b3cb4142d27601 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 4 Aug 2022 17:26:51 -0500 Subject: [PATCH 61/65] Update flake8 to 5.0.4 (#3829) * Update flake8 from 4.0.1 to 5.0.4 * Update flake8 from 4.0.1 to 5.0.4 --- 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 1b9ee5581..961c4c13e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ binaryornot==0.4.4 # ------------------------------------------------------------------------------ black==22.6.0 isort==5.10.1 -flake8==4.0.1 +flake8==5.0.4 flake8-isort==4.2.0 pre-commit==2.20.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b4ef249ea..c6e6a1dcf 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==4.0.1 # https://github.com/PyCQA/flake8 +flake8==5.0.4 # https://github.com/PyCQA/flake8 flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort coverage==6.4.2 # https://github.com/nedbat/coveragepy black==22.6.0 # https://github.com/psf/black From 7740eedea5e4be656f910b1ee4cb5eebb84af2e7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Aug 2022 23:33:09 +0100 Subject: [PATCH 62/65] Auto-update pre-commit hooks (#3816) 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 ed35d59fb..a6dcf09f3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 4.0.1 + rev: 5.0.4 hooks: - id: flake8 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 0f3a2693b..ee635fb14 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 4.0.1 + rev: 5.0.4 hooks: - id: flake8 args: ["--config=setup.cfg"] From 490a8b1489236216a29092031cfc6672ce107503 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 5 Aug 2022 02:51:38 +0000 Subject: [PATCH 63/65] Release 2022.08.04 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb8332155..e7af4db5c 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.08.04 + +### Updated +- Auto-update pre-commit hooks ([#3816](https://github.com/cookiecutter/cookiecutter-django/pull/3816)) +- Update flake8 to 5.0.4 ([#3829](https://github.com/cookiecutter/cookiecutter-django/pull/3829)) +- Update django-compressor to 4.1 ([#3823](https://github.com/cookiecutter/cookiecutter-django/pull/3823)) +- Update flake8-isort to 4.2.0 ([#3828](https://github.com/cookiecutter/cookiecutter-django/pull/3828)) + ## 2022.08.03 ### Updated diff --git a/setup.py b/setup.py index 417f2b40a..fda3e3184 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.08.03" +version = "2022.08.04" with open("README.rst") as readme_file: long_description = readme_file.read() From 0d122db299a265042f15b6be8c47a2e72cd9acae Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 5 Aug 2022 16:05:19 -0500 Subject: [PATCH 64/65] Update sentry-sdk from 1.9.0 to 1.9.2 (#3832) --- {{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 6fef91b51..bcd0808b4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.9.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.2 # 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 From 5cede52fbf8a4f5dc500b50f6c92a96407fb6bed Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 6 Aug 2022 02:42:57 +0000 Subject: [PATCH 65/65] Release 2022.08.05 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7af4db5c..836f8d70b 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.08.05 + +### Updated +- Update sentry-sdk to 1.9.2 ([#3832](https://github.com/cookiecutter/cookiecutter-django/pull/3832)) + ## 2022.08.04 ### Updated diff --git a/setup.py b/setup.py index fda3e3184..20bebd34a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.08.04" +version = "2022.08.05" with open("README.rst") as readme_file: long_description = readme_file.read()