From 3bca38c78d77ecdd9b1ae9af52b373c4277a9c1a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 30 Jan 2023 13:05:29 +0000 Subject: [PATCH 01/59] Release 2023.01.29 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c317f025..b501ac597 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.29 + +### Changed +- Add Webpack support ([#3623](https://github.com/cookiecutter/cookiecutter-django/pull/3623)) +- Remove `BrokenLinkEmailsMiddleware` ([#4112](https://github.com/cookiecutter/cookiecutter-django/pull/4112)) + ## 2023.01.28 ### Changed diff --git a/setup.py b/setup.py index f8321406d..4182d2047 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.28" +version = "2023.01.29" with open("README.rst") as readme_file: long_description = readme_file.read() From 119df8c61b02673051c6dbc2cfb27ee666031a2f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2023 06:25:41 -0500 Subject: [PATCH 02/59] Update black to 23.1.0 (#4120) * Update black from 22.12.0 to 23.1.0 * Update black from 22.12.0 to 23.1.0 * Update code style according to newer version of black * Update black pre-commit hook (#4122) Co-authored-by: browniebroke --------- Co-authored-by: Bruno Alla Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- requirements.txt | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- .../{{cookiecutter.project_slug}}/users/admin.py | 1 - .../{{cookiecutter.project_slug}}/users/tests/factories.py | 1 - .../{{cookiecutter.project_slug}}/users/views.py | 3 --- 7 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0617dd66c..438de52b4 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.12.0 + rev: 23.1.0 hooks: - id: black diff --git a/requirements.txt b/requirements.txt index 2b7c69d33..08c1568dc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==22.12.0 +black==23.1.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index a273bdf17..a8cdb1357 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: args: [--py310-plus] - repo: https://github.com/psf/black - rev: 22.12.0 + rev: 23.1.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index ef0342a32..a64b073d1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort coverage==7.1.0 # https://github.com/nedbat/coveragepy -black==22.12.0 # https://github.com/psf/black +black==23.1.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 diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py index 6675f483a..ff492a57f 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py @@ -10,7 +10,6 @@ User = get_user_model() @admin.register(User) class UserAdmin(auth_admin.UserAdmin): - form = UserAdminChangeForm add_form = UserAdminCreationForm fieldsets = ( 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 e30476227..36f963438 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py @@ -7,7 +7,6 @@ from factory.django import DjangoModelFactory class UserFactory(DjangoModelFactory): - username = Faker("user_name") email = Faker("email") name = Faker("name") diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index baa04a0d4..488c294d0 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -9,7 +9,6 @@ User = get_user_model() class UserDetailView(LoginRequiredMixin, DetailView): - model = User slug_field = "username" slug_url_kwarg = "username" @@ -19,7 +18,6 @@ user_detail_view = UserDetailView.as_view() class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView): - model = User fields = ["name"] success_message = _("Information successfully updated") @@ -38,7 +36,6 @@ user_update_view = UserUpdateView.as_view() class UserRedirectView(LoginRequiredMixin, RedirectView): - permanent = False def get_redirect_url(self): From 3150813bdb75283583d9e7f7e92f9990c231f0c3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2023 06:28:16 -0500 Subject: [PATCH 03/59] Update pre-commit to 3.0.3 (#4121) * Update pre-commit from 3.0.1 to 3.0.3 * Update pre-commit from 3.0.1 to 3.0.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 08c1568dc..6e458e6be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.1.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==3.0.1 +pre-commit==3.0.3 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index a64b073d1..9a45f5c7e 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==3.0.1 # https://github.com/pre-commit/pre-commit +pre-commit==3.0.3 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From ac3e5da6c1efce35644df26aed7ea4dfa88ec0db Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2023 06:30:25 -0500 Subject: [PATCH 04/59] Update python-slugify to 8.0.0 (#4111) --- {{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 46c1e79fc..0aa17a5f9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2022.7.1 # https://github.com/stub42/pytz -python-slugify==7.0.0 # https://github.com/un33k/python-slugify +python-slugify==8.0.0 # https://github.com/un33k/python-slugify Pillow==9.4.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From 76a987ac563db5383e7bda5ded4367f88652eb64 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 3 Feb 2023 02:29:58 +0000 Subject: [PATCH 05/59] Release 2023.02.02 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b501ac597..85bccefd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.02 + +### Updated +- Update python-slugify to 8.0.0 ([#4111](https://github.com/cookiecutter/cookiecutter-django/pull/4111)) +- Update pre-commit to 3.0.3 ([#4121](https://github.com/cookiecutter/cookiecutter-django/pull/4121)) +- Update black to 23.1.0 ([#4120](https://github.com/cookiecutter/cookiecutter-django/pull/4120)) +- Update black pre-commit hook ([#4122](https://github.com/cookiecutter/cookiecutter-django/pull/4122)) + ## 2023.01.29 ### Changed diff --git a/setup.py b/setup.py index 4182d2047..cc0e60d8f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.29" +version = "2023.02.02" with open("README.rst") as readme_file: long_description = readme_file.read() From 3f05da0ee77551520ddbbb4d11681ee6f504dccf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 3 Feb 2023 13:54:51 -0500 Subject: [PATCH 06/59] Update pre-commit to 3.0.4 (#4127) * Update pre-commit from 3.0.3 to 3.0.4 * Update pre-commit from 3.0.3 to 3.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 6e458e6be..6c554aaae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.1.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==3.0.3 +pre-commit==3.0.4 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 9a45f5c7e..8905ddb76 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==3.0.3 # https://github.com/pre-commit/pre-commit +pre-commit==3.0.4 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From d4865711ecc231cc3a29930fa7acd490d243c85e Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 4 Feb 2023 02:22:36 +0000 Subject: [PATCH 07/59] Release 2023.02.03 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85bccefd4..0451b1ead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.03 + +### Updated +- Update pre-commit to 3.0.4 ([#4127](https://github.com/cookiecutter/cookiecutter-django/pull/4127)) + ## 2023.02.02 ### Updated diff --git a/setup.py b/setup.py index cc0e60d8f..b180a6eca 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.02" +version = "2023.02.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 1f300e0ca26285ef541dfa06e185213ba52afb29 Mon Sep 17 00:00:00 2001 From: duffn <3457341+duffn@users.noreply.github.com> Date: Sun, 5 Feb 2023 03:00:28 -0700 Subject: [PATCH 08/59] Add note about which service to request when running locally with Docker & Webpack or Gulp (#4130) * Add note about running Webpack locally with Docker * Add note about running Gulp locally with Docker --- docs/developing-locally-docker.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index a7d77e108..935e86020 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -213,6 +213,11 @@ By default, it's enabled both in local and production environments (``local.yml` .. _`Flower`: https://github.com/mher/flower +Using Webpack or Gulp +~~~~~~~~~~~~~~~~~~~~~ + +When using Webpack or Gulp as the ``frontend_pipeline`` option, you should access your application at the address of the ``node`` service in order to see your correct styles. This is http://localhost:3000 by default. When using any of the other ``frontend_pipeline`` options, you should use the address of the ``django`` service, http://localhost:8000. + Developing locally with HTTPS ----------------------------- From 170cd6fe18e0627354167e29258bdfebe6f53bb1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 5 Feb 2023 10:01:04 +0000 Subject: [PATCH 09/59] 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 0f923e027..7920e8caf 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1357,5 +1357,10 @@ "name": "tildebox", "github_login": "tildebox", "twitter_username": "" + }, + { + "name": "duffn", + "github_login": "duffn", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 57194bca3..85b1ae88f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -705,6 +705,13 @@ Listed in alphabetical order. dudanogueira + + duffn + + duffn + + + Dónal Adams From 1f65656dafeb9f3ac8a4a3951afb55b090ac91dd Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 5 Feb 2023 10:03:22 +0000 Subject: [PATCH 10/59] Ignore some changes and group documentation changes into their own section (#4125) --- scripts/update_changelog.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py index b50d25066..57d915a4b 100644 --- a/scripts/update_changelog.py +++ b/scripts/update_changelog.py @@ -82,14 +82,20 @@ def group_pulls_by_change_type( grouped_pulls = { "Changed": [], "Fixed": [], + "Documentation": [], "Updated": [], } for pull in pull_requests_list: label_names = {label.name for label in pull.labels} + if "project infrastructure" in label_names: + # Don't mention it in the changelog + continue if "update" in label_names: group_name = "Updated" elif "bug" in label_names: group_name = "Fixed" + elif "docs" in label_names: + group_name = "Documentation" else: group_name = "Changed" grouped_pulls[group_name].append(pull) From 1de268d87bcd96a54e42c1c3350e512d4b13121d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Feb 2023 02:25:10 +0000 Subject: [PATCH 11/59] Release 2023.02.05 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0451b1ead..3389bf883 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.05 + +### Documentation +- Add note about which service to request when running locally with Docker & Webpack or Gulp ([#4130](https://github.com/cookiecutter/cookiecutter-django/pull/4130)) + ## 2023.02.03 ### Updated diff --git a/setup.py b/setup.py index b180a6eca..4a45827d8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.03" +version = "2023.02.05" with open("README.rst") as readme_file: long_description = readme_file.read() From c24fa1f6c4c1de0e50d0a3a7a90b21eb1c1f6282 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 6 Feb 2023 09:46:39 -0500 Subject: [PATCH 12/59] Update django-webpack-loader to 1.8.1 (#4132) --- {{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 0aa17a5f9..865d625e8 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -47,5 +47,5 @@ django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers drf-spectacular==0.25.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} {%- if cookiecutter.frontend_pipeline == 'Webpack' %} -django-webpack-loader==1.8.0 # https://github.com/django-webpack/django-webpack-loader +django-webpack-loader==1.8.1 # https://github.com/django-webpack/django-webpack-loader {%- endif %} From d76c3de4e67a2a856478b133e316d9888b73b8fb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 6 Feb 2023 10:09:22 -0500 Subject: [PATCH 13/59] Update django to 4.0.9 (#4134) --- {{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 865d625e8..dc87f7b88 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.20.0 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==4.0.8 # pyup: < 4.1 # https://www.djangoproject.com/ +django==4.0.9 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.52.0 # https://github.com/pennersr/django-allauth From 4080e9a86df8c0ba080cc7fe3b54df0f7a4e74f0 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 6 Feb 2023 16:16:48 +0000 Subject: [PATCH 14/59] Fix django-webpack-loader setup when running tests (#4128) * Add an integration test This should cover the problem raised for webpack loader issues * Add a DummyWebpackLoader for running tests * Replace DummyWebpackLoader by the one from webpack_loader package * Fix post-gen hook * Remove integration test --- {{cookiecutter.project_slug}}/config/settings/test.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 198b5aa5d..587b99324 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -29,5 +29,13 @@ EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" # ------------------------------------------------------------------------------ TEMPLATES[0]["OPTIONS"]["debug"] = True # type: ignore # noqa F405 +{%- if cookiecutter.frontend_pipeline == 'Webpack' %} +# django-webpack-loader +# ------------------------------------------------------------------------------ +WEBPACK_LOADER["DEFAULT"][ # noqa F405 + "LOADER_CLASS" +] = "webpack_loader.loader.FakeWebpackLoader" + +{%- endif %} # Your stuff... # ------------------------------------------------------------------------------ From 8810677961ecc78fa8728fc894fcb02af9ff5a3e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 6 Feb 2023 11:22:44 -0500 Subject: [PATCH 15/59] Update tox to 4.4.4 (#4133) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6c554aaae..64695482d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.0.4 # Testing # ------------------------------------------------------------------------------ -tox==4.4.2 +tox==4.4.4 pytest==7.2.1 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 5bc4bed95208e9b9139fab63327edb101219b9e9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 6 Feb 2023 18:33:08 +0000 Subject: [PATCH 16/59] Change `RequestFactory` to `APIRequestFactory` in tests for API views (#4110) --- .../users/tests/test_drf_views.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 4d163bf08..10ad100f1 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,22 +1,27 @@ -from django.test import RequestFactory +import pytest +from rest_framework.test import APIRequestFactory from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet from {{ cookiecutter.project_slug }}.users.models import User class TestUserViewSet: - def test_get_queryset(self, user: User, rf: RequestFactory): + @pytest.fixture + def api_rf(self) -> APIRequestFactory: + return APIRequestFactory() + + def test_get_queryset(self, user: User, api_rf: APIRequestFactory): view = UserViewSet() - request = rf.get("/fake-url/") + request = api_rf.get("/fake-url/") request.user = user view.request = request assert user in view.get_queryset() - def test_me(self, user: User, rf: RequestFactory): + def test_me(self, user: User, api_rf: APIRequestFactory): view = UserViewSet() - request = rf.get("/fake-url/") + request = api_rf.get("/fake-url/") request.user = user view.request = request From 9be5544464995fb34700014e49ed0da1380c67fd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 6 Feb 2023 14:13:12 -0500 Subject: [PATCH 17/59] Update hiredis to 2.2.1 (#4123) * Update hiredis from 2.1.1 to 2.2.1 * Update hiredis from 2.1.1 to 2.2.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index dc87f7b88..de53d9084 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -14,7 +14,7 @@ whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.4.2 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} -hiredis==2.1.1 # https://github.com/redis/hiredis-py +hiredis==2.2.1 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 6936adffd..8cdd85faf 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ Collectfast==2.2.0 # https://github.com/antonagestam/collectfast sentry-sdk==1.14.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} -hiredis==2.1.1 # https://github.com/redis/hiredis-py +hiredis==2.2.1 # https://github.com/redis/hiredis-py {%- endif %} # Django From 86eec800b820d165c4ab1adb1b1f9fe95a1e9899 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Mon, 6 Feb 2023 14:38:51 -0500 Subject: [PATCH 18/59] Added AWS ECS Full Deployment Article to README (#2630) * Added AWS ECS Full Deployment Article * Just for a refresher * Add AWS ECS Full Deployment Article by Andrew Chen Wang --------- Co-authored-by: Bruno Alla --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0697862c5..40d44f570 100644 --- a/README.md +++ b/README.md @@ -234,6 +234,7 @@ experience better. ## Articles - [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021 +- [Complete Walkthrough: Blue/Green Deployment to AWS ECS using GitHub actions](https://github.com/Andrew-Chen-Wang/cookiecutter-django-ecs-github) - June 10, 2020 - [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 d41d2a36064aba1b0915c5840786425f03d9a0e1 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 6 Feb 2023 20:41:47 +0000 Subject: [PATCH 19/59] Update template docker images using Dependabot (#4124) --- .github/dependabot.yml | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8922cd450..d95192f33 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,3 +18,56 @@ updates: interval: "daily" labels: - "update" + + # Enable version updates for Docker + # We need to specify each Dockerfile in a separate entry because Dependabot doesn't + # support wildcards or recursively checking subdirectories. Check this issue for updates: + # https://github.com/dependabot/dependabot-core/issues/2178 + - package-ecosystem: "docker" + directory: "{{cookiecutter.project_slug}}/compose/local/django/" + schedule: + interval: "daily" + labels: + - "update" + + - package-ecosystem: "docker" + directory: "{{cookiecutter.project_slug}}/compose/local/docs/" + schedule: + interval: "daily" + labels: + - "update" + + - package-ecosystem: "docker" + directory: "{{cookiecutter.project_slug}}/compose/local/node/" + schedule: + interval: "daily" + labels: + - "update" + + - package-ecosystem: "docker" + directory: "{{cookiecutter.project_slug}}/compose/production/aws/" + schedule: + interval: "daily" + labels: + - "update" + + - package-ecosystem: "docker" + directory: "{{cookiecutter.project_slug}}/compose/production/django/" + schedule: + interval: "daily" + labels: + - "update" + + - package-ecosystem: "docker" + directory: "{{cookiecutter.project_slug}}/compose/production/postgres/" + schedule: + interval: "daily" + labels: + - "update" + + - package-ecosystem: "docker" + directory: "{{cookiecutter.project_slug}}/compose/production/traefik/" + schedule: + interval: "daily" + labels: + - "update" From 1567564158e5a5218bf659c4310f27548ac3d0ec Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 7 Feb 2023 02:39:47 +0000 Subject: [PATCH 20/59] Release 2023.02.06 --- CHANGELOG.md | 14 ++++++++++++++ setup.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3389bf883..e2f5252f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.06 + +### Changed +- Change `RequestFactory` to `APIRequestFactory` in tests for API views ([#4110](https://github.com/cookiecutter/cookiecutter-django/pull/4110)) +### Fixed +- Fix django-webpack-loader setup when running tests ([#4128](https://github.com/cookiecutter/cookiecutter-django/pull/4128)) +### Documentation +- Added AWS ECS Full Deployment Article to README ([#2630](https://github.com/cookiecutter/cookiecutter-django/pull/2630)) +### Updated +- Update hiredis to 2.2.1 ([#4123](https://github.com/cookiecutter/cookiecutter-django/pull/4123)) +- Update tox to 4.4.4 ([#4133](https://github.com/cookiecutter/cookiecutter-django/pull/4133)) +- Update django to 4.0.9 ([#4134](https://github.com/cookiecutter/cookiecutter-django/pull/4134)) +- Update django-webpack-loader to 1.8.1 ([#4132](https://github.com/cookiecutter/cookiecutter-django/pull/4132)) + ## 2023.02.05 ### Documentation diff --git a/setup.py b/setup.py index 4a45827d8..8eff57a38 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.05" +version = "2023.02.06" with open("README.rst") as readme_file: long_description = readme_file.read() From dc68912c07b649d40f7ecd2f7ec45b1a10deb3c6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 7 Feb 2023 09:20:32 -0500 Subject: [PATCH 21/59] Update sentry-sdk to 1.15.0 (#4141) --- {{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 8cdd85faf..06917d8dd 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.14.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.15.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.1 # https://github.com/redis/hiredis-py From fade9bd0acdf58282356f3462d7edb8f543a9659 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 7 Feb 2023 12:43:11 -0500 Subject: [PATCH 22/59] Update redis to 4.5.0 (#4142) --- {{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 de53d9084..519efdfd2 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.4.2 # https://github.com/redis/redis-py +redis==4.5.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.2.1 # https://github.com/redis/hiredis-py {%- endif %} From 2db71965cab5d624a5a83b39ff49f42c41ce62a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:35:46 +0000 Subject: [PATCH 23/59] Bump webpack-cli from 4.10.0 to 5.0.1 in /{{cookiecutter.project_slug}} (#4118) Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.10.0 to 5.0.1. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.10.0...webpack-cli@5.0.1) --- updated-dependencies: - dependency-name: webpack-cli dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 8137aa51b..6488bcfb8 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -30,7 +30,7 @@ "sass-loader": "^12.4.0", "webpack": "^5.65.0", "webpack-bundle-tracker": "^1.4.0", - "webpack-cli": "^4.9.1", + "webpack-cli": "^5.0.1", "webpack-dev-server": "^4.6.0", "webpack-merge": "^5.8.0" }, From 3d4fa2fcae2e9e75ae560a3cf10caf8f55dbfcbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:36:36 +0000 Subject: [PATCH 24/59] Bump postcss-loader from 6.2.1 to 7.0.2 (#4114) Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 6.2.1 to 7.0.2. - [Release notes](https://github.com/webpack-contrib/postcss-loader/releases) - [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v6.2.1...v7.0.2) --- updated-dependencies: - dependency-name: postcss-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index 6488bcfb8..fd464b548 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -24,7 +24,7 @@ "node-sass-tilde-importer": "^1.0.2", "pixrem": "^5.0.0", "postcss": "^8.3.11", - "postcss-loader": "^6.2.1", + "postcss-loader": "^7.0.2", "postcss-preset-env": "^7.0.2", "sass": "^1.43.4", "sass-loader": "^12.4.0", From a3cfb0f0e8e305a79ea4d93692e1c780efbc4d35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:38:45 +0000 Subject: [PATCH 25/59] Bump babel-loader from 8.3.0 to 9.1.2 (#4117) Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.3.0 to 9.1.2. - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel-loader/compare/v8.3.0...v9.1.2) --- updated-dependencies: - dependency-name: babel-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index fd464b548..ece347ab5 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -6,7 +6,7 @@ "@babel/preset-env": "^7.16.5", "@popperjs/core": "^2.10.2", "autoprefixer": "^10.4.0", - "babel-loader": "^8.2.3", + "babel-loader": "^9.1.2", "bootstrap": "^5.1.3", "browser-sync": "^2.27.7", "css-loader": "^6.5.1", From ff9da7ec1bd84f23abb162bee41d4ee8e7772c52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:47:49 +0000 Subject: [PATCH 26/59] Bump sass-loader from 12.6.0 to 13.2.0 (#4116) Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 12.6.0 to 13.2.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v12.6.0...v13.2.0) --- updated-dependencies: - dependency-name: sass-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index ece347ab5..db475baf1 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -27,7 +27,7 @@ "postcss-loader": "^7.0.2", "postcss-preset-env": "^7.0.2", "sass": "^1.43.4", - "sass-loader": "^12.4.0", + "sass-loader": "^13.2.0", "webpack": "^5.65.0", "webpack-bundle-tracker": "^1.4.0", "webpack-cli": "^5.0.1", From e81b483944aa0351db66cb6ddffa77e389b8150a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 20:57:51 +0000 Subject: [PATCH 27/59] Bump postcss-preset-env from 7.8.3 to 8.0.1 (#4115) Bumps [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) from 7.8.3 to 8.0.1. - [Release notes](https://github.com/csstools/postcss-plugins/releases) - [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md) - [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env) --- updated-dependencies: - dependency-name: postcss-preset-env dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- {{cookiecutter.project_slug}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json index db475baf1..90ac63763 100644 --- a/{{cookiecutter.project_slug}}/package.json +++ b/{{cookiecutter.project_slug}}/package.json @@ -25,7 +25,7 @@ "pixrem": "^5.0.0", "postcss": "^8.3.11", "postcss-loader": "^7.0.2", - "postcss-preset-env": "^7.0.2", + "postcss-preset-env": "^8.0.1", "sass": "^1.43.4", "sass-loader": "^13.2.0", "webpack": "^5.65.0", From aee68f3e8ac659f83856955c70eae89403d3ea34 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 7 Feb 2023 17:58:44 -0500 Subject: [PATCH 28/59] Update sphinx-rtd-theme from 1.1.1 to 1.2.0 (#4145) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 2cc8302a2..1758de93e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ sphinx==5.3.0 -sphinx-rtd-theme==1.1.1 +sphinx-rtd-theme==1.2.0 From 82bf46a64fc471062770e76fe26546637adc7ae3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 8 Feb 2023 02:47:46 +0000 Subject: [PATCH 29/59] Release 2023.02.07 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2f5252f8..4514aa535 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.07 + +### Updated +- Bump postcss-preset-env from 7.8.3 to 8.0.1 ([#4115](https://github.com/cookiecutter/cookiecutter-django/pull/4115)) +- Bump sass-loader from 12.6.0 to 13.2.0 ([#4116](https://github.com/cookiecutter/cookiecutter-django/pull/4116)) +- Bump babel-loader from 8.3.0 to 9.1.2 ([#4117](https://github.com/cookiecutter/cookiecutter-django/pull/4117)) +- Bump postcss-loader from 6.2.1 to 7.0.2 ([#4114](https://github.com/cookiecutter/cookiecutter-django/pull/4114)) +- Bump webpack-cli from 4.10.0 to 5.0.1 ([#4118](https://github.com/cookiecutter/cookiecutter-django/pull/4118)) +- Update redis to 4.5.0 ([#4142](https://github.com/cookiecutter/cookiecutter-django/pull/4142)) +- Update sentry-sdk to 1.15.0 ([#4141](https://github.com/cookiecutter/cookiecutter-django/pull/4141)) + ## 2023.02.06 ### Changed diff --git a/setup.py b/setup.py index 8eff57a38..0715594da 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.06" +version = "2023.02.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 379522507aac76f0d81c1f8d3772e66cb83cbdb3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 8 Feb 2023 12:50:04 -0500 Subject: [PATCH 30/59] Update redis to 4.5.1 (#4147) --- {{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 519efdfd2..9bcdf31bf 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.5.0 # https://github.com/redis/redis-py +redis==4.5.1 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.2.1 # https://github.com/redis/hiredis-py {%- endif %} From b448a3ceaf0ef657df050a1e96297456a1325ede Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 8 Feb 2023 12:50:44 -0500 Subject: [PATCH 31/59] Update tox to 4.4.5 (#4146) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 64695482d..15c7c8c0a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.0.4 # Testing # ------------------------------------------------------------------------------ -tox==4.4.4 +tox==4.4.5 pytest==7.2.1 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From c1ed81a8cf5f1d252dc064f5add7c280c6f5215b Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 8 Feb 2023 17:51:29 +0000 Subject: [PATCH 32/59] Replace linting job by pre-commit.ci (#4143) --- .github/workflows/ci.yml | 11 ----------- README.md | 4 +++- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08ac54d86..ec2577e82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,17 +9,6 @@ concurrency: cancel-in-progress: true jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - cache: pip - - name: Run pre-commit - uses: pre-commit/action@v3.0.0 - tests: strategy: fail-fast: false diff --git a/README.md b/README.md index 40d44f570..7ab0b7e15 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,12 @@ [![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=branch%3Amaster) [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest) +[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/cookiecutter/cookiecutter-django/master.svg)](https://results.pre-commit.ci/latest/github/cookiecutter/cookiecutter-django/master) +[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black) + [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/) [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a) [![Code Helpers Badge](https://www.codetriage.com/cookiecutter/cookiecutter-django/badges/users.svg)](https://www.codetriage.com/cookiecutter/cookiecutter-django) -[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black) Powered by [Cookiecutter](https://github.com/cookiecutter/cookiecutter), Cookiecutter Django is a framework for jumpstarting production-ready Django projects quickly. From 9eb480f60fb1f1325fa2273935c45f9caadaaba8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 8 Feb 2023 18:31:25 -0500 Subject: [PATCH 33/59] Update sphinx to 6.1.3 (#4148) * Update sphinx from 5.3.0 to 6.1.3 * Update sphinx from 5.3.0 to 6.1.3 --- 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 1758de93e..0982f3d25 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ -sphinx==5.3.0 +sphinx==6.1.3 sphinx-rtd-theme==1.2.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 8905ddb76..daafb6054 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs==1.8.0 # https://github.com/typeddjango/djangorestfra # Documentation # ------------------------------------------------------------------------------ -sphinx==5.3.0 # https://github.com/sphinx-doc/sphinx +sphinx==6.1.3 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 4998a0cab7e72ad7d64c2c25a825bdcd4355e0fc Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 9 Feb 2023 02:48:42 +0000 Subject: [PATCH 34/59] Release 2023.02.08 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4514aa535..c975b4987 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.08 + +### Updated +- Update sphinx to 6.1.3 ([#4148](https://github.com/cookiecutter/cookiecutter-django/pull/4148)) +- Update redis to 4.5.1 ([#4147](https://github.com/cookiecutter/cookiecutter-django/pull/4147)) + ## 2023.02.07 ### Updated diff --git a/setup.py b/setup.py index 0715594da..4bc6e081d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.07" +version = "2023.02.08" with open("README.rst") as readme_file: long_description = readme_file.read() From 3c71b54e4cf620d4a92cf6c088245055d8c57e4c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 9 Feb 2023 04:35:41 -0500 Subject: [PATCH 35/59] Update mypy to 0.991 (#4106) * Update mypy from 0.982 to 0.991 * Ignore type error in test * Don't build on non-master branch pushes by default * Ignore type error in DRF view test --------- Co-authored-by: Bruno Alla --- .github/workflows/ci.yml | 1 + {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- .../{{cookiecutter.project_slug}}/users/tests/test_drf_views.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec2577e82..c31be1b7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,7 @@ name: CI on: push: + branches: [ "master", "main" ] pull_request: concurrency: diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index daafb6054..00c15d3cb 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==0.982 # https://github.com/python/mypy +mypy==0.991 # https://github.com/python/mypy django-stubs==1.14.0 # https://github.com/typeddjango/django-stubs pytest==7.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar 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 10ad100f1..7828e49cd 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 @@ -26,7 +26,7 @@ class TestUserViewSet: view.request = request - response = view.me(request) + response = view.me(request) # type: ignore assert response.data == { "username": user.username, From 0fe1fb9ca18d68341788932a9be9d485109fe220 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 9 Feb 2023 21:56:57 +0000 Subject: [PATCH 36/59] Remove unused pip cache paths in GHA & add a note for pre-commit.ci (#4151) * Remove unused pip caching paths in GHA * Add note about pre-commit.ci for open source --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 0790187bd..3c8ea8780 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -31,10 +31,10 @@ jobs: with: python-version: "3.10" cache: pip - cache-dependency-path: | - requirements/base.txt - requirements/local.txt + {%- if cookiecutter.open_source_license != 'Not open source' %} + # Consider using pre-commit.ci for open source project + {%- endif %} - name: Run pre-commit uses: pre-commit/action@v2.0.3 From 7af2d73a8c529cd34de864a8555be1012ec666c2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 10 Feb 2023 02:53:14 +0000 Subject: [PATCH 37/59] Release 2023.02.09 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c975b4987..2b88bc869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.09 + +### Changed +- Remove unused pip cache paths in GHA & add a note for pre-commit.ci ([#4151](https://github.com/cookiecutter/cookiecutter-django/pull/4151)) +### Updated +- Update mypy to 0.991 ([#4106](https://github.com/cookiecutter/cookiecutter-django/pull/4106)) + ## 2023.02.08 ### Updated diff --git a/setup.py b/setup.py index 4bc6e081d..858d20691 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.08" +version = "2023.02.09" with open("README.rst") as readme_file: long_description = readme_file.read() From 95e73006044517714b83c094c269278d0ff40df6 Mon Sep 17 00:00:00 2001 From: Delphine LEMIRE Date: Fri, 17 Feb 2023 14:42:02 +0100 Subject: [PATCH 38/59] Update version of github actions on the template project (#4167) --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 3c8ea8780..5a149820a 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.10" cache: pip @@ -36,7 +36,7 @@ jobs: # Consider using pre-commit.ci for open source project {%- endif %} - name: Run pre-commit - uses: pre-commit/action@v2.0.3 + uses: pre-commit/action@v3.0.0 # With no caching at all the entire ci process takes 4m 30s to complete! pytest: @@ -85,7 +85,7 @@ jobs: {%- else %} - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.10" cache: pip From 414122e52408c1dd11fb3d2690120bcb7d91b483 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Fri, 17 Feb 2023 13:42:38 +0000 Subject: [PATCH 39/59] 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 7920e8caf..b97140005 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1362,5 +1362,10 @@ "name": "duffn", "github_login": "duffn", "twitter_username": "" + }, + { + "name": "Delphine LEMIRE", + "github_login": "DelphineLemire", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 85b1ae88f..0670ff448 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -642,6 +642,13 @@ Listed in alphabetical order. jangeador + + Delphine LEMIRE + + DelphineLemire + + + Demetris Stavrou From 4aa56cb31a1397ffcea855527d1c37d7c64cccca Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 18 Feb 2023 02:27:13 +0000 Subject: [PATCH 40/59] Release 2023.02.17 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b88bc869..23604fd77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.17 + +### Changed +- Update version of github actions on the template project ([#4167](https://github.com/cookiecutter/cookiecutter-django/pull/4167)) + ## 2023.02.09 ### Changed diff --git a/setup.py b/setup.py index 858d20691..c7566ba70 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.09" +version = "2023.02.17" with open("README.rst") as readme_file: long_description = readme_file.read() From 2d9dceb0fb24146416989b7b8497c054a9676cfc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:16:20 -0500 Subject: [PATCH 41/59] Update hiredis to 2.2.2 (#4156) * Update hiredis from 2.2.1 to 2.2.2 * Update hiredis from 2.2.1 to 2.2.2 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9bcdf31bf..bc9b553f9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -14,7 +14,7 @@ whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.5.1 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} -hiredis==2.2.1 # https://github.com/redis/hiredis-py +hiredis==2.2.2 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==5.2.7 # pyup: < 6.0 # https://github.com/celery/celery diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 06917d8dd..7cee00d5d 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ Collectfast==2.2.0 # https://github.com/antonagestam/collectfast sentry-sdk==1.15.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} -hiredis==2.2.1 # https://github.com/redis/hiredis-py +hiredis==2.2.2 # https://github.com/redis/hiredis-py {%- endif %} # Django From b46447c8db1068b2e9ea1a1538295af27dfe7036 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:16:56 -0500 Subject: [PATCH 42/59] Update sh to 2.0.2 (#4157) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 15c7c8c0a..2e165efa6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==2.1.1 -sh==1.14.3; sys_platform != "win32" +sh==2.0.2; sys_platform != "win32" binaryornot==0.4.4 # Code quality From 1767190a1ac1b9e9eb0ae61480859528f903428e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:17:46 -0500 Subject: [PATCH 43/59] Update django to 4.0.10 (#4159) --- {{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 bc9b553f9..d06bc8cb9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.20.0 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==4.0.9 # pyup: < 4.1 # https://www.djangoproject.com/ +django==4.0.10 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.52.0 # https://github.com/pennersr/django-allauth From ab149684b148d8e08be1f61a616db53e7c2cf454 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:18:16 -0500 Subject: [PATCH 44/59] Update coverage to 7.2.0 (#4177) --- {{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 00c15d3cb..80ced4b64 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.1.0 # https://github.com/nedbat/coveragepy +coverage==7.2.0 # https://github.com/nedbat/coveragepy black==23.1.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From aa6d0bc2ad3968bed47bd17c79932dbf48763b33 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:18:38 -0500 Subject: [PATCH 45/59] Update werkzeug to 2.2.3 (#4160) --- {{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 80ced4b64..6918fab8b 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.2 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.2.3 # https://github.com/pallets/werkzeug ipdb==0.13.11 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 From a756fbe4bb1b6188667ff3ea2740a6a0e9760596 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:19:07 -0500 Subject: [PATCH 46/59] Update gitpython to 3.1.31 (#4165) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2e165efa6..f07004c2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.57 -gitpython==3.1.30 +gitpython==3.1.31 jinja2==3.1.2 requests==2.28.2 From 4e649af5f0cc208655f75721d45d87ef03f5bb80 Mon Sep 17 00:00:00 2001 From: Delphine LEMIRE Date: Sat, 25 Feb 2023 12:31:07 +0100 Subject: [PATCH 47/59] Disable caching for linter job on GitHub actions (#4166) * FIX: Uptade Template ci.yml linter requirements * Disable unused cache for lint job --------- Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 5a149820a..89d83f257 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -30,7 +30,6 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.10" - cache: pip {%- if cookiecutter.open_source_license != 'Not open source' %} # Consider using pre-commit.ci for open source project From 2c84ec1c5573577a03590e9b8b2e25525f9704a0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:44:39 -0500 Subject: [PATCH 48/59] Update tox to 4.4.6 (#4173) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f07004c2a..f74ac007d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.0.4 # Testing # ------------------------------------------------------------------------------ -tox==4.4.5 +tox==4.4.6 pytest==7.2.1 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 8bd7667f19e335af7f59b68103c7b1c1bf357419 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:46:34 -0500 Subject: [PATCH 49/59] Update mypy to 1.0.1 (#4168) --- {{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 6918fab8b..86247343c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ -mypy==0.991 # https://github.com/python/mypy +mypy==1.0.1 # https://github.com/python/mypy django-stubs==1.14.0 # https://github.com/typeddjango/django-stubs pytest==7.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar From 64a66c332a4b642994335bc7127688142adafcf4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:47:29 -0500 Subject: [PATCH 50/59] Update pre-commit to 3.1.0 (#4176) * Update pre-commit from 3.0.4 to 3.1.0 * Update pre-commit from 3.0.4 to 3.1.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 f74ac007d..fda102826 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.1.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==3.0.4 +pre-commit==3.1.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 86247343c..e1927d06e 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==3.0.4 # https://github.com/pre-commit/pre-commit +pre-commit==3.1.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 7739f41f774616996b319465807d9c46a4d359f9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:47:48 -0500 Subject: [PATCH 51/59] Update python-slugify to 8.0.1 (#4178) --- {{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 d06bc8cb9..42188dd39 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2022.7.1 # https://github.com/stub42/pytz -python-slugify==8.0.0 # https://github.com/un33k/python-slugify +python-slugify==8.0.1 # https://github.com/un33k/python-slugify Pillow==9.4.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From bee85e445429bf4b301e4b77b65bb6cade3df270 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:48:00 -0500 Subject: [PATCH 52/59] Update django-cors-headers to 3.14.0 (#4181) --- {{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 42188dd39..75a97340b 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.14.0 # https://github.com/encode/django-rest-framework -django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==3.14.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation drf-spectacular==0.25.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 972b927a2c85cbc3353121fe8df644e35eafbb1e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:51:16 -0500 Subject: [PATCH 53/59] Update django-crispy-forms to 2.0 (#4158) --- {{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 75a97340b..7de2c4410 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -33,7 +33,7 @@ django==4.0.10 # pyup: < 4.1 # https://www.djangoproject.com/ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.52.0 # https://github.com/pennersr/django-allauth -django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms +django-crispy-forms==2.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} django-compressor==4.3.1 # https://github.com/django-compressor/django-compressor From c2059693d8788efd89f5cad909f2d7815e047547 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:53:08 -0500 Subject: [PATCH 54/59] Update django-stubs to 1.15.0 (#4183) --- {{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 e1927d06e..6335b52b9 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.0.1 # https://github.com/python/mypy -django-stubs==1.14.0 # https://github.com/typeddjango/django-stubs +django-stubs==1.15.0 # https://github.com/typeddjango/django-stubs pytest==7.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 961ec7df6bf07f6ae0346adfdb90899f4845ef41 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:53:35 -0500 Subject: [PATCH 55/59] Update whitenoise to 6.4.0 (#4180) --- {{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 7de2c4410..ac6f876f8 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -10,7 +10,7 @@ rcssmin==1.1.1 # https://github.com/ndparker/rcssmin {%- endif %} argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} -whitenoise==6.3.0 # https://github.com/evansd/whitenoise +whitenoise==6.4.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.5.1 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From 6433fc7b2b32b5c864c7b363eed9a73488bcace5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 06:53:59 -0500 Subject: [PATCH 56/59] Update pygithub to 1.58.0 (#4182) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fda102826..564e70596 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.57 +PyGithub==1.58.0 gitpython==3.1.31 jinja2==3.1.2 requests==2.28.2 From ad1edba7110dcaef8adbde440b5424cdfa878ae9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 25 Feb 2023 07:02:35 -0500 Subject: [PATCH 57/59] Update djangorestframework-stubs to 1.9.1 (#4184) --- {{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 6335b52b9..27fa30b36 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -18,7 +18,7 @@ django-stubs==1.15.0 # https://github.com/typeddjango/django-stubs pytest==7.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs==1.8.0 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs==1.9.1 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From b74af5b1d1005fa7ee1bbf27761a32e82b86a496 Mon Sep 17 00:00:00 2001 From: Hoai-Thu Vuong Date: Sat, 25 Feb 2023 19:09:52 +0700 Subject: [PATCH 58/59] Add instuction to run celery beat (#4162) * add instuction to run celery beat * Extend explanations for celery beat --------- Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md index 16ee6d1fe..83f9a7e48 100644 --- a/{{cookiecutter.project_slug}}/README.md +++ b/{{cookiecutter.project_slug}}/README.md @@ -63,6 +63,20 @@ celery -A config.celery_app worker -l info Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right. +To run [periodic tasks](https://docs.celeryq.dev/en/stable/userguide/periodic-tasks.html), you'll need to start the celery beat scheduler service. You can start it as a standalone process: + +``` bash +cd {{cookiecutter.project_slug}} +celery -A config.celery_app beat +``` + +or you can embed the beat service inside a worker with the `-B` option (not recommended for production use): + +``` bash +cd {{cookiecutter.project_slug}} +celery -A config.celery_app worker -B -l info +``` + {%- endif %} {%- if cookiecutter.use_mailhog == "y" %} From 52bdda5bc05a35f8b0c326b1f2a4fbd4f212f2bf Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 25 Feb 2023 12:10:26 +0000 Subject: [PATCH 59/59] 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 b97140005..30bc0107e 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1367,5 +1367,10 @@ "name": "Delphine LEMIRE", "github_login": "DelphineLemire", "twitter_username": "" + }, + { + "name": "Hoai-Thu Vuong", + "github_login": "thuvh", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0670ff448..8a541c945 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -915,6 +915,13 @@ Listed in alphabetical order. + + Hoai-Thu Vuong + + thuvh + + + Howie Zhao