From 3d7a2db072873496bd4cc779f9a2331bd46da81b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 29 Apr 2022 02:46:26 +0000 Subject: [PATCH 001/276] Release 2022.04.28 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a616f9469..2ad4c77d7 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.04.28 + +### Changed +- Add the possibility to set a max django version on create_django_issue script ([#3680](https://github.com/cookiecutter/cookiecutter-django/pull/3680)) + ## 2022.04.27 ### Updated diff --git a/setup.py b/setup.py index 3b3bf6b2f..eb5db1a03 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.04.27" +version = "2022.04.28" with open("README.rst") as readme_file: long_description = readme_file.read() From 55124bd032406dcc06de0ce8d5214a06c2b175cb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 1 May 2022 03:55:28 -0700 Subject: [PATCH 002/276] Update django-debug-toolbar from 3.2.4 to 3.3.0 (#3690) --- {{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 ea65e429c..8da0d5a44 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,7 +42,7 @@ pre-commit==2.18.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.2.4 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.3.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.2 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From e4458b6962895ab92b313c28a273dd0fd5a057b7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 2 May 2022 02:50:42 +0000 Subject: [PATCH 003/276] Release 2022.05.01 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ad4c77d7..cb4ca13c2 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.05.01 + +### Updated +- Update django-debug-toolbar to 3.3.0 ([#3690](https://github.com/cookiecutter/cookiecutter-django/pull/3690)) + ## 2022.04.28 ### Changed diff --git a/setup.py b/setup.py index eb5db1a03..e4c1d45f7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.04.28" +version = "2022.05.01" with open("README.rst") as readme_file: long_description = readme_file.read() From c1cd37fd7db707f6e33f32647c97263deae1f793 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 3 May 2022 12:09:55 -0700 Subject: [PATCH 004/276] Update sentry-sdk from 1.5.10 to 1.5.11 (#3693) --- {{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 6708666f9..5ac0fe09c 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.10 # https://github.com/getsentry/sentry-python +sentry-sdk==1.5.11 # 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 df529fc9e4d16bfe16f76e0e620c2f543f740ba3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 3 May 2022 12:10:27 -0700 Subject: [PATCH 005/276] Update django-debug-toolbar from 3.3.0 to 3.4.0 (#3692) --- {{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 8da0d5a44..e7401a143 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,7 +42,7 @@ pre-commit==2.18.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.3.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.4.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.2 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From f1f1909c679ad76487fc7775bd35d7e67e276522 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 4 May 2022 02:45:00 +0000 Subject: [PATCH 006/276] Release 2022.05.03 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb4ca13c2..a64e17948 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.05.03 + +### Updated +- Update django-debug-toolbar to 3.4.0 ([#3692](https://github.com/cookiecutter/cookiecutter-django/pull/3692)) +- Update sentry-sdk to 1.5.11 ([#3693](https://github.com/cookiecutter/cookiecutter-django/pull/3693)) + ## 2022.05.01 ### Updated diff --git a/setup.py b/setup.py index e4c1d45f7..6910cf9a4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.01" +version = "2022.05.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 9a8e7abd249c0c9bb424a816c5093eecefe1668e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 May 2022 06:29:30 -0700 Subject: [PATCH 007/276] Update django-coverage-plugin from 2.0.2 to 2.0.3 (#3695) --- {{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 e7401a143..34daaf134 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.4.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.2 # https://github.com/nedbat/django_coverage_plugin +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 0aed2350042e8329571aa01938d64edd137658ca Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 5 May 2022 02:37:43 +0000 Subject: [PATCH 008/276] Release 2022.05.04 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a64e17948..f9a80cf15 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.05.04 + +### Updated +- Update django-coverage-plugin to 2.0.3 ([#3695](https://github.com/cookiecutter/cookiecutter-django/pull/3695)) + ## 2022.05.03 ### Updated diff --git a/setup.py b/setup.py index 6910cf9a4..f9d21191b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.03" +version = "2022.05.04" with open("README.rst") as readme_file: long_description = readme_file.read() From 964f08db43f5408572a2fe84b9dfd105b8d37d7f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 6 May 2022 01:01:07 -0700 Subject: [PATCH 009/276] Update pre-commit to 2.19.0 (#3697) * Update pre-commit from 2.18.1 to 2.19.0 * Update pre-commit from 2.18.1 to 2.19.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 3f480418c..289c3e5c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==22.3.0 isort==5.10.1 flake8==4.0.1 flake8-isort==4.1.1 -pre-commit==2.18.1 +pre-commit==2.19.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 34daaf134..6cb5e3ced 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.18.1 # https://github.com/pre-commit/pre-commit +pre-commit==2.19.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 7c2476d847096b7accf186c6461028d3b2b7a6f2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 7 May 2022 02:34:39 +0000 Subject: [PATCH 010/276] Release 2022.05.06 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a80cf15..10631012e 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.05.06 + +### Updated +- Update pre-commit to 2.19.0 ([#3697](https://github.com/cookiecutter/cookiecutter-django/pull/3697)) + ## 2022.05.04 ### Updated diff --git a/setup.py b/setup.py index f9d21191b..f8ab4371b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.04" +version = "2022.05.06" with open("README.rst") as readme_file: long_description = readme_file.read() From e0c04fa0d30884e3387e32724068d66360451a22 Mon Sep 17 00:00:00 2001 From: Naveen <172697+naveensrinivasan@users.noreply.github.com> Date: Sat, 7 May 2022 07:49:24 -0500 Subject: [PATCH 011/276] Set permissions for GitHub actions (#3698) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Set permissions for GitHub actions Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much. - Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/) Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> * Leave comment close to code Co-authored-by: Bruno Alla --- .github/workflows/pre-commit-autoupdate.yml | 6 ++++++ .github/workflows/update-contributors.yml | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index df4ea1f9a..789c13b43 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -8,10 +8,16 @@ on: - cron: "15 2 * * *" workflow_dispatch: # to trigger manually +permissions: + contents: read + jobs: auto-update: # Disables this workflow from running in a repository that is not part of the indicated organization/user if: github.repository_owner == 'cookiecutter' + permissions: + contents: write # for peter-evans/create-pull-request to create branch + pull-requests: write # for peter-evans/create-pull-request to create a PR runs-on: ubuntu-latest steps: diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 16c5c6226..2e690d329 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -5,10 +5,15 @@ on: branches: - master +permissions: + contents: read + jobs: build: # Disables this workflow from running in a repository that is not part of the indicated organization/user if: github.repository_owner == 'cookiecutter' + permissions: + contents: write # for stefanzweifel/git-auto-commit-action to push code in repo runs-on: ubuntu-latest steps: From 66d1d010e8a16806f39868af920804484ff4d65a Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 7 May 2022 12:49:50 +0000 Subject: [PATCH 012/276] 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 ad83662dd..6ee792c5b 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1257,5 +1257,10 @@ "name": "innicoder", "github_login": "innicoder", "twitter_username": "" + }, + { + "name": "Naveen", + "github_login": "naveensrinivasan", + "twitter_username": "snaveen" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c33bf9e12..90db6689f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1349,6 +1349,13 @@ Listed in alphabetical order. + + Naveen + + naveensrinivasan + + snaveen + Nico Stefani From 337bbd282019df805159d69eb9b252db41b67ba4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 7 May 2022 06:22:25 -0700 Subject: [PATCH 013/276] Update jinja2 from 3.1.1 to 3.1.2 (#3700) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 289c3e5c9..f5364be53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,5 +22,5 @@ pyyaml==6.0 # ------------------------------------------------------------------------------ PyGithub==1.55 gitpython==3.1.27 -jinja2==3.1.1 +jinja2==3.1.2 requests==2.27.1 From 96b9b95af70f14afd976ac673f5571fa3a77bb25 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 7 May 2022 19:21:15 +0100 Subject: [PATCH 014/276] Add pyupgrade to pre-commit config (#3702) * Add pyupgrade to pre-commit config * Exclude hooks folder from pyupgrade * Autofix: run pyupgrade * Autofix: run pyupgrade on template files --- .pre-commit-config.yaml | 7 +++++++ docs/conf.py | 2 +- tests/test_cookiecutter_generation.py | 10 +++++----- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 6 ++++++ .../merge_production_dotenvs_in_dotenv.py | 6 +++--- .../{{cookiecutter.project_slug}}/__init__.py | 6 ++---- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index da839860e..f9559ffa0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,6 +8,13 @@ repos: - id: trailing-whitespace - id: check-yaml + - repo: https://github.com/asottile/pyupgrade + rev: v2.32.1 + hooks: + - id: pyupgrade + args: [--py39-plus] + exclude: hooks/ + - repo: https://github.com/psf/black rev: 22.3.0 hooks: diff --git a/docs/conf.py b/docs/conf.py index f55bcb819..b53e6a7e7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -39,7 +39,7 @@ master_doc = "index" # General information about the project. project = "Cookiecutter Django" -copyright = "2013-{}, Daniel Roy Greenfeld".format(now.year) +copyright = f"2013-{now.year}, Daniel Roy Greenfeld" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 9c30aeedd..63b4fc97c 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -138,7 +138,7 @@ def check_paths(paths): if is_binary(path): continue - for line in open(path, "r"): + for line in open(path): match = RE_OBJ.search(line) assert match is None, f"cookiecutter variable not replaced in {path}" @@ -203,7 +203,7 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip assert result.project_path.name == context["project_slug"] assert result.project_path.is_dir() - with open(f"{result.project_path}/.travis.yml", "r") as travis_yml: + with open(f"{result.project_path}/.travis.yml") as travis_yml: try: yml = yaml.safe_load(travis_yml)["jobs"]["include"] assert yml[0]["script"] == ["flake8"] @@ -230,7 +230,7 @@ def test_gitlab_invokes_flake8_and_pytest( assert result.project_path.name == context["project_slug"] assert result.project_path.is_dir() - with open(f"{result.project_path}/.gitlab-ci.yml", "r") as gitlab_yml: + with open(f"{result.project_path}/.gitlab-ci.yml") as gitlab_yml: try: gitlab_config = yaml.safe_load(gitlab_yml) assert gitlab_config["flake8"]["script"] == ["flake8"] @@ -257,7 +257,7 @@ def test_github_invokes_linter_and_pytest( assert result.project_path.name == context["project_slug"] assert result.project_path.is_dir() - with open(f"{result.project_path}/.github/workflows/ci.yml", "r") as github_yml: + with open(f"{result.project_path}/.github/workflows/ci.yml") as github_yml: try: github_config = yaml.safe_load(github_yml) linter_present = False @@ -308,6 +308,6 @@ def test_pycharm_docs_removed(cookies, context, use_pycharm, pycharm_docs_exist) context.update({"use_pycharm": use_pycharm}) result = cookies.bake(extra_context=context) - with open(f"{result.project_path}/docs/index.rst", "r") as f: + with open(f"{result.project_path}/docs/index.rst") as f: has_pycharm_docs = "pycharm/configuration" in f.read() assert has_pycharm_docs is pycharm_docs_exist diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index dd663231e..5b22d0dc9 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -9,6 +9,12 @@ repos: - id: end-of-file-fixer - id: check-yaml + - repo: https://github.com/asottile/pyupgrade + rev: v2.32.1 + hooks: + - id: pyupgrade + args: [--py39-plus] + - repo: https://github.com/psf/black rev: 22.3.0 hooks: diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py index d1170eff6..09fedbb3f 100644 --- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py +++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py @@ -18,7 +18,7 @@ def merge( ) -> None: with open(output_file_path, "w") as output_file: for merged_file_path in merged_file_paths: - with open(merged_file_path, "r") as merged_file: + with open(merged_file_path) as merged_file: merged_file_content = merged_file.read() output_file.write(merged_file_content) if append_linesep: @@ -41,7 +41,7 @@ def test_merge(tmpdir_factory, merged_file_count: int, append_linesep: bool): for i in range(merged_file_count): merged_file_ord = i + 1 - merged_filename = ".service{}".format(merged_file_ord) + merged_filename = f".service{merged_file_ord}" merged_file_path = tmp_dir_path / merged_filename merged_file_content = merged_filename * merged_file_ord @@ -57,7 +57,7 @@ def test_merge(tmpdir_factory, merged_file_count: int, append_linesep: bool): merge(output_file_path, merged_file_paths, append_linesep) - with open(output_file_path, "r") as output_file: + with open(output_file_path) as output_file: actual_output_file_content = output_file.read() assert actual_output_file_content == expected_output_file_content diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py index b4056707a..fb6532709 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py @@ -1,7 +1,5 @@ __version__ = "{{ cookiecutter.version }}" __version_info__ = tuple( - [ - int(num) if num.isdigit() else num - for num in __version__.replace("-", ".", 1).split(".") - ] + int(num) if num.isdigit() else num + for num in __version__.replace("-", ".", 1).split(".") ) From 5acde4875fbe38a8966f640249a6ba4bf7678ba0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 8 May 2022 02:41:22 +0000 Subject: [PATCH 015/276] Release 2022.05.07 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10631012e..db0a47975 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.05.07 + +### Changed +- Add pyupgrade to pre-commit config ([#3702](https://github.com/cookiecutter/cookiecutter-django/pull/3702)) +- Set permissions for GitHub actions ([#3698](https://github.com/cookiecutter/cookiecutter-django/pull/3698)) +### Updated +- Update jinja2 to 3.1.2 ([#3700](https://github.com/cookiecutter/cookiecutter-django/pull/3700)) + ## 2022.05.06 ### Updated diff --git a/setup.py b/setup.py index f8ab4371b..245681e27 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.06" +version = "2022.05.07" with open("README.rst") as readme_file: long_description = readme_file.read() From a2a0d2b70a7bc6e4e2eb9e05f1d367451a23ef90 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 14 May 2022 03:24:48 -0700 Subject: [PATCH 016/276] Update redis from 4.2.2 to 4.3.1 (#3704) --- {{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 f0753f572..7cd126e6a 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.0.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.2.2 # https://github.com/redis/redis-py +redis==4.3.1 # 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 ae4431b755ae400d0aa71301f696f6f3df848c99 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 14 May 2022 03:26:08 -0700 Subject: [PATCH 017/276] Update sentry-sdk from 1.5.11 to 1.5.12 (#3706) --- {{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 5ac0fe09c..b006eb295 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.11 # https://github.com/getsentry/sentry-python +sentry-sdk==1.5.12 # 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 3cb97907a370c98351c309b7bbbe794d368066f8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 14 May 2022 03:27:47 -0700 Subject: [PATCH 018/276] Update whitenoise from 6.0.0 to 6.1.0 (#3707) --- {{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 7cd126e6a..5d77f2f2f 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.0.0 # https://github.com/evansd/whitenoise +whitenoise==6.1.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.3.1 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From 9a5ce7f6e192885fef5d9d7b35ce82bfd433ee28 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 14 May 2022 03:31:21 -0700 Subject: [PATCH 019/276] Update coverage from 6.3.2 to 6.3.3 (#3709) --- {{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 6cb5e3ced..83d01776c 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.3.2 # https://github.com/nedbat/coveragepy +coverage==6.3.3 # https://github.com/nedbat/coveragepy black==22.3.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 2c7c4bc435fb07dce0324b7194b357d3bda02cdb Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 15 May 2022 02:42:24 +0000 Subject: [PATCH 020/276] Release 2022.05.14 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db0a47975..6ecf7b214 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.05.14 + +### Updated +- Update coverage to 6.3.3 ([#3709](https://github.com/cookiecutter/cookiecutter-django/pull/3709)) +- Update whitenoise to 6.1.0 ([#3707](https://github.com/cookiecutter/cookiecutter-django/pull/3707)) +- Update sentry-sdk to 1.5.12 ([#3706](https://github.com/cookiecutter/cookiecutter-django/pull/3706)) +- Update redis to 4.3.1 ([#3704](https://github.com/cookiecutter/cookiecutter-django/pull/3704)) + ## 2022.05.07 ### Changed diff --git a/setup.py b/setup.py index 245681e27..9d9b397c8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.07" +version = "2022.05.14" with open("README.rst") as readme_file: long_description = readme_file.read() From bc71a326da4ef6642e07db430a35404130e6cf19 Mon Sep 17 00:00:00 2001 From: Jimmy Gitonga Date: Mon, 16 May 2022 13:39:19 +0300 Subject: [PATCH 021/276] Update postgres versions (#3712) * REFACTOR: Update PostgreSQL versions that fix some security issues. * CHORE: Update PostgreSQL versions that fix some security issues. --- README.md | 10 +++++----- cookiecutter.json | 10 +++++----- docs/project-generation-options.rst | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index d4b067622..5fda8ff24 100644 --- a/README.md +++ b/README.md @@ -121,11 +121,11 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re use_pycharm [n]: y use_docker [n]: n Select postgresql_version: - 1 - 14.1 - 2 - 13.5 - 3 - 12.9 - 4 - 11.14 - 5 - 10.19 + 1 - 14 + 2 - 13 + 3 - 12 + 4 - 11 + 5 - 10 Choose from 1, 2, 3, 4, 5 [1]: 1 Select cloud_provider: 1 - AWS diff --git a/cookiecutter.json b/cookiecutter.json index 4a43bae7e..90d084b3a 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -18,11 +18,11 @@ "use_pycharm": "n", "use_docker": "n", "postgresql_version": [ - "14.1", - "13.5", - "12.9", - "11.14", - "10.19" + "14", + "13", + "12", + "11", + "10" ], "cloud_provider": [ "AWS", diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index 3cc719779..2d8103cf2 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -55,11 +55,11 @@ use_docker: postgresql_version: Select a PostgreSQL_ version to use. The choices are: - 1. 14.1 - 2. 13.5 - 3. 12.9 - 4. 11.14 - 5. 10.19 + 1. 14 + 2. 13 + 3. 12 + 4. 11 + 5. 10 cloud_provider: Select a cloud provider for static & media files. The choices are: From bc0ed07f451c3984fd28d6c9c8d67c1cbb67df5b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 16 May 2022 03:41:09 -0700 Subject: [PATCH 022/276] Update django-anymail to 8.6 (#3713) --- .../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 b006eb295..ebadabf17 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -22,21 +22,21 @@ django-storages[boto3]==1.12.3 # https://github.com/jschneier/django-storages django-storages[google]==1.12.3 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==8.5 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==8.6 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==8.5 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==8.6 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==8.5 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==8.6 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==8.5 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==8.6 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==8.5 # https://github.com/anymail/django-anymail +django-anymail[postmark]==8.6 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==8.5 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==8.6 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==8.5 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==8.6 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==8.5 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==8.6 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==8.5 # https://github.com/anymail/django-anymail +django-anymail==8.6 # https://github.com/anymail/django-anymail {%- endif %} From 1611719316c0498799c402f6fdb34802ca8b145b Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 17 May 2022 02:43:56 +0000 Subject: [PATCH 023/276] Release 2022.05.16 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ecf7b214..a803ba3f6 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.05.16 + +### Changed +- Update postgres versions ([#3712](https://github.com/cookiecutter/cookiecutter-django/pull/3712)) +### Updated +- Update django-anymail to 8.6 ([#3713](https://github.com/cookiecutter/cookiecutter-django/pull/3713)) + ## 2022.05.14 ### Updated diff --git a/setup.py b/setup.py index 9d9b397c8..34f441404 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.14" +version = "2022.05.16" with open("README.rst") as readme_file: long_description = readme_file.read() From 3743fded1e20df5e7b54b30c3e97fc731ad56742 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 18 May 2022 00:01:17 -0700 Subject: [PATCH 024/276] Update pillow from 9.1.0 to 9.1.1 (#3714) --- {{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 5d77f2f2f..0b0f34a7d 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.0 # https://github.com/python-pillow/Pillow +Pillow==9.1.1 # 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 a6ce9f04fff7e90027e105bce72a8706206190cf Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 19 May 2022 02:46:40 +0000 Subject: [PATCH 025/276] Release 2022.05.18 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a803ba3f6..3c74256b9 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.05.18 + +### Updated +- Update pillow to 9.1.1 ([#3714](https://github.com/cookiecutter/cookiecutter-django/pull/3714)) + ## 2022.05.16 ### Changed diff --git a/setup.py b/setup.py index 34f441404..969822104 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.16" +version = "2022.05.18" with open("README.rst") as readme_file: long_description = readme_file.read() From 2d7b83e82182b29e9ebb733ed4b13d3a5f4640c8 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 24 May 2022 04:47:13 -0700 Subject: [PATCH 026/276] Update djangorestframework-stubs from 1.4.0 to 1.6.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 83d01776c..bbd3e74dd 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs==1.9.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.4.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==1.6.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From c04088f8473325a3437cdc9121ff016ea345a304 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 24 May 2022 16:32:56 -0500 Subject: [PATCH 027/276] Update coverage from 6.3.3 to 6.4 (#3716) --- {{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 83d01776c..696848ff4 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.3.3 # https://github.com/nedbat/coveragepy +coverage==6.4 # https://github.com/nedbat/coveragepy black==22.3.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 5503df039f751d22ed89bbcf7337a14953fffd8f Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 25 May 2022 02:43:18 +0000 Subject: [PATCH 028/276] Release 2022.05.24 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c74256b9..219ba76e2 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.05.24 + +### Updated +- Update coverage to 6.4 ([#3716](https://github.com/cookiecutter/cookiecutter-django/pull/3716)) + ## 2022.05.18 ### Updated diff --git a/setup.py b/setup.py index 969822104..34341ad8e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.18" +version = "2022.05.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 1596b65a39d0205de467675e5613ee04c9ca9a2e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 1 Jun 2022 09:11:14 -0700 Subject: [PATCH 029/276] Update redis from 4.3.1 to 4.3.2 --- {{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 0b0f34a7d..0886d1c7f 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.1.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.3.1 # https://github.com/redis/redis-py +redis==4.3.2 # 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 8f66cad1b45d2ad553c0f75d0cbac896aed4d4a9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 2 Jun 2022 02:49:02 +0000 Subject: [PATCH 030/276] Release 2022.06.01 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 219ba76e2..f06d6bff7 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.01 + +### Updated +- Update redis to 4.3.2 ([#3726](https://github.com/cookiecutter/cookiecutter-django/pull/3726)) + ## 2022.05.24 ### Updated diff --git a/setup.py b/setup.py index 34341ad8e..c30829dbf 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.05.24" +version = "2022.06.01" with open("README.rst") as readme_file: long_description = readme_file.read() From a10cf3a9eab47975dd6b2580056fcc4860a48edb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 2 Jun 2022 09:50:57 -0700 Subject: [PATCH 031/276] Update redis from 4.3.2 to 4.3.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 0886d1c7f..50d2e98df 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.1.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.3.2 # https://github.com/redis/redis-py +redis==4.3.3 # 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 fb64830488046992981cd6e8229a55614caa23ea Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 2 Jun 2022 09:51:00 -0700 Subject: [PATCH 032/276] Update coverage from 6.4 to 6.4.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 696848ff4..7a488f127 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 # https://github.com/nedbat/coveragepy +coverage==6.4.1 # https://github.com/nedbat/coveragepy black==22.3.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 134ceb7224b536e61f12ae6c16be741d2d1a8922 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 3 Jun 2022 02:37:45 +0000 Subject: [PATCH 033/276] Release 2022.06.02 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f06d6bff7..32a0b741d 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.02 + +### Updated +- Update coverage to 6.4.1 ([#3729](https://github.com/cookiecutter/cookiecutter-django/pull/3729)) +- Update redis to 4.3.3 ([#3728](https://github.com/cookiecutter/cookiecutter-django/pull/3728)) + ## 2022.06.01 ### Updated diff --git a/setup.py b/setup.py index c30829dbf..b1cc4a0c4 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.01" +version = "2022.06.02" with open("README.rst") as readme_file: long_description = readme_file.read() From 9e805ba0abb9ce85f0ec1c967cd9f8c5335381e4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 3 Jun 2022 22:55:23 -0700 Subject: [PATCH 034/276] Update django-celery-beat from 2.2.1 to 2.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 50d2e98df..2f2eee7db 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -18,7 +18,7 @@ hiredis==2.0.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.2.6 # pyup: < 6.0 # https://github.com/celery/celery -django-celery-beat==2.2.1 # https://github.com/celery/django-celery-beat +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 {%- endif %} From 8111fcf84062a9ffa6885d2bf2ebdc4f8483ff8f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 4 Jun 2022 09:03:07 -0700 Subject: [PATCH 035/276] Update celery from 5.2.6 to 5.2.7 --- {{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 2f2eee7db..321e868ea 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -17,7 +17,7 @@ redis==4.3.3 # https://github.com/redis/redis-py hiredis==2.0.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} -celery==5.2.6 # pyup: < 6.0 # https://github.com/celery/celery +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 From 246f8a4361d03bc1b9f6cfc848b797876d6fa76e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 29 May 2022 14:02:03 -0700 Subject: [PATCH 036/276] Update sphinx from 4.5.0 to 5.0.0 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index ba0b67c5f..1f3307af5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==4.5.0 +sphinx==5.0.0 sphinx-rtd-theme==1.0.0 From 6f8ed496bbcf18b0d74f2ba586da8c814841aefa Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 29 May 2022 14:02:03 -0700 Subject: [PATCH 037/276] Update sphinx from 4.5.0 to 5.0.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7a488f127..a0557f705 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==4.5.0 # https://github.com/sphinx-doc/sphinx +sphinx==5.0.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 4e830b1575a5e3aebf4f6aa98ae48148ad8c7a44 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 4 Jun 2022 10:31:11 -0700 Subject: [PATCH 038/276] Update sphinx from 5.0.0 to 5.0.1 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 1f3307af5..b18d014f5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.0.0 +sphinx==5.0.1 sphinx-rtd-theme==1.0.0 From b1eae5394cff71f2252b0a26fa5af68a5ab32612 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 4 Jun 2022 10:31:12 -0700 Subject: [PATCH 039/276] Update sphinx from 5.0.0 to 5.0.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 a0557f705..c2ca554fc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==5.0.0 # https://github.com/sphinx-doc/sphinx +sphinx==5.0.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 502e8e523531b3c78f23a9af0765607e3e708ee5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 4 Jun 2022 10:47:10 -0700 Subject: [PATCH 040/276] Update django-stubs from 1.9.0 to 1.11.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index c2ca554fc..5a5d518aa 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.9.0 # https://github.com/typeddjango/django-stubs +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" %} From cf6fc443bbf25aad3b181170bc42587bc651165d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 4 Jun 2022 14:49:26 -0300 Subject: [PATCH 041/276] Fix type error --- .../{{cookiecutter.project_slug}}/users/tests/test_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py index 944daca52..0b47bd79f 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 @@ -63,7 +63,7 @@ class TestUserUpdateView: # Initialize the form form = UserAdminChangeForm() - form.cleaned_data = [] + form.cleaned_data = {} view.form_valid(form) messages_sent = [m.message for m in messages.get_messages(request)] From 8c1404fb737f0231a357c131fd08c205104fa6ba Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 4 Jun 2022 13:14:56 -0500 Subject: [PATCH 042/276] Update django-cors-headers to 3.12.0 (#3736) --- {{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 321e868ea..5d134cf3b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -42,7 +42,7 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework djangorestframework==3.13.1 # https://github.com/encode/django-rest-framework -django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==3.12.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation drf-spectacular==0.22.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} From d729d5ed4753527427c52dcfd263d37be36dcbd2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 5 Jun 2022 02:39:13 +0000 Subject: [PATCH 043/276] Release 2022.06.04 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32a0b741d..7758abd43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.06.04 + +### Updated +- Update django-cors-headers to 3.12.0 ([#3736](https://github.com/cookiecutter/cookiecutter-django/pull/3736)) +- Update djangorestframework-stubs to 1.6.0 ([#3718](https://github.com/cookiecutter/cookiecutter-django/pull/3718)) +- Update django-stubs to 1.11.0 ([#3734](https://github.com/cookiecutter/cookiecutter-django/pull/3734)) +- Update sphinx to 5.0.1 ([#3733](https://github.com/cookiecutter/cookiecutter-django/pull/3733)) +- Update sphinx to 5.0.0 ([#3724](https://github.com/cookiecutter/cookiecutter-django/pull/3724)) +- Update celery to 5.2.7 ([#3732](https://github.com/cookiecutter/cookiecutter-django/pull/3732)) +- Update django-celery-beat to 2.3.0 ([#3731](https://github.com/cookiecutter/cookiecutter-django/pull/3731)) + ## 2022.06.02 ### Updated diff --git a/setup.py b/setup.py index b1cc4a0c4..c46be4578 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.02" +version = "2022.06.04" with open("README.rst") as readme_file: long_description = readme_file.read() From a7d9f4656c0e34335e6200f6d48df70f252ca722 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 5 Jun 2022 18:09:22 -0500 Subject: [PATCH 044/276] Update django-cors-headers from 3.12.0 to 3.13.0 (#3738) --- {{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 5d134cf3b..82130580e 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -42,7 +42,7 @@ django-redis==5.2.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework djangorestframework==3.13.1 # https://github.com/encode/django-rest-framework -django-cors-headers==3.12.0 # https://github.com/adamchainz/django-cors-headers +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 {%- endif %} From 98e6178375b24f45d9ee8f0ce32aefdbbe9d4278 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 5 Jun 2022 18:09:46 -0500 Subject: [PATCH 045/276] Update whitenoise from 6.1.0 to 6.2.0 (#3737) --- {{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 82130580e..0414efe7b 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.1.0 # https://github.com/evansd/whitenoise +whitenoise==6.2.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.3.3 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From 635b1fa3ecbec5013c3c3507211805fde19ce0d0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Jun 2022 02:41:41 +0000 Subject: [PATCH 046/276] Release 2022.06.05 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7758abd43..8662d59c2 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.05 + +### Updated +- Update whitenoise to 6.2.0 ([#3737](https://github.com/cookiecutter/cookiecutter-django/pull/3737)) +- Update django-cors-headers to 3.13.0 ([#3738](https://github.com/cookiecutter/cookiecutter-django/pull/3738)) + ## 2022.06.04 ### Updated diff --git a/setup.py b/setup.py index c46be4578..bd9c45b4d 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.04" +version = "2022.06.05" with open("README.rst") as readme_file: long_description = readme_file.read() From a965a1c1d43104a01b7b4bb58633f7c6863ae92c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:37:55 +0100 Subject: [PATCH 047/276] Bump pre-commit/action from 2.0.3 to 3.0.0 (#3739) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 121657e2f..8856c0d88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: python-version: "3.9" cache: pip - name: Run pre-commit - uses: pre-commit/action@v2.0.3 + uses: pre-commit/action@v3.0.0 tests: strategy: From 241da33539c3fc8b2dd88337bf2fe385d9e7bcbc Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 7 Jun 2022 02:40:08 +0000 Subject: [PATCH 048/276] Release 2022.06.06 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8662d59c2..82f12b88e 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.06 + +### Updated +- Bump pre-commit/action from 2.0.3 to 3.0.0 ([#3739](https://github.com/cookiecutter/cookiecutter-django/pull/3739)) + ## 2022.06.05 ### Updated diff --git a/setup.py b/setup.py index bd9c45b4d..84e0661bd 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.05" +version = "2022.06.06" with open("README.rst") as readme_file: long_description = readme_file.read() From 6f610f0ef4b665f9a317360f39fbeccf5c8833d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jun 2022 21:11:34 +0100 Subject: [PATCH 049/276] Auto-update pre-commit hooks (#3742) 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 f9559ffa0..ad2dab61b 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.32.1 + 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 5b22d0dc9..b42c689ea 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.32.1 + rev: v2.34.0 hooks: - id: pyupgrade args: [--py39-plus] From 81ce5c5c3ea71a5b61f4740ac0bc56805442e18a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 7 Jun 2022 15:17:02 -0500 Subject: [PATCH 050/276] Update django-allauth from 0.50.0 to 0.51.0 (#3743) --- {{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 0414efe7b..54b510a2c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.17.6 # https://github.com/encode/uvicorn django==3.2.13 # pyup: < 4.0 # https://www.djangoproject.com/ django-environ==0.8.1 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils -django-allauth==0.50.0 # https://github.com/pennersr/django-allauth +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' %} From 2ac315f0ac2f113d9cb4d710c6c6880e78aa23aa Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 8 Jun 2022 02:43:44 +0000 Subject: [PATCH 051/276] Release 2022.06.07 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82f12b88e..bee54f303 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.07 + +### Updated +- Update django-allauth to 0.51.0 ([#3743](https://github.com/cookiecutter/cookiecutter-django/pull/3743)) +- Auto-update pre-commit hooks ([#3742](https://github.com/cookiecutter/cookiecutter-django/pull/3742)) + ## 2022.06.06 ### Updated diff --git a/setup.py b/setup.py index 84e0661bd..9dce22fef 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.06" +version = "2022.06.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 71b19bbd926db3397616402a8229021446485311 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jun 2022 17:54:58 +0100 Subject: [PATCH 052/276] Auto-update pre-commit hooks (#3744) 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 ad2dab61b..31ed0fa8f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_stages: [commit] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.3.0 hooks: - id: trailing-whitespace - id: check-yaml diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index b42c689ea..465f76f3a 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_stages: [commit] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.3.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer From e3b4ed2fe5211a9092c26e396438bf59985165b7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 9 Jun 2022 02:44:13 +0000 Subject: [PATCH 053/276] Release 2022.06.08 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bee54f303..e488f7b85 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.08 + +### Updated +- Auto-update pre-commit hooks ([#3744](https://github.com/cookiecutter/cookiecutter-django/pull/3744)) + ## 2022.06.07 ### Updated diff --git a/setup.py b/setup.py index 9dce22fef..3caee68c1 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.07" +version = "2022.06.08" with open("README.rst") as readme_file: long_description = readme_file.read() From 2963fd8b09174bbaeb30314a5efa6a84c4792813 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:58:10 +0100 Subject: [PATCH 054/276] Bump actions/setup-python from 3 to 4 (#3746) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/django-issue-checker.yml | 2 +- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8856c0d88..0fa5add0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: "3.9" cache: pip @@ -33,7 +33,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: "3.9" cache: pip @@ -60,7 +60,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: "3.9" cache: pip @@ -100,7 +100,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: "3.9" cache: pip diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml index 5ea023fdd..26f57c51f 100644 --- a/.github/workflows/django-issue-checker.yml +++ b/.github/workflows/django-issue-checker.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: "3.9" - name: Install dependencies diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 789c13b43..e51b4cbdc 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: "3.9" diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 2b73498dc..14c590e59 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.9" - name: Install dependencies diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 2e690d329..6ecf8af90 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.9" - name: Install dependencies From c1c1f07446414e06ad98789b741c4e70c9a4d891 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 10 Jun 2022 02:43:15 +0000 Subject: [PATCH 055/276] Release 2022.06.09 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e488f7b85..64d00de71 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.09 + +### Updated +- Bump actions/setup-python from 3 to 4 ([#3746](https://github.com/cookiecutter/cookiecutter-django/pull/3746)) + ## 2022.06.08 ### Updated diff --git a/setup.py b/setup.py index 3caee68c1..4940a6f90 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.08" +version = "2022.06.09" with open("README.rst") as readme_file: long_description = readme_file.read() From fe6d29006ad6832a5eeee55323b6e96d579eeb34 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 11 Jun 2022 10:41:01 -0500 Subject: [PATCH 056/276] Update requests from 2.27.1 to 2.28.0 (#3748) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f5364be53..ea2455268 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.27.1 +requests==2.28.0 From d57e2e634c464da0d77a757d5b92db4ec5909d99 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 12 Jun 2022 02:46:20 +0000 Subject: [PATCH 057/276] Release 2022.06.11 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64d00de71..ba788a7f5 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.11 + +### Updated +- Update requests to 2.28.0 ([#3748](https://github.com/cookiecutter/cookiecutter-django/pull/3748)) + ## 2022.06.09 ### Updated diff --git a/setup.py b/setup.py index 4940a6f90..a15caee61 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.09" +version = "2022.06.11" with open("README.rst") as readme_file: long_description = readme_file.read() From a51c8d29618db4d2328191e922914aad7b1d9246 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 13 Jun 2022 14:17:46 -0500 Subject: [PATCH 058/276] Update cookiecutter to 2.1.1 (#3727) * Update cookiecutter from 1.7.3 to 2.1.1 * Fix postgreSQL versions in tests * Fix front-end pipeline choice in tests Co-authored-by: Bruno Alla --- requirements.txt | 2 +- tests/test_cookiecutter_generation.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index ea2455268..9d9ed4460 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cookiecutter==1.7.3 +cookiecutter==2.1.1 sh==1.14.2 binaryornot==0.4.4 diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 63b4fc97c..3a757fcb7 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -47,11 +47,11 @@ SUPPORTED_COMBINATIONS = [ {"use_pycharm": "n"}, {"use_docker": "y"}, {"use_docker": "n"}, - {"postgresql_version": "14.1"}, - {"postgresql_version": "13.5"}, - {"postgresql_version": "12.9"}, - {"postgresql_version": "11.14"}, - {"postgresql_version": "10.19"}, + {"postgresql_version": "14"}, + {"postgresql_version": "13"}, + {"postgresql_version": "12"}, + {"postgresql_version": "11"}, + {"postgresql_version": "10"}, {"cloud_provider": "AWS", "use_whitenoise": "y"}, {"cloud_provider": "AWS", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "use_whitenoise": "y"}, @@ -88,7 +88,7 @@ SUPPORTED_COMBINATIONS = [ {"use_drf": "y"}, {"use_drf": "n"}, {"frontend_pipeline": "None"}, - {"frontend_pipeline": "django-compressor"}, + {"frontend_pipeline": "Django Compressor"}, {"frontend_pipeline": "Gulp"}, {"use_celery": "y"}, {"use_celery": "n"}, From c5f373d1f71fdefdb89b88f91232b47d39b0e064 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 14 Jun 2022 02:48:43 +0000 Subject: [PATCH 059/276] Release 2022.06.13 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba788a7f5..363e5bcc2 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.13 + +### Updated +- Update cookiecutter to 2.1.1 ([#3727](https://github.com/cookiecutter/cookiecutter-django/pull/3727)) + ## 2022.06.11 ### Updated diff --git a/setup.py b/setup.py index a15caee61..b0121827e 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.11" +version = "2022.06.13" with open("README.rst") as readme_file: long_description = readme_file.read() From 570b77446eb5c8c57e97635359d94e4f7111864b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 15 Jun 2022 13:14:32 -0500 Subject: [PATCH 060/276] Update django-environ to 0.9.0 (#3751) --- {{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 54b510a2c..2d65dc0c0 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -30,7 +30,7 @@ uvicorn[standard]==0.17.6 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ django==3.2.13 # pyup: < 4.0 # https://www.djangoproject.com/ -django-environ==0.8.1 # https://github.com/joke2k/django-environ +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 django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms From 223dd6dc910cd9a5bcdca25ef0545223352662cc Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 16 Jun 2022 02:45:20 +0000 Subject: [PATCH 061/276] Release 2022.06.15 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 363e5bcc2..16b67c921 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.15 + +### Updated +- Update django-environ to 0.9.0 ([#3751](https://github.com/cookiecutter/cookiecutter-django/pull/3751)) + ## 2022.06.13 ### Updated diff --git a/setup.py b/setup.py index b0121827e..3f71a5d6d 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.13" +version = "2022.06.15" with open("README.rst") as readme_file: long_description = readme_file.read() From c42c6f4628620cdb3e706034d5854690b61a8acf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 22 Jun 2022 10:40:52 -0500 Subject: [PATCH 062/276] 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 063/276] 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 064/276] 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 065/276] 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 066/276] 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 067/276] 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 068/276] 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 069/276] 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 070/276] 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 071/276] 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 072/276] 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 073/276] 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 074/276] 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 075/276] 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 076/276] 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 077/276] 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 078/276] 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 079/276] 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 080/276] 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 081/276] 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 082/276] 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 083/276] 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 084/276] 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 085/276] 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 086/276] 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 087/276] 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 088/276] 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 089/276] 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 090/276] 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 091/276] 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 092/276] 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 093/276] 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 094/276] 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 095/276] 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 096/276] 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 097/276] 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 098/276] 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 099/276] 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 100/276] 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 101/276] 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 102/276] 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 103/276] 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 104/276] 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 105/276] 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 106/276] 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 107/276] 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 108/276] 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 109/276] 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 110/276] 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 111/276] 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 112/276] 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 113/276] 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 114/276] 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 115/276] 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 116/276] 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 117/276] 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 118/276] 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 119/276] 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 120/276] 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 121/276] 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 122/276] 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 123/276] 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 124/276] 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 125/276] 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 126/276] 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() From 93aafa01c241e2d7890524d19efd9e1616a41c3d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 9 Aug 2022 07:25:05 -0700 Subject: [PATCH 127/276] Update sentry-sdk from 1.9.2 to 1.9.3 --- {{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 bcd0808b4..6c9ef2105 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.2 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.3 # 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 73b2e95c19eb455b73bdfe1be6fd02f5b54e8552 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 10 Aug 2022 02:34:46 +0000 Subject: [PATCH 128/276] Release 2022.08.09 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 836f8d70b..392698f94 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.09 + +### Updated +- Update sentry-sdk to 1.9.3 ([#3837](https://github.com/cookiecutter/cookiecutter-django/pull/3837)) + ## 2022.08.05 ### Updated diff --git a/setup.py b/setup.py index 20bebd34a..cfc415f8c 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.05" +version = "2022.08.09" with open("README.rst") as readme_file: long_description = readme_file.read() From 0727d9cbe9ad43ffa69539e93f30080d71585578 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 Aug 2022 02:42:07 -0500 Subject: [PATCH 129/276] Update sentry-sdk from 1.9.3 to 1.9.4 (#3838) --- {{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 6c9ef2105..08cd953c6 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.3 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.4 # 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 e47c35a701053719a130c456c4e253ecb9440237 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 Aug 2022 02:42:58 -0500 Subject: [PATCH 130/276] Update pytz from 2022.1 to 2022.2.1 (#3840) --- {{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 a0ad278b4..5379ce758 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.1 # https://github.com/stub42/pytz +pytz==2022.2.1 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify Pillow==9.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 45a9f830896f581945d9357eb220e54173aeb68f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 Aug 2022 02:52:17 -0500 Subject: [PATCH 131/276] Update coverage from 6.4.2 to 6.4.3 (#3835) --- {{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 c6e6a1dcf..61e7dc91d 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==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 +coverage==6.4.3 # 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 23ba1b129c1c5860f8aa61db2570f7e08ec2f351 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 16 Aug 2022 02:52:00 +0000 Subject: [PATCH 132/276] Release 2022.08.15 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 392698f94..65ea96563 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.08.15 + +### Updated +- Update coverage to 6.4.3 ([#3835](https://github.com/cookiecutter/cookiecutter-django/pull/3835)) +- Update pytz to 2022.2.1 ([#3840](https://github.com/cookiecutter/cookiecutter-django/pull/3840)) +- Update sentry-sdk to 1.9.4 ([#3838](https://github.com/cookiecutter/cookiecutter-django/pull/3838)) + ## 2022.08.09 ### Updated diff --git a/setup.py b/setup.py index cfc415f8c..ac676d994 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.09" +version = "2022.08.15" with open("README.rst") as readme_file: long_description = readme_file.read() From d5f55551fd3ed55c202cb5f8d61e1878662a940a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Aug 2022 16:38:07 -0500 Subject: [PATCH 133/276] Update django-storages to 1.13.1 (#3833) --- {{cookiecutter.project_slug}}/requirements/production.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 08cd953c6..b2dcfdb5e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,9 +17,9 @@ hiredis==2.0.0 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.12.3 # https://github.com/jschneier/django-storages +django-storages[boto3]==1.13.1 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.12.3 # https://github.com/jschneier/django-storages +django-storages[google]==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 From 92be4b2b40577fe83b7667464d830201f066334a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Aug 2022 16:40:09 -0500 Subject: [PATCH 134/276] Update flower to 1.2.0 (#3836) --- {{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 5379ce758..43717276a 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.1.0 # https://github.com/mher/flower +flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} From 0b103a37ad1f862d64e0af06c188db8f374a27e8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Aug 2022 16:40:31 -0500 Subject: [PATCH 135/276] Update sentry-sdk to 1.9.5 (#3841) --- {{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 b2dcfdb5e..afd04a1ea 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.4 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.5 # 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 eb11cac0bc0aa1f2523d44a92301b1b5f7243f3e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Aug 2022 16:41:33 -0500 Subject: [PATCH 136/276] Update uvicorn to 0.18.3 (#3845) --- {{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 43717276a..966075655 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.18.2 # https://github.com/encode/uvicorn +uvicorn[standard]==0.18.3 # https://github.com/encode/uvicorn {%- endif %} # Django From f571864cf08b28843c6d8555d72ee6f0744285c2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Aug 2022 16:42:32 -0500 Subject: [PATCH 137/276] Update coverage to 6.4.4 (#3842) --- {{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 61e7dc91d..46c6e4266 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==5.0.4 # https://github.com/PyCQA/flake8 flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort -coverage==6.4.3 # https://github.com/nedbat/coveragepy +coverage==6.4.4 # 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 98822a938df902d140300dc5c89144cd94be4a40 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Aug 2022 16:59:07 -0500 Subject: [PATCH 138/276] Update werkzeug to 2.2.2 (#3846) --- {{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 46c6e4266..5e11e66a4 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.1 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.2.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 7160d0e24ea7e215b5d6be3b89bb9f2706e042c9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Aug 2022 17:00:46 -0500 Subject: [PATCH 139/276] Update django-debug-toolbar to 3.6.0 (#3847) --- {{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 5e11e66a4..6b24ce51c 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.5.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.6.0 # https://github.com/jazzband/django-debug-toolbar 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 cacffd0e145846d3f522b6046c0577a18b22dc0a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 25 Aug 2022 02:56:47 +0000 Subject: [PATCH 140/276] Release 2022.08.24 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65ea96563..16432dd0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.08.24 + +### Updated +- Update django-debug-toolbar to 3.6.0 ([#3847](https://github.com/cookiecutter/cookiecutter-django/pull/3847)) +- Update werkzeug to 2.2.2 ([#3846](https://github.com/cookiecutter/cookiecutter-django/pull/3846)) +- Update coverage to 6.4.4 ([#3842](https://github.com/cookiecutter/cookiecutter-django/pull/3842)) +- Update uvicorn to 0.18.3 ([#3845](https://github.com/cookiecutter/cookiecutter-django/pull/3845)) +- Update sentry-sdk to 1.9.5 ([#3841](https://github.com/cookiecutter/cookiecutter-django/pull/3841)) +- Update flower to 1.2.0 ([#3836](https://github.com/cookiecutter/cookiecutter-django/pull/3836)) +- Update django-storages to 1.13.1 ([#3833](https://github.com/cookiecutter/cookiecutter-django/pull/3833)) + ## 2022.08.15 ### Updated diff --git a/setup.py b/setup.py index ac676d994..cc8f8e3c9 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.15" +version = "2022.08.24" with open("README.rst") as readme_file: long_description = readme_file.read() From bb282ee7f948b6302b1014b8d842aba6b903a759 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 25 Aug 2022 07:11:57 +0100 Subject: [PATCH 141/276] Bump Heroku python runtime to 3.9.13 --- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 425359e69..c6f7782f6 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.9.9 +python-3.9.13 From 28a06b12aff0e4b60b0c08d58ae5ae25356eac75 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Fri, 26 Aug 2022 11:00:57 -0300 Subject: [PATCH 142/276] Fix typo in docs (#3850) --- docs/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index 820fb60fa..52a99467c 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -6,7 +6,7 @@ FAQ Why is there a django.contrib.sites directory in Cookiecutter Django? --------------------------------------------------------------------- -It is there to add a migration so you don't have to manually change the ``sites.Site`` record from ``example.com`` to whatever your domain is. Instead, your ``{{cookiecutter.domain_name}}`` and {{cookiecutter.project_name}} value is placed by **Cookiecutter** in the domain and name fields respectively. +It is there to add a migration so you don't have to manually change the ``sites.Site`` record from ``example.com`` to whatever your domain is. Instead, your ``{{cookiecutter.domain_name}}`` and ``{{cookiecutter.project_name}}`` value is placed by **Cookiecutter** in the domain and name fields respectively. See `0003_set_site_domain_and_name.py`_. From 5552ddf09108f4b2fb6895a70ee428dc7914d727 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 26 Aug 2022 14:01:28 +0000 Subject: [PATCH 143/276] 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 961ddc863..15d481a4d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1282,5 +1282,10 @@ "name": "monosans", "github_login": "monosans", "twitter_username": "" + }, + { + "name": "Marcio Mazza", + "github_login": "marciomazza", + "twitter_username": "marciomazza" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b937e124c..0dd360bd3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1209,6 +1209,13 @@ Listed in alphabetical order. + + Marcio Mazza + + marciomazza + + marciomazza + Martin Blech From e8b9253c0b4d4fb08439d81fe175519fdad2dabb Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 27 Aug 2022 02:55:08 +0000 Subject: [PATCH 144/276] Release 2022.08.26 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16432dd0b..f015e7f66 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.26 + +### Changed +- Fix formatting in docs ([#3850](https://github.com/cookiecutter/cookiecutter-django/pull/3850)) + ## 2022.08.24 ### Updated diff --git a/setup.py b/setup.py index cc8f8e3c9..0d141fe99 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.24" +version = "2022.08.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 72508484277292f51ea85000c39e5f3010712831 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 1 Sep 2022 01:18:52 -0500 Subject: [PATCH 145/276] Update black to 22.8.0 (#3857) * Update black from 22.6.0 to 22.8.0 * Update black from 22.6.0 to 22.8.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 961c4c13e..96dc45612 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==22.6.0 +black==22.8.0 isort==5.10.1 flake8==5.0.4 flake8-isort==4.2.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6b24ce51c..bfd3fbeed 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==5.0.4 # https://github.com/PyCQA/flake8 flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort coverage==6.4.4 # https://github.com/nedbat/coveragepy -black==22.6.0 # https://github.com/psf/black +black==22.8.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 dd0e8bade373a662175507d2eb9866ba2b67f2cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 07:19:06 +0100 Subject: [PATCH 146/276] Auto-update pre-commit hooks (#3858) 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 a6dcf09f3..4bed79641 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.6.0 + rev: 22.8.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index ee635fb14..ec386b17e 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.6.0 + rev: 22.8.0 hooks: - id: black From 9e9814aefb737d1c5acfb1872728955e1bdec2cb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 1 Sep 2022 01:19:34 -0500 Subject: [PATCH 147/276] Update sentry-sdk from 1.9.5 to 1.9.6 (#3856) --- {{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 afd04a1ea..7d61d5273 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.5 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.6 # 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 050111cf61556e9840f66ffd5e0e6bc9d9725023 Mon Sep 17 00:00:00 2001 From: Haseeb ur Rehman Date: Thu, 1 Sep 2022 11:22:32 +0500 Subject: [PATCH 148/276] Update README.md (#3844) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5fda8ff24..7059e07d2 100644 --- a/README.md +++ b/README.md @@ -232,6 +232,7 @@ experience better. ## Articles +- [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021 - [Using cookiecutter-django with Google Cloud Storage](https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html) - Mar. 12, 2019 - [cookiecutter-django with Nginx, Route 53 and ELB](https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/) - Feb. 12, 2018 - [cookiecutter-django and Amazon RDS](https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/) - Feb. 7, 2018 From 8778f1a4cfed5355df018fa5c66ebb1324b791af Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 2 Sep 2022 02:59:24 +0000 Subject: [PATCH 149/276] Release 2022.09.01 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f015e7f66..5d9443a1d 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.09.01 + +### Changed +- Add article to README about how to use a hosted DB ([#3844](https://github.com/cookiecutter/cookiecutter-django/pull/3844)) +### Updated +- Update sentry-sdk to 1.9.6 ([#3856](https://github.com/cookiecutter/cookiecutter-django/pull/3856)) +- Auto-update pre-commit hooks ([#3858](https://github.com/cookiecutter/cookiecutter-django/pull/3858)) +- Update black to 22.8.0 ([#3857](https://github.com/cookiecutter/cookiecutter-django/pull/3857)) + ## 2022.08.26 ### Changed diff --git a/setup.py b/setup.py index 0d141fe99..6c62a34de 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.26" +version = "2022.09.01" with open("README.rst") as readme_file: long_description = readme_file.read() From 33b1b8eb872e0c21b080c3edfb6abeda32bdf57a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 2 Sep 2022 13:34:03 -0500 Subject: [PATCH 150/276] Update sentry-sdk from 1.9.6 to 1.9.7 (#3859) --- {{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 7d61d5273..32216d1bb 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.6 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.7 # 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 bd19b98eec4eb3986e8cf39619994e3d156567ff Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 2 Sep 2022 13:34:19 -0500 Subject: [PATCH 151/276] Update pytest to 7.1.3 (#3860) * Update pytest from 7.1.2 to 7.1.3 * Update pytest from 7.1.2 to 7.1.3 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 96dc45612..4151bff95 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ tox==3.25.1 -pytest==7.1.2 +pytest==7.1.3 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 bfd3fbeed..1c0dacd38 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.16.1 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ 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==7.1.3 # https://github.com/pytest-dev/pytest 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 From f0fd23cd4ae9a4cb9ad2fcb7afba560623638d3f Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 3 Sep 2022 02:56:18 +0000 Subject: [PATCH 152/276] Release 2022.09.02 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d9443a1d..fe3614744 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.09.02 + +### Updated +- Update pytest to 7.1.3 ([#3860](https://github.com/cookiecutter/cookiecutter-django/pull/3860)) +- Update sentry-sdk to 1.9.7 ([#3859](https://github.com/cookiecutter/cookiecutter-django/pull/3859)) + ## 2022.09.01 ### Changed diff --git a/setup.py b/setup.py index 6c62a34de..0294ef3dd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.01" +version = "2022.09.02" with open("README.rst") as readme_file: long_description = readme_file.read() From db0fc69f5fd5c0e196f0d728546c428d5f1d3ec9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 5 Sep 2022 09:31:14 -0500 Subject: [PATCH 153/276] Update sentry-sdk to 1.9.8 (#3861) --- {{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 32216d1bb..371f81cbc 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.7 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.8 # 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 ab13c6263ab0de30609060908b90871831328f05 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 6 Sep 2022 03:02:41 +0000 Subject: [PATCH 154/276] Release 2022.09.05 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe3614744..193ef9228 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.09.05 + +### Updated +- Update sentry-sdk to 1.9.8 ([#3861](https://github.com/cookiecutter/cookiecutter-django/pull/3861)) + ## 2022.09.02 ### Updated diff --git a/setup.py b/setup.py index 0294ef3dd..a10b51e7f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.02" +version = "2022.09.05" with open("README.rst") as readme_file: long_description = readme_file.read() From 87897f22ff90d9123ba0028800fca7b9684cfbc6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 15 Sep 2022 03:10:12 -0500 Subject: [PATCH 155/276] Update drf-spectacular to 0.24.0 (#3870) --- {{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 966075655..8d7243c91 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.23.1 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.24.0 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 638bbd5f5191b3377254728a4e1ee898b9c3a6ec Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 15 Sep 2022 03:10:34 -0500 Subject: [PATCH 156/276] Update watchfiles to 0.17.0 (#3869) --- {{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 1c0dacd38..dae689706 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' %} -watchfiles==0.16.1 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From 8bcfcc764d39898a151ae2c7f9f22c7ff2c42a92 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Sep 2022 03:01:32 +0000 Subject: [PATCH 157/276] Release 2022.09.15 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 193ef9228..a3e281f2e 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.09.15 + +### Updated +- Update watchfiles to 0.17.0 ([#3869](https://github.com/cookiecutter/cookiecutter-django/pull/3869)) +- Update drf-spectacular to 0.24.0 ([#3870](https://github.com/cookiecutter/cookiecutter-django/pull/3870)) + ## 2022.09.05 ### Updated diff --git a/setup.py b/setup.py index a10b51e7f..48068adfd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.05" +version = "2022.09.15" with open("README.rst") as readme_file: long_description = readme_file.read() From c6a12fae8bd80041fa445fe9c8b625e5ede1d04e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 16 Sep 2022 03:17:49 +0000 Subject: [PATCH 158/276] Auto-update pre-commit hooks --- .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 4bed79641..82ba2f231 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.37.3 + rev: v2.38.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 ec386b17e..e055b3cf8 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.37.3 + rev: v2.38.0 hooks: - id: pyupgrade args: [--py39-plus] From 84ec3e2f6f2c5281864cb0c69808876127fd5c32 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 23 Sep 2022 03:47:54 -0500 Subject: [PATCH 159/276] Update drf-spectacular from 0.24.0 to 0.24.1 (#3874) --- {{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 8d7243c91..58b2c6520 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.24.0 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.24.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 18f7488c3c66eabc0f5351cd7580244f6f1dc823 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 23 Sep 2022 03:48:18 -0500 Subject: [PATCH 160/276] Update tox from 3.25.1 to 3.26.0 (#3864) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4151bff95..c8b7cf9a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==3.25.1 +tox==3.26.0 pytest==7.1.3 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 944bd491eae52678aa60847cf3ec9dbd1290be7c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 23 Sep 2022 03:48:48 -0500 Subject: [PATCH 161/276] Update django-extensions from 3.2.0 to 3.2.1 (#3867) --- {{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 dae689706..7910ce6d8 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -43,6 +43,6 @@ 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.6.0 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.2.0 # https://github.com/django-extensions/django-extensions +django-extensions==3.2.1 # 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 e944a5ffe117c887661dcd8a5ac3ef9e9cb119a6 Mon Sep 17 00:00:00 2001 From: Brandon Rumiser Date: Fri, 23 Sep 2022 15:51:05 -0400 Subject: [PATCH 162/276] Mailjet default api url does not work out of the box (#3871) --- {{cookiecutter.project_slug}}/config/settings/production.py | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index b792e5448..046f5e4a0 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -167,7 +167,6 @@ EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend" ANYMAIL = { "MAILJET_API_KEY": env("MAILJET_API_KEY"), "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"), - "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"), } {%- elif cookiecutter.mail_service == 'Mandrill' %} # https://anymail.readthedocs.io/en/stable/esps/mandrill/ From 96dcbae247331466454a2ec70d5576880c2759a6 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 23 Sep 2022 19:51:49 +0000 Subject: [PATCH 163/276] 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 15d481a4d..8a391f657 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1287,5 +1287,10 @@ "name": "Marcio Mazza", "github_login": "marciomazza", "twitter_username": "marciomazza" + }, + { + "name": "Brandon Rumiser", + "github_login": "brumiser1550", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0dd360bd3..05443098b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -376,6 +376,13 @@ Listed in alphabetical order. + + Brandon Rumiser + + brumiser1550 + + + Brent Payne From 9cf280d34365ebf6fb6bea4a4c7330bb463d324c Mon Sep 17 00:00:00 2001 From: monosans Date: Fri, 23 Sep 2022 20:28:11 +0000 Subject: [PATCH 164/276] Reload uvicorn on html file change (#3866) --- docs/developing-locally.rst | 2 +- {{cookiecutter.project_slug}}/compose/local/django/start | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 23bb7b9a8..77c8a5206 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -82,7 +82,7 @@ First things first. or if you're running asynchronously: :: - $ uvicorn config.asgi:application --host 0.0.0.0 --reload + $ uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html' .. _PostgreSQL: https://www.postgresql.org/download/ .. _Redis: https://redis.io/download diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start index 9cbb6c897..3fe547357 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/start @@ -7,7 +7,7 @@ set -o nounset python manage.py migrate {%- if cookiecutter.use_async == 'y' %} -uvicorn config.asgi:application --host 0.0.0.0 --reload +uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html' {%- else %} python manage.py runserver_plus 0.0.0.0:8000 {%- endif %} From 92c790df8326d4a71d24e4af0343b2a3b7d6d8f9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 24 Sep 2022 03:00:13 +0000 Subject: [PATCH 165/276] Release 2022.09.23 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e281f2e..1cab789ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.09.23 + +### Changed +- Reload uvicorn on html file change ([#3866](https://github.com/cookiecutter/cookiecutter-django/pull/3866)) +- Mailjet default api url does not work out of the box ([#3871](https://github.com/cookiecutter/cookiecutter-django/pull/3871)) +### Updated +- Auto-update pre-commit hooks ([#3872](https://github.com/cookiecutter/cookiecutter-django/pull/3872)) +- Update django-extensions to 3.2.1 ([#3867](https://github.com/cookiecutter/cookiecutter-django/pull/3867)) +- Update tox to 3.26.0 ([#3864](https://github.com/cookiecutter/cookiecutter-django/pull/3864)) +- Update drf-spectacular to 0.24.1 ([#3874](https://github.com/cookiecutter/cookiecutter-django/pull/3874)) + ## 2022.09.15 ### Updated diff --git a/setup.py b/setup.py index 48068adfd..52e998a8d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.15" +version = "2022.09.23" with open("README.rst") as readme_file: long_description = readme_file.read() From 88c063f7ff975d7e23ff32a8eb55a04bdadf8558 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 24 Sep 2022 14:37:12 +0100 Subject: [PATCH 166/276] Remove `--no-deps` in pip wheels command of docs Dockerfile (#3875) --- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 6f1bb8b5e..0ba192b10 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ COPY ./requirements /requirements # create python dependency wheels -RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels \ +RUN pip wheel --no-cache-dir --wheel-dir /usr/src/app/wheels \ -r /requirements/local.txt -r /requirements/production.txt \ && rm -rf /requirements From 012fb2b56f0723c2d8806f32c476ee0eb002a825 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 25 Sep 2022 03:00:16 +0000 Subject: [PATCH 167/276] Release 2022.09.24 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cab789ac..404417a5e 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.09.24 + +### Fixed +- Remove `--no-deps` in pip wheels command of docs Dockerfile ([#3875](https://github.com/cookiecutter/cookiecutter-django/pull/3875)) + ## 2022.09.23 ### Changed diff --git a/setup.py b/setup.py index 52e998a8d..94c3f40fd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.23" +version = "2022.09.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 928836ee8904c93305b1c98e5425103334e20960 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Sep 2022 08:11:30 -0500 Subject: [PATCH 168/276] Update sphinx to 5.2.1 (#3879) --- 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 dc8f4c6e9..371755c3f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.1.1 +sphinx==5.2.1 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7910ce6d8..ed3eb15db 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.1 # https://github.com/sphinx-doc/sphinx +sphinx==5.2.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From a8c7900b48cbdf4571884c37e7d72b4eeb7b2515 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:11:57 +0100 Subject: [PATCH 169/276] Bump stefanzweifel/git-auto-commit-action from 4.14.1 to 4.15.0 (#3880) 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 6ecf8af90..78a4ef9ed 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.14.1 + uses: stefanzweifel/git-auto-commit-action@v4.15.0 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From e7ab32e794c5cbebccb89474081f04f91b9ad690 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:12:18 +0100 Subject: [PATCH 170/276] Auto-update pre-commit hooks (#3877) 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 82ba2f231..f74f410ea 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.38.0 + rev: v2.38.2 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 e055b3cf8..d64af3bf3 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.38.0 + rev: v2.38.2 hooks: - id: pyupgrade args: [--py39-plus] From d189be03708a35bd89385f724a1848109fa333b5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Sep 2022 08:12:57 -0500 Subject: [PATCH 171/276] Update django-debug-toolbar to 3.7.0 (#3878) --- {{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 ed3eb15db..7b9cac4b3 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.6.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.7.0 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # 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 94292f1aa9761776c403611f158f67977c6aef01 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 26 Sep 2022 10:03:39 -0500 Subject: [PATCH 172/276] Update djangorestframework to 3.14.0 (#3881) --- {{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 58b2c6520..23375fab5 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,7 +41,7 @@ django-compressor==4.1 # https://github.com/django-compressor/django-compressor django-redis==5.2.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework -djangorestframework==3.13.1 # https://github.com/encode/django-rest-framework +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.1 # https://github.com/tfranzel/drf-spectacular From 6202d26fe82b8d002c3456acc04a1248e4bec482 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 26 Sep 2022 08:58:07 -0700 Subject: [PATCH 173/276] Update drf-spectacular from 0.24.1 to 0.24.2 --- {{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 23375fab5..7d664a39b 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.1 # https://github.com/tfranzel/drf-spectacular +drf-spectacular==0.24.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 7a1dedaffe072ed782ef08621b4153a08cf6e7b3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 27 Sep 2022 02:58:00 +0000 Subject: [PATCH 174/276] Release 2022.09.26 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 404417a5e..6886d71f4 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.09.26 + +### Updated +- Update drf-spectacular to 0.24.2 ([#3882](https://github.com/cookiecutter/cookiecutter-django/pull/3882)) +- Update djangorestframework to 3.14.0 ([#3881](https://github.com/cookiecutter/cookiecutter-django/pull/3881)) +- Update django-debug-toolbar to 3.7.0 ([#3878](https://github.com/cookiecutter/cookiecutter-django/pull/3878)) +- Auto-update pre-commit hooks ([#3877](https://github.com/cookiecutter/cookiecutter-django/pull/3877)) +- Bump stefanzweifel/git-auto-commit-action from 4.14.1 to 4.15.0 ([#3880](https://github.com/cookiecutter/cookiecutter-django/pull/3880)) +- Update sphinx to 5.2.1 ([#3879](https://github.com/cookiecutter/cookiecutter-django/pull/3879)) + ## 2022.09.24 ### Fixed diff --git a/setup.py b/setup.py index 94c3f40fd..9bff976f9 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.24" +version = "2022.09.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 68f21b6028bd531d5108e7454a83ad8473e466a5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 27 Sep 2022 16:07:21 -0500 Subject: [PATCH 175/276] Update sphinx to 5.2.2 (#3884) * Update sphinx from 5.2.1 to 5.2.2 * Update sphinx from 5.2.1 to 5.2.2 --- 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 371755c3f..14fb7fd49 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.2.1 +sphinx==5.2.2 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7b9cac4b3..53340a9c4 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.2.1 # https://github.com/sphinx-doc/sphinx +sphinx==5.2.2 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From cd5d2790503e8f557747b8c736521acda04a3209 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Sep 2022 02:59:08 +0000 Subject: [PATCH 176/276] Release 2022.09.27 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6886d71f4..f0cb88010 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.09.27 + +### Updated +- Update sphinx to 5.2.2 ([#3884](https://github.com/cookiecutter/cookiecutter-django/pull/3884)) + ## 2022.09.26 ### Updated diff --git a/setup.py b/setup.py index 9bff976f9..a4f23da25 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.26" +version = "2022.09.27" with open("README.rst") as readme_file: long_description = readme_file.read() From 3b05e02aa091cb629de00c378319ec70d310dc88 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Sep 2022 12:55:37 -0700 Subject: [PATCH 177/276] Update crispy-bootstrap5 from 0.6 to 0.7 --- {{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 7d664a39b..a1aee1c8b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -34,7 +34,7 @@ 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 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 +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 {%- endif %} From f1ef4f85ff2f34e58ba2779bd047a7232e68dfce Mon Sep 17 00:00:00 2001 From: krati yadav Date: Fri, 30 Sep 2022 03:37:49 +0530 Subject: [PATCH 178/276] Removed SENDGRID_MERGE_FIELD_FORMAT from production.py (#3885) --- {{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 046f5e4a0..4115eacee 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -189,8 +189,6 @@ ANYMAIL = { EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend" ANYMAIL = { "SENDGRID_API_KEY": env("SENDGRID_API_KEY"), - "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"), - "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"), "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"), } {%- elif cookiecutter.mail_service == 'SendinBlue' %} From 71d4a52d11b8d76b0bbab5ed2478afdb94708078 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 29 Sep 2022 22:08:27 +0000 Subject: [PATCH 179/276] 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 8a391f657..2467ed3e1 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1292,5 +1292,10 @@ "name": "Brandon Rumiser", "github_login": "brumiser1550", "twitter_username": "" + }, + { + "name": "krati yadav", + "github_login": "krati5", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 05443098b..669e9d772 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1104,6 +1104,13 @@ Listed in alphabetical order. + + krati yadav + + krati5 + + + Krzysztof Szumny From 5e3397a972744e5c4b464fc15019a40d7ca92452 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 30 Sep 2022 03:02:52 +0000 Subject: [PATCH 180/276] Release 2022.09.29 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0cb88010..5d5af52e4 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.09.29 + +### Changed +- Remove outdated & optional Sendgrid settings from production config ([#3885](https://github.com/cookiecutter/cookiecutter-django/pull/3885)) + ## 2022.09.27 ### Updated diff --git a/setup.py b/setup.py index a4f23da25..5e8a0926a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.27" +version = "2022.09.29" with open("README.rst") as readme_file: long_description = readme_file.read() From 4edbc804f6053e0c9572f701cfe306fd7bc71199 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Sep 2022 14:23:33 -0500 Subject: [PATCH 181/276] Update sphinx to 5.2.3 (#3887) --- 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 14fb7fd49..113d073e3 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.2.2 +sphinx==5.2.3 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 53340a9c4..f014ac9cf 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.2.2 # https://github.com/sphinx-doc/sphinx +sphinx==5.2.3 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From fd8aa73d313d8e3520f8292613444d59701fb613 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Sep 2022 14:25:08 -0500 Subject: [PATCH 182/276] Update sentry-sdk to 1.9.9 (#3888) --- {{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 371f81cbc..c58861083 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.8 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.9 # 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 25ffbb00813b7072993c512c1f958e91686674d7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Sep 2022 14:26:01 -0500 Subject: [PATCH 183/276] Update mypy to 0.981 (#3889) --- {{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 f014ac9cf..4a38d7953 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==0.971 # https://github.com/python/mypy +mypy==0.981 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.1.3 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar From 7fcfc0154192560cd4e45f1aca8599ba9d3d8989 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Sep 2022 14:32:52 -0500 Subject: [PATCH 184/276] Update coverage to 6.5.0 (#3890) --- {{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 4a38d7953..ec038f618 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==5.0.4 # https://github.com/PyCQA/flake8 flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort -coverage==6.4.4 # https://github.com/nedbat/coveragepy +coverage==6.5.0 # https://github.com/nedbat/coveragepy black==22.8.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 15487a1ac7a54222e825a2cc2dd297f58449328c Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 1 Oct 2022 03:01:43 +0000 Subject: [PATCH 185/276] Release 2022.09.30 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d5af52e4..4b21b5ca3 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.09.30 + +### Updated +- Update coverage to 6.5.0 ([#3890](https://github.com/cookiecutter/cookiecutter-django/pull/3890)) +- Update mypy to 0.981 ([#3889](https://github.com/cookiecutter/cookiecutter-django/pull/3889)) +- Update sentry-sdk to 1.9.9 ([#3888](https://github.com/cookiecutter/cookiecutter-django/pull/3888)) +- Update sphinx to 5.2.3 ([#3887](https://github.com/cookiecutter/cookiecutter-django/pull/3887)) + ## 2022.09.29 ### Changed diff --git a/setup.py b/setup.py index 5e8a0926a..3ecf541fe 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.29" +version = "2022.09.30" with open("README.rst") as readme_file: long_description = readme_file.read() From 544cbef0ca08c05d0e2cab4698781bdc1b1bc1b3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 2 Oct 2022 04:17:44 -0500 Subject: [PATCH 186/276] Update pytz from 2022.2.1 to 2022.4 (#3891) --- {{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 7d664a39b..ff2e606f8 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.2.1 # https://github.com/stub42/pytz +pytz==2022.4 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify Pillow==9.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From ad28f471b610bdbf3f7e95040fafa967189e0ef0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 3 Oct 2022 02:45:53 +0000 Subject: [PATCH 187/276] Release 2022.10.02 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b21b5ca3..0240994f4 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.10.02 + +### Updated +- Update pytz to 2022.4 ([#3891](https://github.com/cookiecutter/cookiecutter-django/pull/3891)) + ## 2022.09.30 ### Updated diff --git a/setup.py b/setup.py index 3ecf541fe..3a6ae26a5 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.09.30" +version = "2022.10.02" with open("README.rst") as readme_file: long_description = readme_file.read() From 712c48582621ddb7ae35b4005ac3de6ec3a2f4d6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 3 Oct 2022 16:52:34 -0500 Subject: [PATCH 188/276] Update sentry-sdk from 1.9.9 to 1.9.10 (#3892) --- {{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 c58861083..df34af5e5 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.9 # https://github.com/getsentry/sentry-python +sentry-sdk==1.9.10 # 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 31c38c9566e0a1a300bc728bc51fb973f2c50e9a Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 4 Oct 2022 02:50:00 +0000 Subject: [PATCH 189/276] Release 2022.10.03 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0240994f4..490c15c19 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.10.03 + +### Updated +- Update sentry-sdk to 1.9.10 ([#3892](https://github.com/cookiecutter/cookiecutter-django/pull/3892)) + ## 2022.10.02 ### Updated diff --git a/setup.py b/setup.py index 3a6ae26a5..76481dcef 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.02" +version = "2022.10.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 9e69de4a6a09390084ddbf4028e43904d82f135a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 08:19:35 +0100 Subject: [PATCH 190/276] Auto-update pre-commit hooks (#3894) 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 f74f410ea..e57cbf3cb 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.38.2 + rev: v3.0.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 d64af3bf3..b40b8717d 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.38.2 + rev: v3.0.0 hooks: - id: pyupgrade args: [--py39-plus] From 942a0bc3a9bbba6dfc3116d020ada143c1d25f27 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 4 Oct 2022 06:30:18 -0500 Subject: [PATCH 191/276] Update mypy to 0.982 (#3893) --- {{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 ec038f618..6144e64ed 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==0.981 # https://github.com/python/mypy +mypy==0.982 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.1.3 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar From 1ac727931a2766ee4e3d304cf6098fa55a91a6e5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 4 Oct 2022 10:23:16 -0500 Subject: [PATCH 192/276] Update django to 3.2.16 (#3895) --- {{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 ff2e606f8..e533275a6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.18.3 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.2.15 # pyup: < 4.0 # https://www.djangoproject.com/ +django==3.2.16 # 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 4c9d7c663bb4dbaec42000b6c740e8974bf7ea4e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 5 Oct 2022 02:49:42 +0000 Subject: [PATCH 193/276] Release 2022.10.04 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 490c15c19..de62415b1 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.10.04 + +### Updated +- Update django to 3.2.16 ([#3895](https://github.com/cookiecutter/cookiecutter-django/pull/3895)) +- Update mypy to 0.982 ([#3893](https://github.com/cookiecutter/cookiecutter-django/pull/3893)) +- Auto-update pre-commit hooks ([#3894](https://github.com/cookiecutter/cookiecutter-django/pull/3894)) + ## 2022.10.03 ### Updated diff --git a/setup.py b/setup.py index 76481dcef..81c0f86ed 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.03" +version = "2022.10.04" with open("README.rst") as readme_file: long_description = readme_file.read() From 4eaa833a9011ec362faa51a520ab2d1bea17442a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 11 Oct 2022 06:35:40 -0500 Subject: [PATCH 194/276] Update black to 22.10.0 (#3898) --- 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 c8b7cf9a0..f95f4e5eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==22.8.0 +black==22.10.0 isort==5.10.1 flake8==5.0.4 flake8-isort==4.2.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6144e64ed..1f9fe4df1 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==5.0.4 # https://github.com/PyCQA/flake8 flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort coverage==6.5.0 # https://github.com/nedbat/coveragepy -black==22.8.0 # https://github.com/psf/black +black==22.10.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 790cf7e3797a4e0145078c156457466f241c2c4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 13:11:05 +0100 Subject: [PATCH 195/276] Bump stefanzweifel/git-auto-commit-action from 4.15.0 to 4.15.1 (#3903) 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 78a4ef9ed..31fd3a2e0 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.0 + uses: stefanzweifel/git-auto-commit-action@v4.15.1 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From ebe1a3dc4cd744ac2becad7d2b000a617f6c1f03 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 11 Oct 2022 12:22:29 -0500 Subject: [PATCH 196/276] Update psycopg2 to 2.9.4 (#3896) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++-- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 1f9fe4df1..718c1df7d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,9 +3,9 @@ Werkzeug[watchdog]==2.2.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 +psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 {%- else %} -psycopg2-binary==2.9.3 # https://github.com/psycopg/psycopg2 +psycopg2-binary==2.9.4 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index df34af5e5..bfbf02023 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==20.1.0 # https://github.com/benoitc/gunicorn -psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From ac1c5c7cbd768e3db2e2d398dd1af6cae3e0fc27 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 11 Oct 2022 12:23:15 -0500 Subject: [PATCH 197/276] Update gitpython to 3.1.29 (#3902) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f95f4e5eb..7ce718451 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.55 -gitpython==3.1.27 +gitpython==3.1.29 jinja2==3.1.2 requests==2.28.1 From be5cf566a58ee6597d56b9f3eced755a8879e087 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 11 Oct 2022 12:23:37 -0500 Subject: [PATCH 198/276] Update flake8-isort to 5.0.0 (#3901) --- 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 7ce718451..2e8e46fe3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==22.10.0 isort==5.10.1 flake8==5.0.4 -flake8-isort==4.2.0 +flake8-isort==5.0.0 pre-commit==2.20.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 718c1df7d..73d16a08e 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==5.0.4 # https://github.com/PyCQA/flake8 -flake8-isort==4.2.0 # https://github.com/gforcada/flake8-isort +flake8-isort==5.0.0 # https://github.com/gforcada/flake8-isort coverage==6.5.0 # https://github.com/nedbat/coveragepy black==22.10.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 7eca9be8d287cc0c334df6abebcded7dec0ffc8d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 18:23:58 +0100 Subject: [PATCH 199/276] Auto-update pre-commit hooks (#3899) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 4 ++-- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e57cbf3cb..aa9d6f4eb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,14 +9,14 @@ repos: - id: check-yaml - repo: https://github.com/asottile/pyupgrade - rev: v3.0.0 + rev: v3.1.0 hooks: - id: pyupgrade args: [--py39-plus] exclude: hooks/ - repo: https://github.com/psf/black - rev: 22.8.0 + rev: 22.10.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index b40b8717d..1b68d8858 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -10,13 +10,13 @@ repos: - id: check-yaml - repo: https://github.com/asottile/pyupgrade - rev: v3.0.0 + rev: v3.1.0 hooks: - id: pyupgrade args: [--py39-plus] - repo: https://github.com/psf/black - rev: 22.8.0 + rev: 22.10.0 hooks: - id: black From 507854158d6f134a91aaa4f3b1e40abba784eebd Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 12 Oct 2022 02:59:21 +0000 Subject: [PATCH 200/276] Release 2022.10.11 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de62415b1..e01f9c35f 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.10.11 + +### Updated +- Auto-update pre-commit hooks ([#3899](https://github.com/cookiecutter/cookiecutter-django/pull/3899)) +- Update flake8-isort to 5.0.0 ([#3901](https://github.com/cookiecutter/cookiecutter-django/pull/3901)) +- Update gitpython to 3.1.29 ([#3902](https://github.com/cookiecutter/cookiecutter-django/pull/3902)) +- Update psycopg2 to 2.9.4 ([#3896](https://github.com/cookiecutter/cookiecutter-django/pull/3896)) +- Bump stefanzweifel/git-auto-commit-action from 4.15.0 to 4.15.1 ([#3903](https://github.com/cookiecutter/cookiecutter-django/pull/3903)) +- Update black to 22.10.0 ([#3898](https://github.com/cookiecutter/cookiecutter-django/pull/3898)) + ## 2022.10.04 ### Updated diff --git a/setup.py b/setup.py index 81c0f86ed..8b7bfda00 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.04" +version = "2022.10.11" with open("README.rst") as readme_file: long_description = readme_file.read() From 985decdceca7e25b9b1c333b81dafd85ee177df2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 13 Oct 2022 02:47:29 -0500 Subject: [PATCH 201/276] Update pygithub from 1.55 to 1.56 (#3904) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2e8e46fe3..b72480ba4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.55 +PyGithub==1.56 gitpython==3.1.29 jinja2==3.1.2 requests==2.28.1 From b6039b00de8cab2f64b56d9981d51547e922b9ab Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 14 Oct 2022 03:01:59 +0000 Subject: [PATCH 202/276] Release 2022.10.13 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e01f9c35f..55c855859 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.10.13 + +### Updated +- Update pygithub to 1.56 ([#3904](https://github.com/cookiecutter/cookiecutter-django/pull/3904)) + ## 2022.10.11 ### Updated diff --git a/setup.py b/setup.py index 8b7bfda00..1954ecd4e 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.11" +version = "2022.10.13" with open("README.rst") as readme_file: long_description = readme_file.read() From e002389c3576b772186ca3e0ba617248cbb573e7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Oct 2022 13:47:52 -0500 Subject: [PATCH 203/276] Update watchfiles to 0.18.0 (#3907) --- {{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 73d16a08e..c034aace0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 psycopg2-binary==2.9.4 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.17.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From b87aaff263c7b82da859b47df04e846dfc489d2b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Oct 2022 13:48:22 -0500 Subject: [PATCH 204/276] Update django-celery-beat to 2.4.0 (#3908) --- {{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 e533275a6..7e641fc48 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -18,7 +18,7 @@ hiredis==2.0.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 -django-celery-beat==2.3.0 # https://github.com/celery/django-celery-beat +django-celery-beat==2.4.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==1.2.0 # https://github.com/mher/flower {%- endif %} From 0c98640a0bc2e30572bc1f89cd5cf51c6dff8be1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Oct 2022 13:48:41 -0500 Subject: [PATCH 205/276] Update sphinx to 5.3.0 (#3905) --- 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 113d073e3..c3b371b13 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.2.3 +sphinx==5.3.0 sphinx-rtd-theme==1.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index c034aace0..b935093d7 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.2.3 # https://github.com/sphinx-doc/sphinx +sphinx==5.3.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 56d9a5e9fafab6a4deb98fd817d2638177d7d57a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 19 Oct 2022 13:48:56 -0500 Subject: [PATCH 206/276] Update pytz to 2022.5 (#3906) --- {{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 7e641fc48..9f40fd2df 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.4 # https://github.com/stub42/pytz +pytz==2022.5 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify Pillow==9.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 9db27525981efb1de8cb80e2458c4388fb79042e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 19 Oct 2022 20:01:43 +0100 Subject: [PATCH 207/276] Upgrade to Django 4.0 (#3848) --- README.md | 2 +- setup.py | 2 +- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- .../users/migrations/0001_initial.py | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7059e07d2..149227e03 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ production-ready Django projects quickly. ## Features -- For Django 3.2 +- For Django 4.0 - Works with Python 3.9 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 diff --git a/setup.py b/setup.py index 1954ecd4e..f3fa55b07 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( classifiers=[ "Development Status :: 4 - Beta", "Environment :: Console", - "Framework :: Django :: 3.2", + "Framework :: Django :: 4.0", "Intended Audience :: Developers", "Natural Language :: English", "License :: OSI Approved :: BSD License", diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9f40fd2df..de5c61416 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.18.3 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.2.16 # pyup: < 4.0 # https://www.djangoproject.com/ +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.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py index 4c4d6954c..acd18512f 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py @@ -1,4 +1,3 @@ -# Generated by Django 3.2.9 on 2021-11-20 11:23 import django.contrib.auth.models import django.contrib.auth.validators from django.db import migrations, models From bdc4c323f914dc38be412f437ffe3df168aa4fcb Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 19 Oct 2022 20:14:03 +0100 Subject: [PATCH 208/276] Don't treat current version as newer --- scripts/create_django_issue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py index 262618531..5809f393d 100644 --- a/scripts/create_django_issue.py +++ b/scripts/create_django_issue.py @@ -108,7 +108,7 @@ def get_all_latest_django_versions( current_minor_version = DjVersion.parse(current_version_str) newer_versions: set[DjVersion] = set() for django_version in get_django_versions(): - if _django_max_version >= django_version >= current_minor_version: + if current_minor_version < django_version <= _django_max_version: newer_versions.add(django_version) return current_minor_version, sorted(newer_versions, reverse=True) From b623c0f956ed73bd237edd0b4b10f47f52387c09 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 19 Oct 2022 22:15:25 +0300 Subject: [PATCH 209/276] Set AWS_S3_MAX_MEMORY_SIZE (#3810) Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- docs/settings.rst | 1 + {{cookiecutter.project_slug}}/config/settings/production.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/docs/settings.rst b/docs/settings.rst index 7563f50d2..b8c6d448e 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -46,6 +46,7 @@ DJANGO_AWS_SECRET_ACCESS_KEY AWS_SECRET_ACCESS_KEY n/a DJANGO_AWS_STORAGE_BUCKET_NAME AWS_STORAGE_BUCKET_NAME n/a raises error DJANGO_AWS_S3_REGION_NAME AWS_S3_REGION_NAME n/a None DJANGO_AWS_S3_CUSTOM_DOMAIN AWS_S3_CUSTOM_DOMAIN n/a None +DJANGO_AWS_S3_MAX_MEMORY_SIZE AWS_S3_MAX_MEMORY_SIZE n/a 100_000_000 DJANGO_GCP_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error GOOGLE_APPLICATION_CREDENTIALS n/a n/a raises error SENTRY_DSN SENTRY_DSN n/a raises error diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 4115eacee..8eed5a805 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -88,6 +88,11 @@ AWS_S3_OBJECT_PARAMETERS = { "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate" } # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings +AWS_S3_MAX_MEMORY_SIZE = env.int( + "DJANGO_AWS_S3_MAX_MEMORY_SIZE", + default=100_000_000, # 100MB +) +# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None) # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront AWS_S3_CUSTOM_DOMAIN = env("DJANGO_AWS_S3_CUSTOM_DOMAIN", default=None) From 7fca0e9d9890f82cf015b6ff387c393a1875da1e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 20 Oct 2022 03:00:16 +0000 Subject: [PATCH 210/276] Release 2022.10.19 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55c855859..ece2b518d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.19 + +### Changed +- Set AWS_S3_MAX_MEMORY_SIZE ([#3810](https://github.com/cookiecutter/cookiecutter-django/pull/3810)) +- Upgrade to Django 4.0 ([#3848](https://github.com/cookiecutter/cookiecutter-django/pull/3848)) +### Updated +- Update pytz to 2022.5 ([#3906](https://github.com/cookiecutter/cookiecutter-django/pull/3906)) +- Update sphinx to 5.3.0 ([#3905](https://github.com/cookiecutter/cookiecutter-django/pull/3905)) +- Update django-celery-beat to 2.4.0 ([#3908](https://github.com/cookiecutter/cookiecutter-django/pull/3908)) +- Update watchfiles to 0.18.0 ([#3907](https://github.com/cookiecutter/cookiecutter-django/pull/3907)) + ## 2022.10.13 ### Updated diff --git a/setup.py b/setup.py index f3fa55b07..2b4640013 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.13" +version = "2022.10.19" with open("README.rst") as readme_file: long_description = readme_file.read() From 4ea0e98f3f1dafe31f3505644a9d141e1fc66746 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Mon, 24 Oct 2022 22:41:00 +0200 Subject: [PATCH 211/276] Upgrade Python version from 3.9 to 3.10 (#3913) --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/django-issue-checker.yml | 2 +- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- .pre-commit-config.yaml | 2 +- CONTRIBUTING.md | 2 +- README.md | 2 +- docs/deployment-on-pythonanywhere.rst | 2 +- docs/developing-locally.rst | 4 ++-- hooks/pre_gen_project.py | 2 +- setup.py | 2 +- tox.ini | 2 +- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 4 ++-- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 4 ++-- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.readthedocs.yml | 2 +- {{cookiecutter.project_slug}}/.travis.yml | 4 ++-- .../compose/local/django/Dockerfile | 2 +- .../compose/local/docs/Dockerfile | 2 +- .../compose/production/django/Dockerfile | 2 +- {{cookiecutter.project_slug}}/runtime.txt | 2 +- {{cookiecutter.project_slug}}/setup.cfg | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fa5add0d..d466f4032 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" cache: pip - name: Run pre-commit uses: pre-commit/action@v3.0.0 @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" cache: pip - name: Install dependencies run: pip install -r requirements.txt @@ -62,7 +62,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" cache: pip - name: Install dependencies run: pip install -r requirements.txt @@ -102,7 +102,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" cache: pip cache-dependency-path: | requirements.txt diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml index 26f57c51f..fd250604f 100644 --- a/.github/workflows/django-issue-checker.yml +++ b/.github/workflows/django-issue-checker.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index e51b4cbdc..1708e8b82 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Install pre-commit run: pip install pre-commit diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 14c590e59..27113a89f 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 31fd3a2e0..e9e994093 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index aa9d6f4eb..6d22c2e84 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: rev: v3.1.0 hooks: - id: pyupgrade - args: [--py39-plus] + args: [--py310-plus] exclude: hooks/ - repo: https://github.com/psf/black diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a9d5b088f..28bb81e38 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ To run all tests using various versions of python in virtualenvs defined in tox. It is possible to test with a specific version of python. To do this, the command is: - $ tox -e py39 + $ tox -e py310 This will run pytest with the python3.9 interpreter, for example. diff --git a/README.md b/README.md index 149227e03..9f2af6d37 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ production-ready Django projects quickly. ## Features - For Django 4.0 -- Works with Python 3.9 +- Works with Python 3.10 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 - [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ) diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst index f7bff12a4..7984d7b5e 100644 --- a/docs/deployment-on-pythonanywhere.rst +++ b/docs/deployment-on-pythonanywhere.rst @@ -34,7 +34,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o git clone # you can also use hg cd my-project-name - mkvirtualenv --python=/usr/bin/python3.9 my-project-name + mkvirtualenv --python=/usr/bin/python3.10 my-project-name pip install -r requirements/production.txt # may take a few minutes diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 77c8a5206..c9d28ff73 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -9,7 +9,7 @@ Setting Up Development Environment Make sure to have the following on your host: -* Python 3.9 +* Python 3.10 * PostgreSQL_. * Redis_, if using Celery * Cookiecutter_ @@ -18,7 +18,7 @@ First things first. #. Create a virtualenv: :: - $ python3.9 -m venv + $ python3.10 -m venv #. Activate the virtualenv you have just created: :: diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index 3fd4131c8..2845f012c 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -36,7 +36,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n": if python_major_version == 2: print( WARNING + "You're running cookiecutter under Python 2, but the generated " - "project requires Python 3.9+. Do you want to proceed (y/n)? " + TERMINATOR + "project requires Python 3.10+. Do you want to proceed (y/n)? " + TERMINATOR ) yes_options, no_options = frozenset(["y"]), frozenset(["n"]) while True: diff --git a/setup.py b/setup.py index 2b4640013..cf99cfa35 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ setup( "License :: OSI Approved :: BSD License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development", ], diff --git a/tox.ini b/tox.ini index 0afe3931d..0400e4f91 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = true -envlist = py39,black-template +envlist = py310,black-template [testenv] deps = -rrequirements.txt diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 20dd0d2f3..0790187bd 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: "3.9" + python-version: "3.10" cache: pip cache-dependency-path: | requirements/base.txt @@ -87,7 +87,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: "3.9" + python-version: "3.10" cache: pip cache-dependency-path: | requirements/base.txt diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index fb82ec5d5..dbb65fb73 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -13,7 +13,7 @@ variables: flake8: stage: lint - image: python:3.9-alpine + image: python:3.10-alpine before_script: - pip install -q flake8 script: @@ -35,7 +35,7 @@ pytest: script: - docker-compose -f local.yml run django pytest {%- else -%} - image: python:3.9 + image: python:3.10 tags: - python services: diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 1b68d8858..ebcc5989c 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -13,7 +13,7 @@ repos: rev: v3.1.0 hooks: - id: pyupgrade - args: [--py39-plus] + args: [--py310-plus] - repo: https://github.com/psf/black rev: 22.10.0 diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml index b4cf0c080..e943a5fa9 100644 --- a/{{cookiecutter.project_slug}}/.readthedocs.yml +++ b/{{cookiecutter.project_slug}}/.readthedocs.yml @@ -7,6 +7,6 @@ build: image: testing python: - version: 3.9 + version: 3.10 install: - requirements: requirements/local.txt diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml index a684da225..326d78392 100644 --- a/{{cookiecutter.project_slug}}/.travis.yml +++ b/{{cookiecutter.project_slug}}/.travis.yml @@ -2,7 +2,7 @@ dist: focal language: python python: - - "3.9" + - "3.10" services: - {% if cookiecutter.use_docker == 'y' %}docker{% else %}postgresql{% endif %} @@ -37,7 +37,7 @@ jobs: - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm language: python python: - - "3.9" + - "3.10" install: - pip install -r requirements/local.txt script: diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 044ef4a74..3ea6b2d4c 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.9-slim-bullseye +ARG PYTHON_VERSION=3.10-slim-bullseye # define an alias for the specfic python version used in this file. FROM python:${PYTHON_VERSION} as python diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 0ba192b10..c45d18c95 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.9-slim-bullseye +ARG PYTHON_VERSION=3.10-slim-bullseye # define an alias for the specfic python version used in this file. FROM python:${PYTHON_VERSION} as python diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 86f4ac18a..4652f0898 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.9-slim-bullseye +ARG PYTHON_VERSION=3.10-slim-bullseye {% if cookiecutter.frontend_pipeline == 'Gulp' -%} FROM node:16-bullseye-slim as client-builder diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index c6f7782f6..69b0ccfc8 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.9.13 +python-3.10.8 diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index dad64e1fa..3bec1fbee 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -18,7 +18,7 @@ force_grid_wrap = 0 use_parentheses = true [mypy] -python_version = 3.9 +python_version = 3.10 check_untyped_defs = True ignore_missing_imports = True warn_unused_ignores = True From 2321c8a47c9202dd09b88fa10ec8ee7520798cd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 21:45:46 +0100 Subject: [PATCH 212/276] Bump stefanzweifel/git-auto-commit-action from 4.15.1 to 4.15.2 (#3914) 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 e9e994093..75dc2c3e0 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.1 + uses: stefanzweifel/git-auto-commit-action@v4.15.2 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 0cd240598b3021ca2565d0c857fa272df9b499e5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 24 Oct 2022 15:46:56 -0500 Subject: [PATCH 213/276] Update sentry-sdk to 1.10.1 (#3911) --- {{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 bfbf02023..88f6a706a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.9.10 # https://github.com/getsentry/sentry-python +sentry-sdk==1.10.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 From 06c8adc6224a488e666fb60f43c11e0957865d93 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 25 Oct 2022 03:01:24 +0000 Subject: [PATCH 214/276] Release 2022.10.24 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ece2b518d..da352847b 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.10.24 + +### Changed +- Upgrade Python version from 3.9 to 3.10 ([#3913](https://github.com/cookiecutter/cookiecutter-django/pull/3913)) +### Updated +- Update sentry-sdk to 1.10.1 ([#3911](https://github.com/cookiecutter/cookiecutter-django/pull/3911)) +- Bump stefanzweifel/git-auto-commit-action from 4.15.1 to 4.15.2 ([#3914](https://github.com/cookiecutter/cookiecutter-django/pull/3914)) + ## 2022.10.19 ### Changed diff --git a/setup.py b/setup.py index cf99cfa35..722dc8a78 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.19" +version = "2022.10.24" with open("README.rst") as readme_file: long_description = readme_file.read() From b5528f0b72b38f4d0d961d592efce57690f88f69 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Oct 2022 09:41:33 -0500 Subject: [PATCH 215/276] Update psycopg2 to 2.9.5 (#3918) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++-- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b935093d7..f0a2bfc86 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,9 +3,9 @@ Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug ipdb==0.13.9 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 {%- else %} -psycopg2-binary==2.9.4 # https://github.com/psycopg/psycopg2 +psycopg2-binary==2.9.5 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 88f6a706a..e2c2046d2 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==20.1.0 # https://github.com/benoitc/gunicorn -psycopg2==2.9.4 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From 4fac524c40fd087589b07dbe11880c238eb35999 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Oct 2022 09:42:37 -0500 Subject: [PATCH 216/276] Update tox from 3.26.0 to 3.27.0 (#3917) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b72480ba4..1a5d99dad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==3.26.0 +tox==3.27.0 pytest==7.1.3 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 0b17d64d4171f20e92249aa303754edd8126adb6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Oct 2022 12:38:24 -0500 Subject: [PATCH 217/276] Update pytest to 7.2.0 (#3919) * Update pytest from 7.1.3 to 7.2.0 * Update pytest from 7.1.3 to 7.2.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 1a5d99dad..691ecf0b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ tox==3.27.0 -pytest==7.1.3 +pytest==7.2.0 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 f0a2bfc86..df77fba4b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==0.982 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs -pytest==7.1.3 # https://github.com/pytest-dev/pytest +pytest==7.2.0 # https://github.com/pytest-dev/pytest 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 From 9f290f21c81aff37c73ddc776655974cf86ea9c8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Oct 2022 12:38:40 -0500 Subject: [PATCH 218/276] Update uvicorn from 0.18.3 to 0.19.0 (#3920) --- {{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 de5c61416..2c8f5312f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.18.3 # https://github.com/encode/uvicorn +uvicorn[standard]==0.19.0 # https://github.com/encode/uvicorn {%- endif %} # Django From 368bdad664df6cab2f758e97d65d60643800bbaf Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Oct 2022 02:49:12 +0000 Subject: [PATCH 219/276] Release 2022.10.26 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da352847b..ee49c20d1 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.10.26 + +### Updated +- Update uvicorn to 0.19.0 ([#3920](https://github.com/cookiecutter/cookiecutter-django/pull/3920)) +- Update pytest to 7.2.0 ([#3919](https://github.com/cookiecutter/cookiecutter-django/pull/3919)) +- Update tox to 3.27.0 ([#3917](https://github.com/cookiecutter/cookiecutter-django/pull/3917)) +- Update psycopg2 to 2.9.5 ([#3918](https://github.com/cookiecutter/cookiecutter-django/pull/3918)) + ## 2022.10.24 ### Changed diff --git a/setup.py b/setup.py index 722dc8a78..509a10527 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.24" +version = "2022.10.26" with open("README.rst") as readme_file: long_description = readme_file.read() From f98d50194e53e1124082c76ed6c57a8542f80eaa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 09:50:30 +0200 Subject: [PATCH 220/276] Bump stefanzweifel/git-auto-commit-action from 4.15.2 to 4.15.3 (#3921) Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.15.2 to 4.15.3. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.15.2...v4.15.3) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] 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 75dc2c3e0..ee0c547e1 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.2 + uses: stefanzweifel/git-auto-commit-action@v4.15.3 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 9c132e2095d8f454e7c4a726c7a604559d3c75d6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 29 Oct 2022 02:46:36 +0000 Subject: [PATCH 221/276] Release 2022.10.28 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee49c20d1..4ab184396 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.10.28 + +### Updated +- Bump stefanzweifel/git-auto-commit-action from 4.15.2 to 4.15.3 ([#3921](https://github.com/cookiecutter/cookiecutter-django/pull/3921)) + ## 2022.10.26 ### Updated diff --git a/setup.py b/setup.py index 509a10527..b87d2a54b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.26" +version = "2022.10.28" with open("README.rst") as readme_file: long_description = readme_file.read() From f51e8e88e5c4779643f2e0e961a4886a63813440 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 29 Oct 2022 10:17:18 -0700 Subject: [PATCH 222/276] Update pillow from 9.2.0 to 9.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 2c8f5312f..b65c228eb 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2022.5 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify -Pillow==9.2.0 # https://github.com/python-pillow/Pillow +Pillow==9.3.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 db3edf1e70ea617552b1cc30bd79032b6ed24817 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Oct 2022 09:59:28 +0000 Subject: [PATCH 223/276] Auto-update pre-commit hooks (#3924) 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 6d22c2e84..10af89e41 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.1.0 + rev: v3.2.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 ebcc5989c..5cf841bc3 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.1.0 + rev: v3.2.0 hooks: - id: pyupgrade args: [--py310-plus] From 2f4bb6c1ba566af7bb73a131c75cb47352e2a215 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 31 Oct 2022 02:54:35 +0000 Subject: [PATCH 224/276] Release 2022.10.30 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ab184396..e7ef7f8f6 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.10.30 + +### Updated +- Auto-update pre-commit hooks ([#3924](https://github.com/cookiecutter/cookiecutter-django/pull/3924)) + ## 2022.10.28 ### Updated diff --git a/setup.py b/setup.py index b87d2a54b..8bc2d7a73 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.28" +version = "2022.10.30" with open("README.rst") as readme_file: long_description = readme_file.read() From 8bc9e1cabd7af41ca9f3eb76bcbb6789dc3b2663 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Oct 2022 05:19:20 -0700 Subject: [PATCH 225/276] Update django-coverage-plugin from 2.0.3 to 2.0.4 --- {{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 df77fba4b..2b40810b5 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.7.0 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions -django-coverage-plugin==2.0.3 # https://github.com/nedbat/django_coverage_plugin +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 f4668797b937a76930ea8ac44f78fade54dc6b0e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Oct 2022 19:23:53 -0700 Subject: [PATCH 226/276] Update pytz from 2022.5 to 2022.6 --- {{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 2c8f5312f..655a65e56 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.5 # https://github.com/stub42/pytz +pytz==2022.6 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify Pillow==9.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 9cc2a202d2555d8e2844208168b7fabf7ba85666 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 Nov 2022 13:37:23 -0700 Subject: [PATCH 227/276] Update sphinx-rtd-theme from 1.0.0 to 1.1.0 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index c3b371b13..2c673d1b4 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ sphinx==5.3.0 -sphinx-rtd-theme==1.0.0 +sphinx-rtd-theme==1.1.0 From 11b8ffa93de38ebf5cc12bcf57e3fb0976420430 Mon Sep 17 00:00:00 2001 From: Abe Date: Tue, 1 Nov 2022 20:59:58 -0400 Subject: [PATCH 228/276] fix typo - closes #3931 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 28bb81e38..69bce6f2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ is: $ tox -e py310 -This will run pytest with the python3.9 interpreter, for example. +This will run pytest with the python3.10 interpreter, for example. To run a particular test with tox for against your current Python version: From ca422e9916e247f24c93b6f564e0b32dfee724c0 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Wed, 2 Nov 2022 01:14:12 +0000 Subject: [PATCH 229/276] 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 2467ed3e1..190b81d38 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1297,5 +1297,10 @@ "name": "krati yadav", "github_login": "krati5", "twitter_username": "" + }, + { + "name": "Abe Hanoka", + "github_login": "abe-101", + "twitter_username": "abe__101" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 669e9d772..86ee9251c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -138,6 +138,13 @@ Listed in alphabetical order. abdadeel_ + + Abe Hanoka + + abe-101 + + abe__101 + Adam Bogdał From 0247ea5d37e6c3f99eee096b57a7b899b06dc5ef Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 3 Nov 2022 02:45:00 +0000 Subject: [PATCH 230/276] Release 2022.11.02 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7ef7f8f6..81a35d4b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.02 + +### Changed +- fix typo in CONTRIBUTING.md ([#3932](https://github.com/cookiecutter/cookiecutter-django/pull/3932)) +### Updated +- Update crispy-bootstrap5 to 0.7 ([#3886](https://github.com/cookiecutter/cookiecutter-django/pull/3886)) +- Update django-coverage-plugin to 2.0.4 ([#3927](https://github.com/cookiecutter/cookiecutter-django/pull/3927)) +- Update pytz to 2022.6 ([#3928](https://github.com/cookiecutter/cookiecutter-django/pull/3928)) +- Update sphinx-rtd-theme to 1.1.0 ([#3929](https://github.com/cookiecutter/cookiecutter-django/pull/3929)) +- Update pillow to 9.3.0 ([#3922](https://github.com/cookiecutter/cookiecutter-django/pull/3922)) + ## 2022.10.30 ### Updated diff --git a/setup.py b/setup.py index 8bc2d7a73..46dd4d16c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.30" +version = "2022.11.02" with open("README.rst") as readme_file: long_description = readme_file.read() From d1d6ee4dd79645e4b756640676655b1358e33995 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 06:24:07 -0500 Subject: [PATCH 231/276] Update sphinx-rtd-theme to 1.1.1 (#3935) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 2c673d1b4..2cc8302a2 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ sphinx==5.3.0 -sphinx-rtd-theme==1.1.0 +sphinx-rtd-theme==1.1.1 From 725f524b9ccad4f5df6b114ce5019d3d8edaf369 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 06:24:18 -0500 Subject: [PATCH 232/276] Update pygithub to 1.57 (#3936) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 691ecf0b4..ea9671876 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.56 +PyGithub==1.57 gitpython==3.1.29 jinja2==3.1.2 requests==2.28.1 From 76234ca9e641e8b05efab272b716dd25b493e0c9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 07:34:58 -0500 Subject: [PATCH 233/276] Update pytest-sugar to 0.9.6 (#3937) --- {{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 2b40810b5..b108431b1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -16,7 +16,7 @@ watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles mypy==0.982 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.2.0 # https://github.com/pytest-dev/pytest -pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar +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 {%- endif %} From 3359f6a4dfdfdab34a749bd9ffb4e12e2a59c68e Mon Sep 17 00:00:00 2001 From: Abe Hanoka Date: Sun, 6 Nov 2022 07:36:17 -0500 Subject: [PATCH 234/276] add os requirements for Ubuntu 22.04 (Jammy) (#3930) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fábio C. Barrionuevo da Luz --- .../utility/requirements-jammy.apt | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 {{cookiecutter.project_slug}}/utility/requirements-jammy.apt diff --git a/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt new file mode 100644 index 000000000..63d1587e6 --- /dev/null +++ b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt @@ -0,0 +1,23 @@ +##basic build dependencies of various Django apps for Ubuntu Jammy 22.04 +#build-essential metapackage install: make, gcc, g++, +build-essential +#required to translate +gettext +python3-dev + +##shared dependencies of: +##Pillow, pylibmc +zlib1g-dev + +##Postgresql and psycopg2 dependencies +libpq-dev + +##Pillow dependencies +libtiff5-dev +libjpeg8-dev +libfreetype6-dev +liblcms2-dev +libwebp-dev + +##django-extensions +graphviz-dev From ca82618526d8f2424c721a4bfaeb8abc54b5b030 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Sun, 6 Nov 2022 13:40:16 +0100 Subject: [PATCH 235/276] Store extended Celery task attributes in backend (#3855) --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index ad879fa72..9cd6a081b 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -283,6 +283,8 @@ if USE_TZ: CELERY_BROKER_URL = env("CELERY_BROKER_URL") # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend 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#std:setting-accept_content CELERY_ACCEPT_CONTENT = ["json"] # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer From a22f842f16879ac9d62b19ada4c03f63b1203fbd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 7 Nov 2022 02:43:39 +0000 Subject: [PATCH 236/276] Release 2022.11.06 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a35d4b6..a253b878c 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.11.06 + +### Changed +- Store extended Celery task attributes in backend ([#3855](https://github.com/cookiecutter/cookiecutter-django/pull/3855)) +- add os requirements for Ubuntu 22.04 (Jammy) ([#3930](https://github.com/cookiecutter/cookiecutter-django/pull/3930)) +### Updated +- Update pytest-sugar to 0.9.6 ([#3937](https://github.com/cookiecutter/cookiecutter-django/pull/3937)) +- Update pygithub to 1.57 ([#3936](https://github.com/cookiecutter/cookiecutter-django/pull/3936)) +- Update sphinx-rtd-theme to 1.1.1 ([#3935](https://github.com/cookiecutter/cookiecutter-django/pull/3935)) + ## 2022.11.02 ### Changed diff --git a/setup.py b/setup.py index 46dd4d16c..1633d385b 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.02" +version = "2022.11.06" with open("README.rst") as readme_file: long_description = readme_file.read() From b74584a4673078bf22111aa431baa7a63609282c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Nov 2022 07:42:26 -0500 Subject: [PATCH 237/276] Update watchfiles to 0.18.1 (#3938) --- {{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 b108431b1..130cb24cc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 psycopg2-binary==2.9.5 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From d4184cc1c68eee2c27f7b38fbc1bdf3fad6b6494 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 8 Nov 2022 02:43:08 +0000 Subject: [PATCH 238/276] Release 2022.11.07 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a253b878c..bc6394eac 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.11.07 + +### Updated +- Update watchfiles to 0.18.1 ([#3938](https://github.com/cookiecutter/cookiecutter-django/pull/3938)) + ## 2022.11.06 ### Changed diff --git a/setup.py b/setup.py index 1633d385b..8100edc12 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.06" +version = "2022.11.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 040537a5d69ea96b245b24214105da740f8bca53 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:00:06 +0000 Subject: [PATCH 239/276] Auto-update pre-commit hooks (#3942) 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 10af89e41..e31055bb1 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.0 + rev: v3.2.2 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 5cf841bc3..433d97de9 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.0 + rev: v3.2.2 hooks: - id: pyupgrade args: [--py310-plus] From aa6cc603e24616d6e16761e1596153b0d0f04141 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Nov 2022 02:41:33 +0000 Subject: [PATCH 240/276] Release 2022.11.11 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6394eac..88f2ab45b 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.11.11 + +### Updated +- Auto-update pre-commit hooks ([#3942](https://github.com/cookiecutter/cookiecutter-django/pull/3942)) + ## 2022.11.07 ### Updated diff --git a/setup.py b/setup.py index 8100edc12..ea0d169e3 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.07" +version = "2022.11.11" with open("README.rst") as readme_file: long_description = readme_file.read() From 27655eca7ee1a9647ff67af2eed3b419a766aff6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Nov 2022 00:51:28 -0800 Subject: [PATCH 241/276] Update tox from 3.27.0 to 3.27.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ea9671876..783edeb18 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==3.27.0 +tox==3.27.1 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 466bb798aa4b44787649bc1b9280bd4c1f9642d5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 15 Nov 2022 20:35:34 -0600 Subject: [PATCH 242/276] Update django-model-utils from 4.2.0 to 4.3.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 af9c4b52e..1a8ed77ae 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn[standard]==0.19.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.2.0 # https://github.com/jazzband/django-model-utils +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-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 From 7bdc6aea668464216b77d9492dd3ba7631a299fe Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 18 Nov 2022 14:21:59 -0600 Subject: [PATCH 243/276] Update python-slugify from 6.1.2 to 7.0.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 af9c4b52e..3fa109387 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2022.6 # https://github.com/stub42/pytz -python-slugify==6.1.2 # https://github.com/un33k/python-slugify +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' %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From 81ea9775daf987b39dc54b106884595a81cb044c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Nov 2022 07:32:12 -0600 Subject: [PATCH 244/276] Update flake8-isort from 5.0.0 to 5.0.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ea9671876..262462cda 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==22.10.0 isort==5.10.1 flake8==5.0.4 -flake8-isort==5.0.0 +flake8-isort==5.0.3 pre-commit==2.20.0 # Testing From 827e1364d1bb0df69c5b2b200ebe70128cdb1825 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Nov 2022 07:32:13 -0600 Subject: [PATCH 245/276] Update flake8-isort from 5.0.0 to 5.0.3 --- {{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 130cb24cc..e7674ce93 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==5.0.4 # https://github.com/PyCQA/flake8 -flake8-isort==5.0.0 # https://github.com/gforcada/flake8-isort +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 pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 202da796b36afbc7f9aabc88960ba301ff3b5acd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Nov 2022 08:12:28 -0600 Subject: [PATCH 246/276] Update uvicorn from 0.19.0 to 0.20.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 af9c4b52e..3d0da64f9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.19.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.20.0 # https://github.com/encode/uvicorn {%- endif %} # Django From f70b397c8672fad1a71b1e08872625c57f1d8f62 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 22 Nov 2022 02:58:49 -0600 Subject: [PATCH 247/276] Update redis from 4.3.4 to 4.3.5 --- {{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 af9c4b52e..9073d7034 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.4 # https://github.com/redis/redis-py +redis==4.3.5 # 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 0e91f40969fd7a0cdcf59be2f03f8e08dc43bce5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 22 Nov 2022 07:59:10 -0600 Subject: [PATCH 248/276] Update sentry-sdk from 1.10.1 to 1.11.1 --- {{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 e2c2046d2..275633dd4 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.10.1 # https://github.com/getsentry/sentry-python +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 From 7d517dc6775a6d3cf7c231ec38468108c259b640 Mon Sep 17 00:00:00 2001 From: adinhodovic Date: Tue, 22 Nov 2022 20:08:02 +0100 Subject: [PATCH 249/276] feat(celery): Send task events for Celery by default Is useful for e.g Flower and Celery-exporter --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 9cd6a081b..b8368b6cb 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -299,6 +299,8 @@ CELERY_TASK_TIME_LIMIT = 5 * 60 CELERY_TASK_SOFT_TIME_LIMIT = 60 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#beat-scheduler CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler" +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#worker-send-task-events +CELERY_WORKER_SEND_TASK_EVENTS = True {%- endif %} # django-allauth From 65ac3d8a3f2e9ec5e66c21ba23c1e589ef7b29c7 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Tue, 22 Nov 2022 19:20:22 +0000 Subject: [PATCH 250/276] 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 190b81d38..bdbc76158 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1302,5 +1302,10 @@ "name": "Abe Hanoka", "github_login": "abe-101", "twitter_username": "abe__101" + }, + { + "name": "Adin Hodovic", + "github_login": "adinhodovic", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 86ee9251c..29db8acb3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -166,6 +166,13 @@ Listed in alphabetical order. + + Adin Hodovic + + adinhodovic + + + Agam Dua From de48e315174fc38dd4c925528bad907c00822981 Mon Sep 17 00:00:00 2001 From: adinhodovic Date: Tue, 22 Nov 2022 20:28:52 +0100 Subject: [PATCH 251/276] feat(celery): Enable sending the sent task event by default --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index b8368b6cb..b1d11cd3d 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -301,6 +301,8 @@ CELERY_TASK_SOFT_TIME_LIMIT = 60 CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler" # https://docs.celeryq.dev/en/stable/userguide/configuration.html#worker-send-task-events CELERY_WORKER_SEND_TASK_EVENTS = True +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-task_send_sent_event +CELERY_TASK_SEND_SENT_EVENT = True {%- endif %} # django-allauth From d98aad07109fe02613cab9850378eefc9f350748 Mon Sep 17 00:00:00 2001 From: Leifur Halldor Asgeirsson Date: Tue, 22 Nov 2022 14:59:34 -0500 Subject: [PATCH 252/276] Remove platform from compose file (#3957) --- {{cookiecutter.project_slug}}/local.yml | 2 -- {{cookiecutter.project_slug}}/production.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index fb203acd6..33a8db07a 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -11,7 +11,6 @@ services: dockerfile: ./compose/local/django/Dockerfile image: {{ cookiecutter.project_slug }}_local_django container_name: {{ cookiecutter.project_slug }}_local_django - platform: linux/x86_64 depends_on: - postgres {%- if cookiecutter.use_celery == 'y' %} @@ -44,7 +43,6 @@ services: docs: image: {{ cookiecutter.project_slug }}_local_docs container_name: {{ cookiecutter.project_slug }}_local_docs - platform: linux/x86_64 build: context: . dockerfile: ./compose/local/docs/Dockerfile diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index 4c1d64c20..ea4292a0d 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -11,7 +11,6 @@ services: context: . dockerfile: ./compose/production/django/Dockerfile image: {{ cookiecutter.project_slug }}_production_django - platform: linux/x86_64 depends_on: - postgres - redis From a78b052bcce3a67ff7bc2634fcd4590cb1e0bb77 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 22 Nov 2022 19:59:59 +0000 Subject: [PATCH 253/276] 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 bdbc76158..c8da987a2 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1307,5 +1307,10 @@ "name": "Adin Hodovic", "github_login": "adinhodovic", "twitter_username": "" + }, + { + "name": "Leifur Halldor Asgeirsson", + "github_login": "leifurhauks", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 29db8acb3..000e5fb1f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1160,6 +1160,13 @@ Listed in alphabetical order. + + Leifur Halldor Asgeirsson + + leifurhauks + + + Leo won From b5ad2fc232b136dc7d249c0a41bbf941b7247954 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Tue, 22 Nov 2022 17:51:31 -0500 Subject: [PATCH 254/276] Remove USE_L10N due to deprecation (#3960) --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index b8368b6cb..62c4b4327 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -30,8 +30,6 @@ LANGUAGE_CODE = "en-us" SITE_ID = 1 # https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n USE_I18N = True -# https://docs.djangoproject.com/en/dev/ref/settings/#use-l10n -USE_L10N = True # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz USE_TZ = True # https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths From 3e32780ccf39c1128a0ab1d2dc68d7e61b32096d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 23 Nov 2022 02:34:55 +0000 Subject: [PATCH 255/276] Release 2022.11.22 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88f2ab45b..85a0cb793 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.22 + +### Changed +- Remove USE_L10N due to deprecation ([#3960](https://github.com/cookiecutter/cookiecutter-django/pull/3960)) +- Remove platform from compose file ([#3957](https://github.com/cookiecutter/cookiecutter-django/pull/3957)) +- feat(celery): Send task events for Celery by default ([#3959](https://github.com/cookiecutter/cookiecutter-django/pull/3959)) +### Updated +- Update python-slugify to 7.0.0 ([#3950](https://github.com/cookiecutter/cookiecutter-django/pull/3950)) +- Update redis to 4.3.5 ([#3954](https://github.com/cookiecutter/cookiecutter-django/pull/3954)) +- Update sentry-sdk to 1.11.1 ([#3955](https://github.com/cookiecutter/cookiecutter-django/pull/3955)) +- Update uvicorn to 0.20.0 ([#3953](https://github.com/cookiecutter/cookiecutter-django/pull/3953)) +- Update tox to 3.27.1 ([#3945](https://github.com/cookiecutter/cookiecutter-django/pull/3945)) + ## 2022.11.11 ### Updated diff --git a/setup.py b/setup.py index ea0d169e3..55cc3d400 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.11" +version = "2022.11.22" with open("README.rst") as readme_file: long_description = readme_file.read() From 51f4374a8ab88cffd20b13cc36be10d35cfd79b0 Mon Sep 17 00:00:00 2001 From: Chao Yang Wu Date: Wed, 23 Nov 2022 22:51:20 +0800 Subject: [PATCH 256/276] Fix graceful shutdown of local dev containers and use watchfiles for beat + flower (#3925) Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- .../compose/local/django/celery/beat/start | 2 +- .../compose/local/django/celery/flower/start | 9 +++------ .../compose/local/django/celery/worker/start | 2 +- {{cookiecutter.project_slug}}/compose/local/django/start | 4 ++-- {{cookiecutter.project_slug}}/compose/local/docs/start | 2 +- .../compose/production/django/start | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start index c04a7365e..61f83968b 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start @@ -5,4 +5,4 @@ set -o nounset rm -f './celerybeat.pid' -celery -A config.celery_app beat -l INFO +exec watchfiles celery.__main__.main --args '-A config.celery_app beat -l INFO' diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index bd3c9f2fd..8ff56d118 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -3,9 +3,6 @@ set -o errexit set -o nounset - -celery \ - -A config.celery_app \ - -b "${CELERY_BROKER_URL}" \ - flower \ - --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" +exec watchfiles celery.__.main__.main \ + --args \ + "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\"" diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start index 4ddcfa137..16341fdd1 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 -watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO' +exec watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO' diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start index 3fe547357..ec57dc8e4 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/start @@ -7,7 +7,7 @@ set -o nounset python manage.py migrate {%- if cookiecutter.use_async == 'y' %} -uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html' +exec uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html' {%- else %} -python manage.py runserver_plus 0.0.0.0:8000 +exec python manage.py runserver_plus 0.0.0.0:8000 {%- endif %} diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/start b/{{cookiecutter.project_slug}}/compose/local/docs/start index fd2e0de6a..96a94f566 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/start +++ b/{{cookiecutter.project_slug}}/compose/local/docs/start @@ -4,4 +4,4 @@ set -o errexit set -o pipefail set -o nounset -make livehtml +exec make livehtml diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start index 2ba79501c..73f686bd7 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/start +++ b/{{cookiecutter.project_slug}}/compose/production/django/start @@ -28,7 +28,7 @@ if compress_enabled; then fi {%- endif %} {%- if cookiecutter.use_async == 'y' %} -/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker +exec /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker {%- else %} -/usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app +exec /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app {%- endif %} From c35a074d720c252986bae05c6da038a566ea3706 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Nov 2022 14:51:51 +0000 Subject: [PATCH 257/276] Bump stefanzweifel/git-auto-commit-action from 4.15.3 to 4.15.4 (#3940) 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 ee0c547e1..571bdcd02 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.3 + uses: stefanzweifel/git-auto-commit-action@v4.15.4 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 5ad6cb48c5a7ba03e866ae0159116bd08ccf6234 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 24 Nov 2022 02:32:07 +0000 Subject: [PATCH 258/276] Release 2022.11.23 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85a0cb793..24dbdc41f 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.11.23 + +### Changed +- Fix graceful shutdown of local dev containers and use watchfiles for beat + flower ([#3925](https://github.com/cookiecutter/cookiecutter-django/pull/3925)) +- feat(celery): Enable sending the sent task event by default ([#3961](https://github.com/cookiecutter/cookiecutter-django/pull/3961)) +### Updated +- Bump stefanzweifel/git-auto-commit-action from 4.15.3 to 4.15.4 ([#3940](https://github.com/cookiecutter/cookiecutter-django/pull/3940)) +- Update django-model-utils to 4.3.1 ([#3948](https://github.com/cookiecutter/cookiecutter-django/pull/3948)) +- Update flake8-isort to 5.0.3 ([#3952](https://github.com/cookiecutter/cookiecutter-django/pull/3952)) + ## 2022.11.22 ### Changed diff --git a/setup.py b/setup.py index 55cc3d400..d097c04e5 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.22" +version = "2022.11.23" with open("README.rst") as readme_file: long_description = readme_file.read() From b21f50e22b465bb5e01608c46738b9c022080243 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 08:17:41 +0000 Subject: [PATCH 259/276] Auto-update pre-commit hooks (#3963) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 4 ++-- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e31055bb1..df197108f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_stages: [commit] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: trailing-whitespace - id: check-yaml @@ -26,7 +26,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 433d97de9..e53422ed3 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_stages: [commit] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -26,7 +26,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 args: ["--config=setup.cfg"] From fec7ba3aa89332f1056d1835913c12e7d4d3eb1a Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 25 Nov 2022 02:33:31 +0000 Subject: [PATCH 260/276] Release 2022.11.24 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24dbdc41f..2b8be74db 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.11.24 + +### Updated +- Auto-update pre-commit hooks ([#3963](https://github.com/cookiecutter/cookiecutter-django/pull/3963)) + ## 2022.11.23 ### Changed diff --git a/setup.py b/setup.py index d097c04e5..7a2223092 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.23" +version = "2022.11.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 77695c7c10a902b8345e75a2a4cf06fb2d8971ad Mon Sep 17 00:00:00 2001 From: David Date: Sat, 26 Nov 2022 04:08:39 -0700 Subject: [PATCH 261/276] Fix typo in flower start for watching celery (#3966) --- .../compose/local/django/celery/flower/start | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start index 8ff56d118..ac3cc6b36 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start @@ -3,6 +3,6 @@ set -o errexit set -o nounset -exec watchfiles celery.__.main__.main \ +exec watchfiles celery.__main__.main \ --args \ "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\"" From fd45bb18ea992423c79a2878d02620e190b1ac2e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 26 Nov 2022 11:09:10 +0000 Subject: [PATCH 262/276] 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 c8da987a2..3d4ec0488 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1312,5 +1312,10 @@ "name": "Leifur Halldor Asgeirsson", "github_login": "leifurhauks", "twitter_username": "" + }, + { + "name": "David", + "github_login": "buckldav", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 000e5fb1f..028ed7231 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -607,6 +607,13 @@ Listed in alphabetical order. + + David + + buckldav + + + David Díaz From 0a8b15615a51f09083ce5386c4e09c5fe2ed2757 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 27 Nov 2022 02:34:17 +0000 Subject: [PATCH 263/276] Release 2022.11.26 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b8be74db..ba72b2cf3 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.11.26 + +### Changed +- Fix typo in flower start for watching celery ([#3966](https://github.com/cookiecutter/cookiecutter-django/pull/3966)) + ## 2022.11.24 ### Updated diff --git a/setup.py b/setup.py index 7a2223092..6f2fde261 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.24" +version = "2022.11.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 5ca7ae1c4306da865acdedb0899ad35cda471d79 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 09:37:03 +0000 Subject: [PATCH 264/276] Auto-update pre-commit hooks (#3970) 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 df197108f..75d2409cd 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.2 + rev: v3.2.3 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 e53422ed3..e8e69627d 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.2 + rev: v3.2.3 hooks: - id: pyupgrade args: [--py310-plus] From 49b3bb8ffe6311b877409886ecfdb90d8b4beb15 Mon Sep 17 00:00:00 2001 From: rguptar <69279773+rguptar@users.noreply.github.com> Date: Wed, 30 Nov 2022 10:26:58 -0800 Subject: [PATCH 265/276] Add Azure Storage as an option to serve static and media files (#3967) Fix https://github.com/cookiecutter/cookiecutter-django/issues/2301 --- README.md | 4 ++-- cookiecutter.json | 1 + docs/project-generation-options.rst | 4 +++- docs/settings.rst | 3 +++ hooks/pre_gen_project.py | 7 ++----- tests/test_cookiecutter_generation.py | 14 +++++++++++++- .../.envs/.production/.django | 6 ++++++ .../config/settings/production.py | 12 +++++++++++- .../requirements/production.txt | 2 ++ .../utils/storages.py | 11 +++++++++++ 10 files changed, 54 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 9f2af6d37..27fc6e0e1 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ production-ready Django projects quickly. - Optional basic ASGI setup for Websockets - Optional custom static build using Gulp and livereload - Send emails via [Anymail](https://github.com/anymail/django-anymail) (using [Mailgun](http://www.mailgun.com/) by default or Amazon SES if AWS is selected cloud provider, but switchable) -- Media storage using Amazon S3 or Google Cloud Storage +- Media storage using Amazon S3, Google Cloud Storage or Azure Storage - Docker support using [docker-compose](https://github.com/docker/compose) for development and production (using [Traefik](https://traefik.io/) with [LetsEncrypt](https://letsencrypt.org/) support) - [Procfile](https://devcenter.heroku.com/articles/procfile) for deploying to Heroku - Instructions for deploying to [PythonAnywhere](https://www.pythonanywhere.com/) @@ -41,7 +41,7 @@ production-ready Django projects quickly. *These features can be enabled during initial project setup.* -- Serve static files from Amazon S3, Google Cloud Storage or [Whitenoise](https://whitenoise.readthedocs.io/) +- Serve static files from Amazon S3, Google Cloud Storage, Azure Storage or [Whitenoise](https://whitenoise.readthedocs.io/) - Configuration for [Celery](https://docs.celeryq.dev) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only) - Integration with [MailHog](https://github.com/mailhog/MailHog) for local email testing - Integration with [Sentry](https://sentry.io/welcome/) for error logging diff --git a/cookiecutter.json b/cookiecutter.json index 90d084b3a..970411013 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -27,6 +27,7 @@ "cloud_provider": [ "AWS", "GCP", + "Azure", "None" ], "mail_service": [ diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index 2d8103cf2..0560badd3 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -66,7 +66,8 @@ cloud_provider: 1. AWS_ 2. GCP_ - 3. None + 3. Azure_ + 4. None Note that if you choose no cloud provider, media files won't work. @@ -147,6 +148,7 @@ debug: .. _AWS: https://aws.amazon.com/s3/ .. _GCP: https://cloud.google.com/storage/ +.. _Azure: https://azure.microsoft.com/en-us/products/storage/blobs/ .. _Amazon SES: https://aws.amazon.com/ses/ .. _Mailgun: https://www.mailgun.com diff --git a/docs/settings.rst b/docs/settings.rst index b8c6d448e..4691adbbd 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -49,6 +49,9 @@ DJANGO_AWS_S3_CUSTOM_DOMAIN AWS_S3_CUSTOM_DOMAIN n/a DJANGO_AWS_S3_MAX_MEMORY_SIZE AWS_S3_MAX_MEMORY_SIZE n/a 100_000_000 DJANGO_GCP_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error GOOGLE_APPLICATION_CREDENTIALS n/a n/a raises error +DJANGO_AZURE_ACCOUNT_KEY AZURE_ACCOUNT_KEY n/a raises error +DJANGO_AZURE_ACCOUNT_NAME AZURE_ACCOUNT_NAME n/a raises error +DJANGO_AZURE_CONTAINER_NAME AZURE_CONTAINER n/a raises error SENTRY_DSN SENTRY_DSN n/a raises error SENTRY_ENVIRONMENT n/a n/a production SENTRY_TRACES_SAMPLE_RATE n/a n/a 0.0 diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py index 2845f012c..c3eef1e43 100644 --- a/hooks/pre_gen_project.py +++ b/hooks/pre_gen_project.py @@ -72,11 +72,8 @@ if ( sys.exit(1) if ( - "{{ cookiecutter.cloud_provider }}" == "GCP" - and "{{ cookiecutter.mail_service }}" == "Amazon SES" -) or ( - "{{ cookiecutter.cloud_provider }}" == "None" - and "{{ cookiecutter.mail_service }}" == "Amazon SES" + "{{ cookiecutter.mail_service }}" == "Amazon SES" + and "{{ cookiecutter.cloud_provider }}" != "AWS" ): print( "You should either use AWS or select a different " diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 3a757fcb7..6219f75ef 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -56,6 +56,8 @@ SUPPORTED_COMBINATIONS = [ {"cloud_provider": "AWS", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "use_whitenoise": "y"}, {"cloud_provider": "GCP", "use_whitenoise": "n"}, + {"cloud_provider": "Azure", "use_whitenoise": "y"}, + {"cloud_provider": "Azure", "use_whitenoise": "n"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mailgun"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mailjet"}, {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mandrill"}, @@ -82,7 +84,16 @@ SUPPORTED_COMBINATIONS = [ {"cloud_provider": "GCP", "mail_service": "SendinBlue"}, {"cloud_provider": "GCP", "mail_service": "SparkPost"}, {"cloud_provider": "GCP", "mail_service": "Other SMTP"}, - # Note: cloud_providers GCP and None with mail_service Amazon SES is not supported + {"cloud_provider": "Azure", "mail_service": "Mailgun"}, + {"cloud_provider": "Azure", "mail_service": "Mailjet"}, + {"cloud_provider": "Azure", "mail_service": "Mandrill"}, + {"cloud_provider": "Azure", "mail_service": "Postmark"}, + {"cloud_provider": "Azure", "mail_service": "Sendgrid"}, + {"cloud_provider": "Azure", "mail_service": "SendinBlue"}, + {"cloud_provider": "Azure", "mail_service": "SparkPost"}, + {"cloud_provider": "Azure", "mail_service": "Other SMTP"}, + # Note: cloud_providers GCP, Azure, and None + # with mail_service Amazon SES is not supported {"use_async": "y"}, {"use_async": "n"}, {"use_drf": "y"}, @@ -113,6 +124,7 @@ SUPPORTED_COMBINATIONS = [ UNSUPPORTED_COMBINATIONS = [ {"cloud_provider": "None", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "mail_service": "Amazon SES"}, + {"cloud_provider": "Azure", "mail_service": "Amazon SES"}, {"cloud_provider": "None", "mail_service": "Amazon SES"}, ] diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django index e7e8461c9..ad652c9ad 100644 --- a/{{cookiecutter.project_slug}}/.envs/.production/.django +++ b/{{cookiecutter.project_slug}}/.envs/.production/.django @@ -44,6 +44,12 @@ DJANGO_AWS_STORAGE_BUCKET_NAME= # ------------------------------------------------------------------------------ GOOGLE_APPLICATION_CREDENTIALS= DJANGO_GCP_STORAGE_BUCKET_NAME= +{% elif cookiecutter.cloud_provider == 'Azure' %} +# Azure +# ------------------------------------------------------------------------------ +DJANGO_AZURE_ACCOUNT_KEY= +DJANGO_AZURE_ACCOUNT_NAME= +DJANGO_AZURE_CONTAINER_NAME= {% endif %} # django-allauth # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 8eed5a805..40d3f19cc 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -100,6 +100,10 @@ aws_s3_domain = AWS_S3_CUSTOM_DOMAIN or f"{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws {% elif cookiecutter.cloud_provider == 'GCP' %} GS_BUCKET_NAME = env("DJANGO_GCP_STORAGE_BUCKET_NAME") GS_DEFAULT_ACL = "publicRead" +{% elif cookiecutter.cloud_provider == 'Azure' %} +AZURE_ACCOUNT_KEY = env("DJANGO_AZURE_ACCOUNT_KEY") +AZURE_ACCOUNT_NAME = env("DJANGO_AZURE_ACCOUNT_NAME") +AZURE_CONTAINER = env("DJANGO_AZURE_CONTAINER_NAME") {% endif -%} {% if cookiecutter.cloud_provider != 'None' or cookiecutter.use_whitenoise == 'y' -%} @@ -116,6 +120,9 @@ STATIC_URL = f"https://{aws_s3_domain}/static/" STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage" COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy" STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/" +{% elif cookiecutter.cloud_provider == 'Azure' -%} +STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootAzureStorage" +STATIC_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/static/" {% endif -%} # MEDIA @@ -126,6 +133,9 @@ MEDIA_URL = f"https://{aws_s3_domain}/media/" {%- elif cookiecutter.cloud_provider == 'GCP' %} DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage" MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/" +{%- elif cookiecutter.cloud_provider == 'Azure' %} +DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootAzureStorage" +MEDIA_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/media/" {%- endif %} # EMAIL @@ -228,7 +238,7 @@ COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True) {%- if cookiecutter.cloud_provider == 'None' %} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage" -{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %} +{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP', 'Azure') and cookiecutter.use_whitenoise == 'n' %} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE COMPRESS_STORAGE = STATICFILES_STORAGE {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 275633dd4..c9b5b88a7 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -20,6 +20,8 @@ hiredis==2.0.0 # https://github.com/redis/hiredis-py django-storages[boto3]==1.13.1 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} django-storages[google]==1.13.1 # https://github.com/jschneier/django-storages +{%- elif cookiecutter.cloud_provider == 'Azure' %} +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 diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py index b712d3239..27595ad1a 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py @@ -22,4 +22,15 @@ class StaticRootGoogleCloudStorage(GoogleCloudStorage): class MediaRootGoogleCloudStorage(GoogleCloudStorage): location = "media" file_overwrite = False +{%- elif cookiecutter.cloud_provider == 'Azure' -%} +from storages.backends.azure_storage import AzureStorage + + +class StaticRootAzureStorage(AzureStorage): + location = "static" + + +class MediaRootAzureStorage(AzureStorage): + location = "media" + file_overwrite = False {%- endif %} From 9f8e25ebbc4c6ed1b09c07fe6c36a5b5e8bb2530 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 30 Nov 2022 18:27:34 +0000 Subject: [PATCH 266/276] 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 3d4ec0488..49ebfe4d8 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1317,5 +1317,10 @@ "name": "David", "github_login": "buckldav", "twitter_username": "" + }, + { + "name": "rguptar", + "github_login": "rguptar", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 028ed7231..d97324708 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1545,6 +1545,13 @@ Listed in alphabetical order. + + rguptar + + rguptar + + + Richard Hajdu From 431dfc94e2dd70941757221aceb4000ca2c9c022 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 1 Dec 2022 02:37:11 +0000 Subject: [PATCH 267/276] Release 2022.11.30 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba72b2cf3..45e784f8b 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.11.30 + +### Changed +- Add Azure Storage as an option to serve static and media files ([#3967](https://github.com/cookiecutter/cookiecutter-django/pull/3967)) +### Updated +- Auto-update pre-commit hooks ([#3970](https://github.com/cookiecutter/cookiecutter-django/pull/3970)) + ## 2022.11.26 ### Changed diff --git a/setup.py b/setup.py index 6f2fde261..a388c0b61 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.26" +version = "2022.11.30" with open("README.rst") as readme_file: long_description = readme_file.read() From a464856234fd9f8f68d17d72fe01f35868179790 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 2 Dec 2022 05:43:02 -0500 Subject: [PATCH 268/276] 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 269/276] 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 270/276] 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 271/276] 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 272/276] 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 273/276] 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 274/276] 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 275/276] 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 276/276] 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