From 76aa05b16707e7e13806d24e49d9c177389f4d8e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Feb 2022 09:32:43 -0500 Subject: [PATCH 001/336] Update django to 3.2.12 (#3559) --- {{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 9c2c9b042..f96a66d4a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.17.0.post1 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.2.11 # pyup: < 4.0 # https://www.djangoproject.com/ +django==3.2.12 # pyup: < 4.0 # https://www.djangoproject.com/ django-environ==0.8.1 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.47.0 # https://github.com/pennersr/django-allauth From 522aafe91b75051bdff0fd34adea7661d7878bc7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Feb 2022 09:33:35 -0500 Subject: [PATCH 002/336] Update drf-spectacular to 0.21.2 (#3560) --- {{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 f96a66d4a..e36ccbb60 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.11.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation -drf-spectacular==0.21.1 +drf-spectacular==0.21.2 {%- endif %} From 3512e63cf2e8fd97f82bc9201a05f6b28c0c4ccc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:33:52 +0000 Subject: [PATCH 003/336] Bump peter-evans/create-pull-request from 3.12.0 to 3.12.1 (#3558) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index e92816101..98e2f592e 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -31,7 +31,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.12.0 + uses: peter-evans/create-pull-request@v3.12.1 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From b32caf4e2a4eb4ab30a18cbd4c6b2eb8f63e9399 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Feb 2022 09:52:58 -0500 Subject: [PATCH 004/336] Update pillow to 9.0.1 (#3571) --- {{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 e36ccbb60..19dac6c65 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2021.3 # https://github.com/stub42/pytz python-slugify==5.0.2 # https://github.com/un33k/python-slugify -Pillow==9.0.0 # https://github.com/python-pillow/Pillow +Pillow==9.0.1 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.1.0 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From 2417910bace1d324bd5017364606e1f64f3b470d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Feb 2022 09:53:48 -0500 Subject: [PATCH 005/336] Update coverage to 6.3.1 (#3561) --- {{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 784d02349..4ed5f6095 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==4.0.1 # https://github.com/PyCQA/flake8 flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort -coverage==6.3 # https://github.com/nedbat/coveragepy +coverage==6.3.1 # https://github.com/nedbat/coveragepy black==21.12b0 # https://github.com/psf/black pylint-django==2.5.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 150e1d8bed62b2a5017366ae48c41ffe7ce7f304 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 7 Feb 2022 15:40:53 +0000 Subject: [PATCH 006/336] Update black to 22.1.0 (#3572) Co-authored-by: pyup-bot --- .pre-commit-config.yaml | 2 +- requirements.txt | 2 +- tests/test_cookiecutter_generation.py | 7 ++++++- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/config/settings/base.py | 5 ++++- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 63add8bf5..7c9e6eca7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: check-yaml - repo: https://github.com/psf/black - rev: 21.12b0 + rev: 22.1.0 hooks: - id: black diff --git a/requirements.txt b/requirements.txt index 763fe10e3..c878932cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==21.12b0 +black==22.1.0 isort==5.10.1 flake8==4.0.1 flake8-isort==4.1.1 diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 49a0d2cc8..ada1809f3 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -179,7 +179,12 @@ def test_black_passes(cookies, context_override): try: sh.black( - "--check", "--diff", "--exclude", "migrations", _cwd=str(result.project) + "--check", + "--diff", + "--exclude", + "migrations", + ".", + _cwd=str(result.project), ) except sh.ErrorReturnCode as e: pytest.fail(e.stdout.decode()) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 301f8b74f..5ea57c56c 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/psf/black - rev: 21.12b0 + rev: 22.1.0 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 1598373d3..bbaff2300 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -44,7 +44,10 @@ LOCALE_PATHS = [str(ROOT_DIR / "locale")] DATABASES = {"default": env.db("DATABASE_URL")} {%- else %} DATABASES = { - "default": env.db("DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}"), + "default": env.db( + "DATABASE_URL", + default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}", + ), } {%- endif %} DATABASES["default"]["ATOMIC_REQUESTS"] = True diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4ed5f6095..deb7e0bd1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==4.0.1 # https://github.com/PyCQA/flake8 flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort coverage==6.3.1 # https://github.com/nedbat/coveragepy -black==21.12b0 # https://github.com/psf/black +black==22.1.0 # https://github.com/psf/black pylint-django==2.5.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery From aafa66bf7cbea4e1d30e1fae993fa80b3299e899 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Feb 2022 12:19:52 -0500 Subject: [PATCH 007/336] Update pytest to 7.0.0 (#3567) Co-authored-by: Bruno Alla --- pytest.ini | 1 - requirements.txt | 2 +- tests/test_cookiecutter_generation.py | 30 +++++++++---------- .../requirements/local.txt | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/pytest.ini b/pytest.ini index 03ca13891..52506f47d 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,4 +1,3 @@ [pytest] addopts = -v --tb=short -python_paths = . norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/* diff --git a/requirements.txt b/requirements.txt index c878932cf..7dbf72254 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.17.0 # Testing # ------------------------------------------------------------------------------ tox==3.24.5 -pytest==6.2.5 +pytest==7.0.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 pyyaml==6.0 diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index ada1809f3..fc3ecf811 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -153,10 +153,10 @@ def test_project_generation(cookies, context, context_override): result = cookies.bake(extra_context={**context, **context_override}) assert result.exit_code == 0 assert result.exception is None - assert result.project.basename == context["project_slug"] - assert result.project.isdir() + assert result.project_path.name == context["project_slug"] + assert result.project_path.is_dir() - paths = build_files_list(str(result.project)) + paths = build_files_list(str(result.project_path)) assert paths check_paths(paths) @@ -167,7 +167,7 @@ def test_flake8_passes(cookies, context_override): result = cookies.bake(extra_context=context_override) try: - sh.flake8(_cwd=str(result.project)) + sh.flake8(_cwd=str(result.project_path)) except sh.ErrorReturnCode as e: pytest.fail(e.stdout.decode()) @@ -184,7 +184,7 @@ def test_black_passes(cookies, context_override): "--exclude", "migrations", ".", - _cwd=str(result.project), + _cwd=str(result.project_path), ) except sh.ErrorReturnCode as e: pytest.fail(e.stdout.decode()) @@ -203,10 +203,10 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip assert result.exit_code == 0 assert result.exception is None - assert result.project.basename == context["project_slug"] - assert result.project.isdir() + assert result.project_path.name == context["project_slug"] + assert result.project_path.is_dir() - with open(f"{result.project}/.travis.yml", "r") as travis_yml: + with open(f"{result.project_path}/.travis.yml", "r") as travis_yml: try: yml = yaml.safe_load(travis_yml)["jobs"]["include"] assert yml[0]["script"] == ["flake8"] @@ -230,10 +230,10 @@ def test_gitlab_invokes_flake8_and_pytest( assert result.exit_code == 0 assert result.exception is None - assert result.project.basename == context["project_slug"] - assert result.project.isdir() + assert result.project_path.name == context["project_slug"] + assert result.project_path.is_dir() - with open(f"{result.project}/.gitlab-ci.yml", "r") as gitlab_yml: + with open(f"{result.project_path}/.gitlab-ci.yml", "r") as gitlab_yml: try: gitlab_config = yaml.safe_load(gitlab_yml) assert gitlab_config["flake8"]["script"] == ["flake8"] @@ -257,10 +257,10 @@ def test_github_invokes_linter_and_pytest( assert result.exit_code == 0 assert result.exception is None - assert result.project.basename == context["project_slug"] - assert result.project.isdir() + assert result.project_path.name == context["project_slug"] + assert result.project_path.is_dir() - with open(f"{result.project}/.github/workflows/ci.yml", "r") as github_yml: + with open(f"{result.project_path}/.github/workflows/ci.yml", "r") as github_yml: try: github_config = yaml.safe_load(github_yml) linter_present = False @@ -311,6 +311,6 @@ def test_pycharm_docs_removed(cookies, context, use_pycharm, pycharm_docs_exist) context.update({"use_pycharm": use_pycharm}) result = cookies.bake(extra_context=context) - with open(f"{result.project}/docs/index.rst", "r") as f: + with open(f"{result.project_path}/docs/index.rst", "r") as f: has_pycharm_docs = "pycharm/configuration" in f.read() assert has_pycharm_docs is pycharm_docs_exist diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index deb7e0bd1..3c0d7264d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.7 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.931 # https://github.com/python/mypy django-stubs==1.9.0 # https://github.com/typeddjango/django-stubs -pytest==6.2.5 # https://github.com/pytest-dev/pytest +pytest==7.0.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.4.0 # https://github.com/typeddjango/djangorestframework-stubs From 9594f754ae536ece7fe6c0b3e7c38b9125ffe906 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Feb 2022 12:21:39 -0500 Subject: [PATCH 008/336] Update django-allauth to 0.48.0 (#3573) --- {{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 19dac6c65..2eb94b03f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.17.0.post1 # https://github.com/encode/uvicorn django==3.2.12 # pyup: < 4.0 # https://www.djangoproject.com/ django-environ==0.8.1 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils -django-allauth==0.47.0 # https://github.com/pennersr/django-allauth +django-allauth==0.48.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.6 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.use_compressor == "y" %} From e93374dda4935160ee57021a503956a534497633 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Feb 2022 12:45:33 -0500 Subject: [PATCH 009/336] Update uvicorn to 0.17.4 (#3574) --- {{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 2eb94b03f..30a90c207 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.0.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.17.0.post1 # https://github.com/encode/uvicorn +uvicorn[standard]==0.17.4 # https://github.com/encode/uvicorn {%- endif %} # Django From d8fdd3ddceb19958fa24849ad226fb8d056d3560 Mon Sep 17 00:00:00 2001 From: Jorge Valdez Date: Mon, 7 Feb 2022 12:23:55 -0600 Subject: [PATCH 010/336] Fix docker-compose config on Apple silicon (#3562) Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/local.yml | 2 ++ {{cookiecutter.project_slug}}/production.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 5090c5cef..78e390a81 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -11,6 +11,7 @@ services: dockerfile: ./compose/local/django/Dockerfile image: {{ cookiecutter.project_slug }}_local_django container_name: {{ cookiecutter.project_slug }}_local_django + platform: linux/x86_64 depends_on: - postgres {%- if cookiecutter.use_celery == 'y' %} @@ -43,6 +44,7 @@ services: docs: image: {{ cookiecutter.project_slug }}_local_docs container_name: {{ cookiecutter.project_slug }}_local_docs + platform: linux/x86_64 build: context: . dockerfile: ./compose/local/docs/Dockerfile diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index ea4292a0d..4c1d64c20 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -11,6 +11,7 @@ services: context: . dockerfile: ./compose/production/django/Dockerfile image: {{ cookiecutter.project_slug }}_production_django + platform: linux/x86_64 depends_on: - postgres - redis From dcc7e28dbcac22a495ad154577e85df34fd67457 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 7 Feb 2022 18:24:25 +0000 Subject: [PATCH 011/336] 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 fba6ad11b..a125078d6 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1227,5 +1227,10 @@ "name": "Abdullah Adeel", "github_login": "mabdullahadeel", "twitter_username": "abdadeel_" + }, + { + "name": "Jorge Valdez", + "github_login": "jorgeavaldez", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e2668ce0c..60b439989 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -971,6 +971,13 @@ Listed in alphabetical order. + + Jorge Valdez + + jorgeavaldez + + + Jules Cheron From 531efb479d44da54eef05fbac42cb6fc9419a5ae Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 8 Feb 2022 02:15:16 +0000 Subject: [PATCH 012/336] Release 2022.02.07 --- CHANGELOG.md | 16 ++++++++++++++++ setup.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2fb058b4..6c436621c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,22 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.02.07 + +### Changed +- Update black to 22.1.0 ([#3572](https://github.com/cookiecutter/cookiecutter-django/pull/3572)) +### Fixed +- Fix docker-compose config on Apple silicon ([#3562](https://github.com/cookiecutter/cookiecutter-django/pull/3562)) +### Updated +- Update uvicorn to 0.17.4 ([#3574](https://github.com/cookiecutter/cookiecutter-django/pull/3574)) +- Update django-allauth to 0.48.0 ([#3573](https://github.com/cookiecutter/cookiecutter-django/pull/3573)) +- Update pytest to 7.0.0 ([#3567](https://github.com/cookiecutter/cookiecutter-django/pull/3567)) +- Update coverage to 6.3.1 ([#3561](https://github.com/cookiecutter/cookiecutter-django/pull/3561)) +- Update pillow to 9.0.1 ([#3571](https://github.com/cookiecutter/cookiecutter-django/pull/3571)) +- Bump peter-evans/create-pull-request from 3.12.0 to 3.12.1 ([#3558](https://github.com/cookiecutter/cookiecutter-django/pull/3558)) +- Update drf-spectacular to 0.21.2 ([#3560](https://github.com/cookiecutter/cookiecutter-django/pull/3560)) +- Update django to 3.2.12 ([#3559](https://github.com/cookiecutter/cookiecutter-django/pull/3559)) + ## 2022.01.27 ### Updated diff --git a/setup.py b/setup.py index cd7e7e9d4..054dc4940 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.01.27" +version = "2022.02.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 925f7ff1a18dc4de1cf72d67369a5286b3768dce Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 8 Feb 2022 02:49:12 -0500 Subject: [PATCH 013/336] Update werkzeug from 2.0.2 to 2.0.3 (#3576) --- {{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 3c0d7264d..0183a1fcb 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r base.txt -Werkzeug[watchdog]==2.0.2 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.0.3 # https://github.com/pallets/werkzeug ipdb==0.13.9 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 From 3c173b2f88f1939fe328a7cd910104dd6b663152 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 8 Feb 2022 08:00:20 -0500 Subject: [PATCH 014/336] Update redis to 4.1.3 (#3577) --- {{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 30a90c207..d0f565c7f 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==5.3.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.1.2 # https://github.com/redis/redis-py +redis==4.1.3 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.0.0 # https://github.com/redis/hiredis-py {%- endif %} From 0616d464db4d6d5527b22506b73e2e6a6d768c6a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 8 Feb 2022 18:44:46 +0000 Subject: [PATCH 015/336] Fix Discord link Fix #3578 --- .github/ISSUE_TEMPLATE/question.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index e39803fa9..6f65315fa 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -7,5 +7,5 @@ labels: question First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help, we recommend one of these 3 main channels: - If your issue is related to Django + something else but was generated with cookiecutter-django, the best is to post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you would get more visibility from other communities as well. -- Join us on [Discord](https://discord.gg/bTfDa6Zz) and ask around. +- Join us on [Discord](https://discord.gg/9BrxzPKuEW) and ask around. - Start [a discussion](https://github.com/cookiecutter/cookiecutter-django/discussions) on our project's GitHub. From 90e4c0e51d95abd3a7d5909b66bcda15e504b377 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 8 Feb 2022 18:55:13 +0000 Subject: [PATCH 016/336] Update Discord invite link to not expire --- .github/ISSUE_TEMPLATE/question.md | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 6f65315fa..61f839cf6 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -7,5 +7,5 @@ labels: question First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help, we recommend one of these 3 main channels: - If your issue is related to Django + something else but was generated with cookiecutter-django, the best is to post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you would get more visibility from other communities as well. -- Join us on [Discord](https://discord.gg/9BrxzPKuEW) and ask around. +- Join us on [Discord](https://discord.gg/uFXweDQc5a) and ask around. - Start [a discussion](https://github.com/cookiecutter/cookiecutter-django/discussions) on our project's GitHub. diff --git a/README.md b/README.md index 3f5df1f01..fcffd75ca 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://img.shields.io/github/workflow/status/cookiecutter/cookiecutter-django/CI/master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI) [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest) [![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/9BrxzPKuEW) +[![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) @@ -189,7 +189,7 @@ For local development, see the following: - Have questions? **Before you ask questions anywhere else**, please post your question on [Stack Overflow](http://stackoverflow.com/questions/tagged/cookiecutter-django) under the *cookiecutter-django* tag. We check there periodically for questions. - If you think you found a bug or want to request a feature, please open an [issue](https://github.com/cookiecutter/cookiecutter-django/issues). -- For anything else, you can chat with us on [Discord](https://discord.gg/9BrxzPKuEW). +- For anything else, you can chat with us on [Discord](https://discord.gg/uFXweDQc5a). ## For Readers of Two Scoops of Django From c76b413d9164eba268a949221161e8ed4a1c4f29 Mon Sep 17 00:00:00 2001 From: Ryan Fitch <6692977+ryfi@users.noreply.github.com> Date: Tue, 8 Feb 2022 11:36:36 -0800 Subject: [PATCH 017/336] Fixed some typos in drf-spectacular description and comments (#3579) --- {{cookiecutter.project_slug}}/config/settings/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index bbaff2300..816ae7c2a 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -338,11 +338,11 @@ REST_FRAMEWORK = { # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup CORS_URLS_REGEX = r"^/api/.*$" -# By Default swagger ui is available only to admin user. You can change permission classs to change that +# By Default swagger ui is available only to admin user(s). You can change permission classes to change that # See more configuration options at https://drf-spectacular.readthedocs.io/en/latest/settings.html#settings SPECTACULAR_SETTINGS = { "TITLE": "{{ cookiecutter.project_name }} API", - "DESCRIPTION": "Documentation of API endpoiints of {{ cookiecutter.project_name }}", + "DESCRIPTION": "Documentation of API endpoints of {{ cookiecutter.project_name }}", "VERSION": "1.0.0", "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"], "SERVERS": [ From 3f39f384d36aae8552f7736f6d774b0fc637404b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 8 Feb 2022 19:37:05 +0000 Subject: [PATCH 018/336] 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 a125078d6..5bd4ca459 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1232,5 +1232,10 @@ "name": "Jorge Valdez", "github_login": "jorgeavaldez", "twitter_username": "" + }, + { + "name": "Ryan Fitch", + "github_login": "ryfi", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 60b439989..9bc476a5d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1468,6 +1468,13 @@ Listed in alphabetical order. + + Ryan Fitch + + ryfi + + + Sam Collins From e34096e7ac772e11fb2d1b84ab95a5c2e9cff671 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Feb 2022 02:17:43 +0000 Subject: [PATCH 019/336] Release 2022.02.08 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c436621c..8397d4c51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.02.08 + +### Fixed +- Fixed some typos in drf-spectacular description and comments ([#3579](https://github.com/cookiecutter/cookiecutter-django/pull/3579)) +### Updated +- Update redis to 4.1.3 ([#3577](https://github.com/cookiecutter/cookiecutter-django/pull/3577)) +- Update werkzeug to 2.0.3 ([#3576](https://github.com/cookiecutter/cookiecutter-django/pull/3576)) + ## 2022.02.07 ### Changed diff --git a/setup.py b/setup.py index 054dc4940..f1882dda1 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.07" +version = "2022.02.08" with open("README.rst") as readme_file: long_description = readme_file.read() From 2279841de7d7c435145d270560ec27aa921e97c8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 10 Feb 2022 03:57:18 -0500 Subject: [PATCH 020/336] Update whitenoise to 6.0.0 (#3583) --- {{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 d0f565c7f..3dfa92c36 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -10,7 +10,7 @@ rcssmin==1.1.0 # https://github.com/ndparker/rcssmin {%- endif %} argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} -whitenoise==5.3.0 # https://github.com/evansd/whitenoise +whitenoise==6.0.0 # https://github.com/evansd/whitenoise {%- endif %} redis==4.1.3 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} From 0ea13d42886bb38415b4bfb8c21c6236171cd516 Mon Sep 17 00:00:00 2001 From: Jelmer Date: Thu, 10 Feb 2022 16:06:22 +0100 Subject: [PATCH 021/336] Fix GitLab CI error caused by Docker Compose's `platform` option (#3585) --- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 711bfc392..fb82ec5d5 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -22,7 +22,7 @@ flake8: pytest: stage: test {% if cookiecutter.use_docker == 'y' -%} - image: docker/compose:latest + image: docker/compose:1.29.2 tags: - docker services: From fb5021e124adb8e8e777aef7d89631242f6327e9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 11 Feb 2022 02:16:15 +0000 Subject: [PATCH 022/336] Release 2022.02.10 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8397d4c51..0f60cd9bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.02.10 + +### Fixed +- Fix GitLab CI error caused by Docker Compose's `platform` option ([#3585](https://github.com/cookiecutter/cookiecutter-django/pull/3585)) +### Updated +- Update whitenoise to 6.0.0 ([#3583](https://github.com/cookiecutter/cookiecutter-django/pull/3583)) + ## 2022.02.08 ### Fixed diff --git a/setup.py b/setup.py index f1882dda1..a9f4982d3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.08" +version = "2022.02.10" with open("README.rst") as readme_file: long_description = readme_file.read() From a22076f72d0017d7d5144a88bac58d8d54b91287 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 11 Feb 2022 12:19:37 -0500 Subject: [PATCH 023/336] Update sentry-sdk to 1.5.5 (#3586) --- {{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 faefd1245..e9c61850a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.5.4 # https://github.com/getsentry/sentry-python +sentry-sdk==1.5.5 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.0.0 # https://github.com/redis/hiredis-py From 53119d91eb5b78a641c5c0c2fb91b0458d854cfa Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Feb 2022 02:19:08 +0000 Subject: [PATCH 024/336] Release 2022.02.11 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f60cd9bf..954bfe184 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.02.11 + +### Updated +- Update sentry-sdk to 1.5.5 ([#3586](https://github.com/cookiecutter/cookiecutter-django/pull/3586)) + ## 2022.02.10 ### Fixed diff --git a/setup.py b/setup.py index a9f4982d3..e75aaea77 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.10" +version = "2022.02.11" with open("README.rst") as readme_file: long_description = readme_file.read() From 83c05858fd410f4d5688b6e4460a6edd9f1efa9d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 12 Feb 2022 06:56:45 -0500 Subject: [PATCH 025/336] Update pytest to 7.0.1 (#3588) * Update pytest from 7.0.0 to 7.0.1 * Update pytest from 7.0.0 to 7.0.1 --- 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 7dbf72254..baebe15dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.17.0 # Testing # ------------------------------------------------------------------------------ tox==3.24.5 -pytest==7.0.0 +pytest==7.0.1 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 0183a1fcb..09eedbdc1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.7 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.931 # https://github.com/python/mypy django-stubs==1.9.0 # https://github.com/typeddjango/django-stubs -pytest==7.0.0 # https://github.com/pytest-dev/pytest +pytest==7.0.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.4.0 # https://github.com/typeddjango/djangorestframework-stubs From 1d46454ee016c5b987abf68e3a3cb749a0083bac Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 13 Feb 2022 02:16:55 +0000 Subject: [PATCH 026/336] Release 2022.02.12 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 954bfe184..06e2ce176 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.02.12 + +### Updated +- Update pytest to 7.0.1 ([#3588](https://github.com/cookiecutter/cookiecutter-django/pull/3588)) + ## 2022.02.11 ### Updated diff --git a/setup.py b/setup.py index e75aaea77..b70752941 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.11" +version = "2022.02.12" with open("README.rst") as readme_file: long_description = readme_file.read() From 85ee3c921a18c40e655dbdf15c2792e6740e5f50 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Sun, 13 Feb 2022 07:49:05 -0500 Subject: [PATCH 027/336] Change docs port to 9000 from 7000 (#3590) Signed-off-by: Andrew-Chen-Wang --- docs/document.rst | 4 ++-- {{cookiecutter.project_slug}}/docs/Makefile | 8 ++++---- {{cookiecutter.project_slug}}/docs/make.bat | 2 +- {{cookiecutter.project_slug}}/local.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/document.rst b/docs/document.rst index a30979094..974c66c69 100644 --- a/docs/document.rst +++ b/docs/document.rst @@ -13,7 +13,7 @@ If you set up your project to `develop locally with docker`_, run the following $ docker-compose -f local.yml up docs -Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. +Navigate to port 9000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. Note: using Docker for documentation sets up a temporary SQLite file by setting the environment variable ``DATABASE_URL=sqlite:///readthedocs.db`` in ``docs/conf.py`` to avoid a dependency on PostgreSQL. @@ -36,7 +36,7 @@ To setup your documentation on `ReadTheDocs`_, you must Additionally, you can auto-build Pull Request previews, but `you must enable it`_. -.. _localhost: http://localhost:7000/ +.. _localhost: http://localhost:9000/ .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html .. _develop locally: ./developing-locally.html .. _develop locally with docker: ./developing-locally-docker.html diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile index 0c4f9f574..cf080e476 100644 --- a/{{cookiecutter.project_slug}}/docs/Makefile +++ b/{{cookiecutter.project_slug}}/docs/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line, and also # from the environment for the first two. -SPHINXOPTS ?= +SPHINXOPTS ?= SPHINXBUILD ?= sphinx-build SOURCEDIR = . BUILDDIR = ./_build @@ -21,10 +21,10 @@ help: # Build, watch and serve docs with live reload livehtml: - sphinx-autobuild -b html + sphinx-autobuild -b html {%- if cookiecutter.use_docker == 'y' %} --host 0.0.0.0 - {%- else %} --open-browser - {%- endif %} --port 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html + {%- else %} --open-browser + {%- endif %} --port 9000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html # Outputs rst files from django application code apidocs: diff --git a/{{cookiecutter.project_slug}}/docs/make.bat b/{{cookiecutter.project_slug}}/docs/make.bat index b19f42c6a..6cd1129f0 100644 --- a/{{cookiecutter.project_slug}}/docs/make.bat +++ b/{{cookiecutter.project_slug}}/docs/make.bat @@ -32,7 +32,7 @@ if errorlevel 9009 ( goto end :livehtml -sphinx-autobuild -b html --open-browser -p 7000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html +sphinx-autobuild -b html --open-browser -p 9000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html GOTO :EOF :apidocs diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 78e390a81..590445820 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -55,7 +55,7 @@ services: - ./config:/app/config:z - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z ports: - - "7000:7000" + - "9000:9000" command: /start-docs {%- if cookiecutter.use_mailhog == 'y' %} From 61be357ded79a050abf22a966175869242e9a532 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 14 Feb 2022 02:12:49 +0000 Subject: [PATCH 028/336] Release 2022.02.13 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e2ce176..29b66f2a5 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.02.13 + +### Changed +- Change docs port from 7000 to 9000 ([#3590](https://github.com/cookiecutter/cookiecutter-django/pull/3590)) + ## 2022.02.12 ### Updated diff --git a/setup.py b/setup.py index b70752941..e8faeabc6 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.12" +version = "2022.02.13" with open("README.rst") as readme_file: long_description = readme_file.read() From ca5411af9ab6dc171e779c32bce5392cbee952da Mon Sep 17 00:00:00 2001 From: ghazi-git Date: Tue, 15 Feb 2022 15:52:20 +0100 Subject: [PATCH 029/336] fix typo in servers settings for drf-spectacular update the local dev server url to use http instead of https --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 816ae7c2a..ef3dfb9c0 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -346,7 +346,7 @@ SPECTACULAR_SETTINGS = { "VERSION": "1.0.0", "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"], "SERVERS": [ - {"url": "https://127.0.0.1:8000", "description": "Local Development server"}, + {"url": "http://127.0.0.1:8000", "description": "Local Development server"}, {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"}, ], } From abbbfea550d3c9f7261ec695541b2212be8be881 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Tue, 15 Feb 2022 16:35:19 +0000 Subject: [PATCH 030/336] 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 5bd4ca459..393a9a4cc 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1237,5 +1237,10 @@ "name": "Ryan Fitch", "github_login": "ryfi", "twitter_username": "" + }, + { + "name": "ghazi-git", + "github_login": "ghazi-git", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 9bc476a5d..4cd8f513a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -768,6 +768,13 @@ Listed in alphabetical order. + + ghazi-git + + ghazi-git + + + Gilbishkosma From 30c2d9102025489ce5f9c7b38a3e49da1686bbbc Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Feb 2022 02:18:17 +0000 Subject: [PATCH 031/336] Release 2022.02.15 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29b66f2a5..68445b2f7 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.02.15 + +### Changed +- Update the drf-spectacular local dev server url to use http instead of https ([#3591](https://github.com/cookiecutter/cookiecutter-django/pull/3591)) + ## 2022.02.13 ### Changed diff --git a/setup.py b/setup.py index e8faeabc6..b4ff4a52b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.13" +version = "2022.02.15" with open("README.rst") as readme_file: long_description = readme_file.read() From c22f2c7e9ee9ce861175fbb433c07760d94cb5cf Mon Sep 17 00:00:00 2001 From: ghazi-git Date: Wed, 16 Feb 2022 13:25:32 +0100 Subject: [PATCH 032/336] Fix Swagger schema API endpoint & add a test for it (#3592) Co-authored-by: Bruno Alla --- hooks/post_gen_project.py | 2 +- {{cookiecutter.project_slug}}/config/settings/base.py | 1 + .../users/tests/{test_swagger_ui.py => test_swagger.py} | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) rename {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/{test_swagger_ui.py => test_swagger.py} (70%) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index b2dbb3421..d784ba62b 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -329,7 +329,7 @@ def remove_drf_starter_files(): ) os.remove( os.path.join( - "{{cookiecutter.project_slug}}", "users", "tests", "test_swagger_ui.py" + "{{cookiecutter.project_slug}}", "users", "tests", "test_swagger.py" ) ) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index ef3dfb9c0..7165aa9da 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -333,6 +333,7 @@ REST_FRAMEWORK = { "rest_framework.authentication.TokenAuthentication", ), "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",), + "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema", } # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py similarity index 70% rename from {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py rename to {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py index b0c24d91b..7f5b75844 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py @@ -14,3 +14,9 @@ def test_swagger_ui_not_accessible_by_normal_user(client): url = reverse("api-docs") response = client.get(url) assert response.status_code == 403 + + +def test_api_schema_generated_successfully(admin_client): + url = reverse("api-schema") + response = admin_client.get(url) + assert response.status_code == 200 From d2f129e3447e4870f9bb84096981db7f89c8cd8a Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 17 Feb 2022 02:11:46 +0000 Subject: [PATCH 033/336] Release 2022.02.16 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68445b2f7..c5bfcc473 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.02.16 + +### Fixed +- Fix Swagger schema API endpoint & add a test for it ([#3592](https://github.com/cookiecutter/cookiecutter-django/pull/3592)) + ## 2022.02.15 ### Changed diff --git a/setup.py b/setup.py index b4ff4a52b..4be18dbfb 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.15" +version = "2022.02.16" with open("README.rst") as readme_file: long_description = readme_file.read() From 61f16e52243154d72463abea85d41c2eafadd273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cebrail=20Y=C4=B1lmaz?= Date: Sun, 20 Feb 2022 16:21:06 +0300 Subject: [PATCH 034/336] Fix incorrect createdb instruction in documentation (#3606) Co-authored-by: Bruno Alla --- docs/developing-locally.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index a9a54a03b..3b86ff44e 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -42,7 +42,8 @@ First things first. #. Create a new PostgreSQL database using createdb_: :: - $ createdb -U postgres --password + $ createdb --username=postgres + ``project_slug`` is what you have entered as the project_slug at the setup stage. .. note:: From ef72165b850036a4ed6cf3dcea502df52c60bd9e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 20 Feb 2022 13:21:34 +0000 Subject: [PATCH 035/336] 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 393a9a4cc..cbe2444ef 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1242,5 +1242,10 @@ "name": "ghazi-git", "github_login": "ghazi-git", "twitter_username": "" + }, + { + "name": "Cebrail Yılmaz", + "github_login": "b1sar", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4cd8f513a..ca7d812dc 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -404,6 +404,13 @@ Listed in alphabetical order. + + Cebrail Yılmaz + + b1sar + + + Chao Yang Wu From 31294655db97d7ea715e9af38fcdabbc0eab0220 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 21 Feb 2022 02:14:51 +0000 Subject: [PATCH 036/336] Release 2022.02.20 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5bfcc473..ec3e1fbe2 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.02.20 + +### Changed +- Fix incorrect createdb instruction in documentation ([#3606](https://github.com/cookiecutter/cookiecutter-django/pull/3606)) + ## 2022.02.16 ### Fixed diff --git a/setup.py b/setup.py index 4be18dbfb..0baccf4fb 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.16" +version = "2022.02.20" with open("README.rst") as readme_file: long_description = readme_file.read() From 4b5e7a19a68c8ecd48d2dc6ce99c1b7f254a694a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Feb 2022 16:36:54 -0500 Subject: [PATCH 037/336] Update redis from 4.1.3 to 4.1.4 (#3595) --- {{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 3dfa92c36..016034f68 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.0.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.1.3 # https://github.com/redis/redis-py +redis==4.1.4 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.0.0 # https://github.com/redis/hiredis-py {%- endif %} From 50662e01c8efa9359ec530a81321a0ef02cca44e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Feb 2022 16:37:07 -0500 Subject: [PATCH 038/336] Update uvicorn from 0.17.4 to 0.17.5 (#3596) --- {{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 016034f68..236df35cf 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.0.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.17.4 # https://github.com/encode/uvicorn +uvicorn[standard]==0.17.5 # https://github.com/encode/uvicorn {%- endif %} # Django From b9d8ce613246fec801aa241dcb12a1da309128d0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Feb 2022 16:40:46 -0500 Subject: [PATCH 039/336] Update python-slugify from 5.0.2 to 6.0.1 (#3599) --- {{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 236df35cf..2b2f71127 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2021.3 # https://github.com/stub42/pytz -python-slugify==5.0.2 # https://github.com/un33k/python-slugify +python-slugify==6.0.1 # https://github.com/un33k/python-slugify Pillow==9.0.1 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From 19d486f0c5b66c481bb7f34560cb0c3fa588f7fc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Feb 2022 16:41:05 -0500 Subject: [PATCH 040/336] Update pylint-django from 2.5.0 to 2.5.2 (#3602) --- {{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 09eedbdc1..6634242e0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -32,7 +32,7 @@ flake8==4.0.1 # https://github.com/PyCQA/flake8 flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort coverage==6.3.1 # https://github.com/nedbat/coveragepy black==22.1.0 # https://github.com/psf/black -pylint-django==2.5.0 # https://github.com/PyCQA/pylint-django +pylint-django==2.5.2 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} From cc0b17740dcdb698bbe1a4a6ff8b547058652abd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Feb 2022 16:41:52 -0500 Subject: [PATCH 041/336] Update gitpython from 3.1.26 to 3.1.27 (#3607) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index baebe15dd..1e98d0f2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.55 -gitpython==3.1.26 +gitpython==3.1.27 jinja2==3.0.3 requests==2.27.1 From 28bc48d0f2f864d948c9a398198d088203e42db9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Feb 2022 16:42:24 -0500 Subject: [PATCH 042/336] Update coverage from 6.3.1 to 6.3.2 (#3610) --- {{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 6634242e0..781c67443 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==4.0.1 # https://github.com/PyCQA/flake8 flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort -coverage==6.3.1 # https://github.com/nedbat/coveragepy +coverage==6.3.2 # https://github.com/nedbat/coveragepy black==22.1.0 # https://github.com/psf/black pylint-django==2.5.2 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 7e444e6aa4eaf9ee26f0e421255a4f471898bcdf Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 21 Feb 2022 22:50:19 +0000 Subject: [PATCH 043/336] Cancel previous CI runs on successive PR pushes with GitHub actions (#3575) --- .github/workflows/ci.yml | 6 +++++- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0180184fa..c8843b9fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,10 @@ on: push: pull_request: +concurrency: + group: ${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: lint: runs-on: ubuntu-latest @@ -75,8 +79,8 @@ jobs: - name: With Gulp args: "js_task_runner=Gulp custom_bootstrap_compilation=y" - runs-on: ubuntu-latest name: "${{ matrix.script.name }} Bare metal" + runs-on: ubuntu-latest services: redis: image: redis:5.0 diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index c24f4cb94..6381a05d4 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -14,6 +14,9 @@ on: branches: [ "master", "main" ] paths-ignore: [ "docs/**" ] +concurrency: + group: {% raw %}${{ github.head_ref || github.run_id }}{% endraw %} + cancel-in-progress: true jobs: linter: From cfff2746cc31f9737a4d798bda72fc24f85e2596 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Feb 2022 02:15:15 +0000 Subject: [PATCH 044/336] Release 2022.02.21 --- CHANGELOG.md | 12 ++++++++++++ setup.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec3e1fbe2..2f1e14ea6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,18 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.02.21 + +### Changed +- Cancel previous CI runs on successive PR pushes with GitHub actions ([#3575](https://github.com/cookiecutter/cookiecutter-django/pull/3575)) +### Updated +- Update coverage to 6.3.2 ([#3610](https://github.com/cookiecutter/cookiecutter-django/pull/3610)) +- Update gitpython to 3.1.27 ([#3607](https://github.com/cookiecutter/cookiecutter-django/pull/3607)) +- Update pylint-django to 2.5.2 ([#3602](https://github.com/cookiecutter/cookiecutter-django/pull/3602)) +- Update python-slugify to 6.0.1 ([#3599](https://github.com/cookiecutter/cookiecutter-django/pull/3599)) +- Update uvicorn to 0.17.5 ([#3596](https://github.com/cookiecutter/cookiecutter-django/pull/3596)) +- Update redis to 4.1.4 ([#3595](https://github.com/cookiecutter/cookiecutter-django/pull/3595)) + ## 2022.02.20 ### Changed diff --git a/setup.py b/setup.py index 0baccf4fb..cab4fc873 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.20" +version = "2022.02.21" with open("README.rst") as readme_file: long_description = readme_file.read() From 36ef16849edbd6694356c41df42ef37d78948544 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 24 Feb 2022 14:06:15 -0500 Subject: [PATCH 045/336] Update python-slugify to 6.1.0 (#3612) --- {{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 2b2f71127..9b4fd89c6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2021.3 # https://github.com/stub42/pytz -python-slugify==6.0.1 # https://github.com/un33k/python-slugify +python-slugify==6.1.0 # https://github.com/un33k/python-slugify Pillow==9.0.1 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From 294b7b95bd6598b7fd94458653ba9f4777228835 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 24 Feb 2022 14:13:06 -0500 Subject: [PATCH 046/336] Update sentry-sdk to 1.5.6 (#3611) --- {{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 e9c61850a..d7852f99d 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.5.5 # https://github.com/getsentry/sentry-python +sentry-sdk==1.5.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 fe938d4d5437649252e5f36781a65cdc70586686 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 24 Feb 2022 16:13:46 -0500 Subject: [PATCH 047/336] Update django-allauth to 0.49.0 (#3613) --- {{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 9b4fd89c6..da5f58510 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.17.5 # https://github.com/encode/uvicorn django==3.2.12 # pyup: < 4.0 # https://www.djangoproject.com/ django-environ==0.8.1 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils -django-allauth==0.48.0 # https://github.com/pennersr/django-allauth +django-allauth==0.49.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.6 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.use_compressor == "y" %} From af7522dfc5921a8a97493bf8603d028345a0f25c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 25 Feb 2022 02:18:52 +0000 Subject: [PATCH 048/336] Release 2022.02.24 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f1e14ea6..e87e97acc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.02.24 + +### Updated +- Update django-allauth to 0.49.0 ([#3613](https://github.com/cookiecutter/cookiecutter-django/pull/3613)) +- Update sentry-sdk to 1.5.6 ([#3611](https://github.com/cookiecutter/cookiecutter-django/pull/3611)) +- Update python-slugify to 6.1.0 ([#3612](https://github.com/cookiecutter/cookiecutter-django/pull/3612)) + ## 2022.02.21 ### Changed diff --git a/setup.py b/setup.py index cab4fc873..e4b5e8f74 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.21" +version = "2022.02.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 5646c81ea161c563b35ba06ab32f842c4f8aa7bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Feb 2022 20:32:43 +0000 Subject: [PATCH 049/336] Bump actions/setup-node from 2 to 3 (#3614) * Bump actions/setup-node from 2 to 3.0.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3.0.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2...v3.0.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Use major version Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bruno Alla --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8843b9fa..3ce540e1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,7 @@ jobs: {{cookiecutter.project_slug}}/requirements/local.txt - name: Install dependencies run: pip install -r requirements.txt - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: "16" - name: Bare Metal ${{ matrix.script.name }} From da5ce00503fee13c84d6d5c3831eb4c22de4a073 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 26 Feb 2022 02:16:42 +0000 Subject: [PATCH 050/336] Release 2022.02.25 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e87e97acc..32d202c15 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.02.25 + +### Updated +- Bump actions/setup-node from 2 to 3 ([#3614](https://github.com/cookiecutter/cookiecutter-django/pull/3614)) + ## 2022.02.24 ### Updated diff --git a/setup.py b/setup.py index e4b5e8f74..cda752f4a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.24" +version = "2022.02.25" with open("README.rst") as readme_file: long_description = readme_file.read() From 92e88bca2a875f99c517d5e7b33e724a62aec7c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 18:45:23 +0000 Subject: [PATCH 051/336] Bump peter-evans/create-pull-request from 3.12.1 to 3.13.0 (#3616) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 98e2f592e..577641e52 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -31,7 +31,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.12.1 + uses: peter-evans/create-pull-request@v3.13.0 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 1ffd194386c79cb900b160a4877cee08a5300ba8 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 28 Feb 2022 13:57:51 -0500 Subject: [PATCH 052/336] Update python-slugify to 6.1.1 (#3615) --- {{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 da5f58510..0c8708492 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2021.3 # https://github.com/stub42/pytz -python-slugify==6.1.0 # https://github.com/un33k/python-slugify +python-slugify==6.1.1 # https://github.com/un33k/python-slugify Pillow==9.0.1 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From 6014cb35dc7638fb6e05aff141d17946b3357078 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 1 Mar 2022 02:31:40 +0000 Subject: [PATCH 053/336] Release 2022.02.28 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32d202c15..6db9114af 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.02.28 + +### Updated +- Update python-slugify to 6.1.1 ([#3615](https://github.com/cookiecutter/cookiecutter-django/pull/3615)) +- Bump peter-evans/create-pull-request from 3.12.1 to 3.13.0 ([#3616](https://github.com/cookiecutter/cookiecutter-django/pull/3616)) + ## 2022.02.25 ### Updated diff --git a/setup.py b/setup.py index cda752f4a..d7fb0f0f1 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.25" +version = "2022.02.28" with open("README.rst") as readme_file: long_description = readme_file.read() From 8fa66e8593d008663c5b6dda5b279db36482234b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 08:20:39 +0000 Subject: [PATCH 054/336] Bump peter-evans/create-pull-request from 3.13.0 to 3.14.0 (#3618) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.13.0...v3.14.0) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 577641e52..9fc03f0f7 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -31,7 +31,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.13.0 + uses: peter-evans/create-pull-request@v3.14.0 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 318c0182766cfe04afb036afdf2bcc0b7d0a40cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 15:25:18 +0000 Subject: [PATCH 055/336] Bump actions/setup-python from 2 to 3 (#3617) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/django-issue-checker.yml | 2 +- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ce540e1d..b7e37c51e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: python-version: "3.9" cache: pip @@ -33,7 +33,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: python-version: "3.9" cache: pip @@ -60,7 +60,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: python-version: "3.9" cache: pip @@ -100,7 +100,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: python-version: "3.9" cache: pip diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml index 1118e1b23..e8e076e60 100644 --- a/.github/workflows/django-issue-checker.yml +++ b/.github/workflows/django-issue-checker.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: python-version: "3.9" - name: Install dependencies diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 9fc03f0f7..53f2ebb75 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 with: python-version: "3.9" diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 00065c05b..810673e1b 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: "3.9" - name: Install dependencies diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 335159444..21c6b78bd 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: "3.9" - name: Install dependencies From dbd8881c4191b5797172c47a5539c8017b7f4172 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 2 Mar 2022 02:36:54 +0000 Subject: [PATCH 056/336] Release 2022.03.01 --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6db9114af..a4cb6c952 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.03.01 + +### Updated +- Bump actions/setup-python from 2 to 3 ([#3617](https://github.com/cookiecutter/cookiecutter-django/pull/3617)) +- Bump peter-evans/create-pull-request from 3.13.0 to 3.14.0 ([#3618](https://github.com/cookiecutter/cookiecutter-django/pull/3618)) + ## 2022.02.28 ### Updated diff --git a/setup.py b/setup.py index d7fb0f0f1..5e63698ff 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.02.28" +version = "2022.03.01" with open("README.rst") as readme_file: long_description = readme_file.read() From 3eaeb837603009b163e4b556d4724c49d9ce8173 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 09:17:47 +0000 Subject: [PATCH 057/336] Bump actions/checkout from 2 to 3 (#3619) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bruno Alla --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/django-issue-checker.yml | 2 +- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7e37c51e..5c502b130 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 with: python-version: "3.9" @@ -32,7 +32,7 @@ jobs: name: "Run tests" runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 with: python-version: "3.9" @@ -59,7 +59,7 @@ jobs: COMPOSE_DOCKER_CLI_BUILD: 1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 with: python-version: "3.9" @@ -99,7 +99,7 @@ jobs: DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 with: python-version: "3.9" diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml index e8e076e60..5ea023fdd 100644 --- a/.github/workflows/django-issue-checker.yml +++ b/.github/workflows/django-issue-checker.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 with: python-version: "3.9" diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 53f2ebb75..b5c91ca5c 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 with: python-version: "3.9" diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 810673e1b..2b73498dc 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v3 diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 21c6b78bd..0cc62cfb0 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v3 diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 6381a05d4..e97c15b6e 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout Code Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v2 @@ -68,7 +68,7 @@ jobs: steps: - name: Checkout Code Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 {%- if cookiecutter.use_docker == 'y' %} - name: Build the Stack From e33892ce1ef3a2343fc9c316c43327a60a9497cd Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 3 Mar 2022 02:29:51 +0000 Subject: [PATCH 058/336] Release 2022.03.02 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4cb6c952..4b261941b 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.03.02 + +### Updated +- Bump actions/checkout from 2 to 3 ([#3619](https://github.com/cookiecutter/cookiecutter-django/pull/3619)) + ## 2022.03.01 ### Updated diff --git a/setup.py b/setup.py index 5e63698ff..760d24cb7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.03.01" +version = "2022.03.02" with open("README.rst") as readme_file: long_description = readme_file.read() From a1105457aaf138ddd0d8970c365b527179b72e8d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 3 Mar 2022 22:21:04 +0000 Subject: [PATCH 059/336] Upgrade actions/setup-python to v3 (#3621) --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index e97c15b6e..20dd0d2f3 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@v2 + uses: actions/setup-python@v3 with: python-version: "3.9" cache: pip @@ -85,7 +85,7 @@ jobs: {%- else %} - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: "3.9" cache: pip From 3b09cdadbf74fff5cbc92d9bc1be8370d8607b68 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 4 Mar 2022 02:26:46 +0000 Subject: [PATCH 060/336] Release 2022.03.03 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b261941b..8a07a72ab 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.03.03 + +### Updated +- Upgrade actions/setup-python to v3 ([#3621](https://github.com/cookiecutter/cookiecutter-django/pull/3621)) + ## 2022.03.02 ### Updated diff --git a/setup.py b/setup.py index 760d24cb7..9d796de4f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.03.02" +version = "2022.03.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 9819d59e19273349a8d7271573bc0896dcf5186d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 8 Mar 2022 05:18:37 -0800 Subject: [PATCH 061/336] Update sentry-sdk from 1.5.6 to 1.5.7 --- {{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 d7852f99d..07a571460 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.5.6 # https://github.com/getsentry/sentry-python +sentry-sdk==1.5.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 26394ae6c89ebae9879d4df32535b1e2315f874e Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 9 Mar 2022 02:24:23 +0000 Subject: [PATCH 062/336] Release 2022.03.08 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a07a72ab..3e88be236 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.03.08 + +### Updated +- Update sentry-sdk to 1.5.7 ([#3624](https://github.com/cookiecutter/cookiecutter-django/pull/3624)) + ## 2022.03.03 ### Updated diff --git a/setup.py b/setup.py index 9d796de4f..1b023704c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.03.03" +version = "2022.03.08" with open("README.rst") as readme_file: long_description = readme_file.read() From bfb7e0b2a4391d81096652eb40585a17df56cf48 Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Wed, 9 Mar 2022 17:25:00 +0100 Subject: [PATCH 063/336] Fix a few typos in the documentation (#3625) --- {{cookiecutter.project_slug}}/README.md | 2 +- {{cookiecutter.project_slug}}/docs/howto.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md index 227e24c00..969520961 100644 --- a/{{cookiecutter.project_slug}}/README.md +++ b/{{cookiecutter.project_slug}}/README.md @@ -20,7 +20,7 @@ Moved to [settings](http://cookiecutter-django.readthedocs.io/en/latest/settings - To create a **normal user account**, just go to Sign Up and fill out the form. Once you submit it, you'll see a "Verify Your E-mail Address" page. Go to your console to see a simulated email verification message. Copy the link into your browser. Now the user's email should be verified and ready to go. -- To create an **superuser account**, use this command: +- To create a **superuser account**, use this command: $ python manage.py createsuperuser diff --git a/{{cookiecutter.project_slug}}/docs/howto.rst b/{{cookiecutter.project_slug}}/docs/howto.rst index 0ef90d023..7f2d26a1e 100644 --- a/{{cookiecutter.project_slug}}/docs/howto.rst +++ b/{{cookiecutter.project_slug}}/docs/howto.rst @@ -28,7 +28,7 @@ Docstrings to Documentation The sphinx extension `apidoc `_ is used to automatically document code using signatures and docstrings. -Numpy or Google style docstrings will be picked up from project files and availble for documentation. See the `Napoleon `_ extension for details. +Numpy or Google style docstrings will be picked up from project files and available for documentation. See the `Napoleon `_ extension for details. For an in-use example, see the `page source <_sources/users.rst.txt>`_ for :ref:`users`. From d4e8896315acd394481912442c61b9e3082d434c Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 9 Mar 2022 16:25:45 +0000 Subject: [PATCH 064/336] 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 cbe2444ef..d3db1476f 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1247,5 +1247,10 @@ "name": "Cebrail Yılmaz", "github_login": "b1sar", "twitter_username": "" + }, + { + "name": "Artur Barseghyan", + "github_login": "barseghyanartur", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ca7d812dc..fd5156781 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -285,6 +285,13 @@ Listed in alphabetical order. + + Artur Barseghyan + + barseghyanartur + + + AsheKR From 95b1c4386080ba50242f0d2c15099774877c82d3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 10 Mar 2022 02:28:40 +0000 Subject: [PATCH 065/336] Release 2022.03.09 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e88be236..4280feb1b 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.03.09 + +### Changed +- Fix a few typos in the documentation ([#3625](https://github.com/cookiecutter/cookiecutter-django/pull/3625)) + ## 2022.03.08 ### Updated diff --git a/setup.py b/setup.py index 1b023704c..56f8802dd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.03.08" +version = "2022.03.09" with open("README.rst") as readme_file: long_description = readme_file.read() From 49956db9481c6cf8103de3e4b63b2c48ddc25a6e Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Sun, 13 Mar 2022 05:56:23 -0400 Subject: [PATCH 066/336] Add DRF spectacular link in requirements (#3630) --- {{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 0c8708492..695a86e1c 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.11.0 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation -drf-spectacular==0.21.2 +drf-spectacular==0.21.2 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 91e260333976713c51f5a3d08627d13e8d781417 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 14 Mar 2022 02:23:26 +0000 Subject: [PATCH 067/336] Release 2022.03.13 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4280feb1b..1a202341c 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.03.13 + +### Changed +- Add DRF spectacular link in requirements ([#3630](https://github.com/cookiecutter/cookiecutter-django/pull/3630)) + ## 2022.03.09 ### Changed diff --git a/setup.py b/setup.py index 56f8802dd..007e8d879 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.03.09" +version = "2022.03.13" with open("README.rst") as readme_file: long_description = readme_file.read() From 0b934b383ef23322aa62b7eedd5f7ac2aaa5e7ae Mon Sep 17 00:00:00 2001 From: innicoder <100089381+innicoder@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:16:00 +0100 Subject: [PATCH 068/336] Fix broken link in README of generated projects (#3634) --- {{cookiecutter.project_slug}}/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md index 969520961..557194877 100644 --- a/{{cookiecutter.project_slug}}/README.md +++ b/{{cookiecutter.project_slug}}/README.md @@ -46,7 +46,7 @@ To run the tests, check your test coverage, and generate an HTML coverage report ### Live reloading and Sass CSS compilation -Moved to [Live reloading and SASS compilation](http://cookiecutter-django.readthedocs.io/en/latest/live-reloading-and-sass-compilation.html). +Moved to [Live reloading and SASS compilation](https://cookiecutter-django.readthedocs.io/en/latest/developing-locally.html#sass-compilation-live-reloading). {%- if cookiecutter.use_celery == "y" %} From e7db2cd6b0d3b6019ef70fafcf9cfc519f323e87 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 14 Mar 2022 17:17:00 +0000 Subject: [PATCH 069/336] 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 d3db1476f..ad83662dd 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1252,5 +1252,10 @@ "name": "Artur Barseghyan", "github_login": "barseghyanartur", "twitter_username": "" + }, + { + "name": "innicoder", + "github_login": "innicoder", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index fd5156781..c33bf9e12 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -887,6 +887,13 @@ Listed in alphabetical order. + + innicoder + + innicoder + + + Irfan Ahmad From 24bf66a1018e550bd26148901998f98f1a9bb832 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 15 Mar 2022 02:25:08 +0000 Subject: [PATCH 070/336] Release 2022.03.14 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a202341c..84e61e6c6 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.03.14 + +### Fixed +- Fix broken link in README of generated projects ([#3634](https://github.com/cookiecutter/cookiecutter-django/pull/3634)) + ## 2022.03.13 ### Changed diff --git a/setup.py b/setup.py index 007e8d879..99e054595 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.03.13" +version = "2022.03.14" with open("README.rst") as readme_file: long_description = readme_file.read() From bd12be3b3852b5bba3e1e95f4ed02d9ebf0a77f9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 19 Mar 2022 18:37:48 +0000 Subject: [PATCH 071/336] Fix a typo in the docs --- docs/developing-locally.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 3b86ff44e..e9c1234c2 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -168,7 +168,7 @@ If you've opted for Gulp as JS task runner, the project comes configured with `S The app will now run with live reloading enabled, applying front-end changes dynamically. -.. note:: The task will start 2 processes in parallel: the static assets build loop on one side, and the Django server on the other. You don NOT need to run Django as your would normally with ``manage.py runserver``. +.. note:: The task will start 2 processes in parallel: the static assets build loop on one side, and the Django server on the other. You do NOT need to run Django as your would normally with ``manage.py runserver``. .. _Node.js: http://nodejs.org/download/ .. _Sass: https://sass-lang.com/ From ab4a32d5583ca05fc985d16fc1ffc894dab5db6a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 20 Mar 2022 15:00:40 +0000 Subject: [PATCH 072/336] Unify compressor, gulp and custom bootstrap options (#3535) --- .github/workflows/ci.yml | 6 +-- README.md | 12 +++--- cookiecutter.json | 11 +++-- docs/deployment-on-heroku.rst | 2 +- docs/developing-locally.rst | 2 +- docs/project-generation-options.rst | 17 +++----- hooks/post_gen_project.py | 32 ++++++--------- tests/test_cookiecutter_generation.py | 9 ++--- .../.github/dependabot.yml | 2 +- {{cookiecutter.project_slug}}/.gitignore | 2 +- .../docker_compose_up_django.xml | 2 +- .../.idea/{{cookiecutter.project_slug}}.iml | 2 +- {{cookiecutter.project_slug}}/README.md | 5 +-- .../compose/production/django/Dockerfile | 4 +- .../compose/production/django/start | 2 +- .../config/settings/base.py | 2 +- .../config/settings/local.py | 2 +- .../config/settings/production.py | 2 +- {{cookiecutter.project_slug}}/gulpfile.js | 10 +---- {{cookiecutter.project_slug}}/local.yml | 2 +- {{cookiecutter.project_slug}}/pytest.ini | 2 +- .../requirements/base.txt | 6 +-- .../static/sass/project.scss | 3 -- .../templates/base.html | 40 ++++++++++++------- 24 files changed, 78 insertions(+), 101 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c502b130..121657e2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: - name: Basic args: "" - name: Extended - args: "use_celery=y use_drf=y js_task_runner=Gulp" + args: "use_celery=y use_drf=y frontend_pipeline=Gulp" name: "${{ matrix.script.name }} Docker" runs-on: ubuntu-latest @@ -75,9 +75,9 @@ jobs: matrix: script: - name: With Celery - args: "use_celery=y use_compressor=y" + args: "use_celery=y frontend_pipeline='Django Compressor'" - name: With Gulp - args: "js_task_runner=Gulp custom_bootstrap_compilation=y" + args: "frontend_pipeline='Gulp'" name: "${{ matrix.script.name }} Bare metal" runs-on: ubuntu-latest diff --git a/README.md b/README.md index fcffd75ca..c96d8cc92 100644 --- a/README.md +++ b/README.md @@ -127,10 +127,6 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re 4 - 11.14 5 - 10.19 Choose from 1, 2, 3, 4, 5 [1]: 1 - Select js_task_runner: - 1 - None - 2 - Gulp - Choose from 1, 2 [1]: 1 Select cloud_provider: 1 - AWS 2 - GCP @@ -149,8 +145,12 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re Choose from 1, 2, 3, 4, 5, 6, 7, 8, 9 [1]: 1 use_async [n]: n use_drf [n]: y - custom_bootstrap_compilation [n]: n - use_compressor [n]: n + Select frontend_pipeline: + 1 - None + 2 - Django Compressor + 3 - Gulp + 4 - Gulp with custom Bootstrap + Choose from 1, 2, 3, 4 [1]: 1 use_celery [n]: y use_mailhog [n]: n use_sentry [n]: y diff --git a/cookiecutter.json b/cookiecutter.json index b24a3846d..4a43bae7e 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -24,10 +24,6 @@ "11.14", "10.19" ], - "js_task_runner": [ - "None", - "Gulp" - ], "cloud_provider": [ "AWS", "GCP", @@ -46,8 +42,11 @@ ], "use_async": "n", "use_drf": "n", - "custom_bootstrap_compilation": "n", - "use_compressor": "n", + "frontend_pipeline": [ + "None", + "Django Compressor", + "Gulp" + ], "use_celery": "n", "use_mailhog": "n", "use_sentry": "n", diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst index bab5881cd..e239b6593 100644 --- a/docs/deployment-on-heroku.rst +++ b/docs/deployment-on-heroku.rst @@ -112,7 +112,7 @@ Or add the DSN for your account, if you already have one: Gulp & Bootstrap compilation ++++++++++++++++++++++++++++ -If you've opted for a custom bootstrap build, you'll most likely need to setup +If you've opted for Gulp, you'll most likely need to setup your app to use `multiple buildpacks`_: one for Python & one for Node.js: .. code-block:: bash diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index e9c1234c2..23bb7b9a8 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -155,7 +155,7 @@ To run Celery locally, make sure redis-server is installed (instructions are ava Sass Compilation & Live Reloading --------------------------------- -If you've opted for Gulp as JS task runner, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page. +If you've opted for Gulp as front-end pipeline, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page. #. Make sure that `Node.js`_ v16 is installed on your machine. #. In the project root, install the JS dependencies with:: diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index 26fb79d2f..3cc719779 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -61,12 +61,6 @@ postgresql_version: 4. 11.14 5. 10.19 -js_task_runner: - Select a JavaScript task runner. The choices are: - - 1. None - 2. Gulp_ - cloud_provider: Select a cloud provider for static & media files. The choices are: @@ -95,13 +89,12 @@ use_async: use_drf: Indicates whether the project should be configured to use `Django Rest Framework`_. -custom_bootstrap_compilation: - Indicates whether the project should support Bootstrap recompilation - via the selected JavaScript task runner's task. This can be useful - for real-time Bootstrap variable alteration. +frontend_pipeline: + Select a pipeline to compile and optimise frontend assets (JS, CSS, ...): -use_compressor: - Indicates whether the project should be configured to use `Django Compressor`_. + 1. None + 2. `Django Compressor`_ + 3. `Gulp`_: support Bootstrap recompilation with real-time variables alteration. use_celery: Indicates whether the project should be configured to use Celery_. diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index d784ba62b..9c3d946c1 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -10,7 +10,6 @@ TODO: restrict Cookiecutter Django project initialization to """ from __future__ import print_function -import json import os import random import shutil @@ -92,6 +91,11 @@ def remove_gulp_files(): file_names = ["gulpfile.js"] for file_name in file_names: os.remove(file_name) + remove_sass_files() + + +def remove_sass_files(): + shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "static", "sass")) def remove_packagejson_file(): @@ -100,16 +104,6 @@ def remove_packagejson_file(): os.remove(file_name) -def remove_bootstrap_packages(): - with open("package.json", mode="r") as fd: - content = json.load(fd) - for package_name in ["bootstrap", "gulp-concat", "@popperjs/core"]: - content["devDependencies"].pop(package_name) - with open("package.json", mode="w") as fd: - json.dump(content, fd, ensure_ascii=False, indent=2) - fd.write("\n") - - def remove_celery_files(): file_names = [ os.path.join("config", "celery_app.py"), @@ -363,13 +357,13 @@ def main(): if ( "{{ cookiecutter.use_docker }}".lower() == "y" - and "{{ cookiecutter.cloud_provider}}".lower() != "aws" + and "{{ cookiecutter.cloud_provider}}" != "AWS" ): remove_aws_dockerfile() if "{{ cookiecutter.use_heroku }}".lower() == "n": remove_heroku_files() - elif "{{ cookiecutter.use_compressor }}".lower() == "n": + elif "{{ cookiecutter.frontend_pipeline }}" != "Django Compressor": remove_heroku_build_hooks() if ( @@ -389,15 +383,13 @@ def main(): if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y": append_to_gitignore_file("!.envs/.local/") - if "{{ cookiecutter.js_task_runner}}".lower() == "none": + if "{{ cookiecutter.frontend_pipeline }}" != "Gulp": remove_gulp_files() remove_packagejson_file() if "{{ cookiecutter.use_docker }}".lower() == "y": remove_node_dockerfile() - elif "{{ cookiecutter.custom_bootstrap_compilation }}" == "n": - remove_bootstrap_packages() - if "{{ cookiecutter.cloud_provider}}".lower() == "none": + if "{{ cookiecutter.cloud_provider}}" == "None": print( WARNING + "You chose not to use a cloud provider, " "media files won't be served in production." + TERMINATOR @@ -409,13 +401,13 @@ def main(): if "{{ cookiecutter.use_docker }}".lower() == "y": remove_celery_compose_dirs() - if "{{ cookiecutter.ci_tool }}".lower() != "travis": + if "{{ cookiecutter.ci_tool }}" != "Travis": remove_dottravisyml_file() - if "{{ cookiecutter.ci_tool }}".lower() != "gitlab": + if "{{ cookiecutter.ci_tool }}" != "Gitlab": remove_dotgitlabciyml_file() - if "{{ cookiecutter.ci_tool }}".lower() != "github": + if "{{ cookiecutter.ci_tool }}" != "Github": remove_dotgithub_folder() if "{{ cookiecutter.use_drf }}".lower() == "n": diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index fc3ecf811..9c30aeedd 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -87,12 +87,9 @@ SUPPORTED_COMBINATIONS = [ {"use_async": "n"}, {"use_drf": "y"}, {"use_drf": "n"}, - {"js_task_runner": "None"}, - {"js_task_runner": "Gulp"}, - {"custom_bootstrap_compilation": "y"}, - {"custom_bootstrap_compilation": "n"}, - {"use_compressor": "y"}, - {"use_compressor": "n"}, + {"frontend_pipeline": "None"}, + {"frontend_pipeline": "django-compressor"}, + {"frontend_pipeline": "Gulp"}, {"use_celery": "y"}, {"use_celery": "n"}, {"use_mailhog": "y"}, diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml index cf88cf33b..420a63cdc 100644 --- a/{{cookiecutter.project_slug}}/.github/dependabot.yml +++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml @@ -82,7 +82,7 @@ updates: schedule: interval: "daily" -{%- if cookiecutter.js_task_runner != "None" %} +{%- if cookiecutter.frontend_pipeline == 'Gulp' %} # Enable version updates for javascript/npm - package-ecosystem: "npm" diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index d48356fa1..ede26ef72 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -338,7 +338,7 @@ MailHog .ipython/ {%- endif %} -{%- if cookiecutter.js_task_runner == 'Gulp' %} +{%- if cookiecutter.frontend_pipeline == 'Gulp' %} project.css project.min.css vendors.js diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml index 67f369a3c..ad3b6a35a 100644 --- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml +++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml @@ -10,7 +10,7 @@