From 28a06b12aff0e4b60b0c08d58ae5ae25356eac75 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Fri, 26 Aug 2022 11:00:57 -0300 Subject: [PATCH 01/35] 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 02/35] 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 03/35] 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 04/35] 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 05/35] 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 06/35] 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 07/35] 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 08/35] 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 09/35] 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 10/35] 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 11/35] 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 12/35] 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 13/35] 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 14/35] 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 15/35] 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 16/35] 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 17/35] 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 18/35] 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 19/35] 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 20/35] 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 21/35] 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 22/35] 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 23/35] 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 24/35] 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 25/35] 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 26/35] 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 27/35] 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 28/35] 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 29/35] 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 30/35] 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 31/35] 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 32/35] 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 33/35] 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 34/35] 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 35/35] 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()