From 4b5e7a19a68c8ecd48d2dc6ce99c1b7f254a694a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Feb 2022 16:36:54 -0500 Subject: [PATCH 01/12] 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 02/12] 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 03/12] 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 04/12] 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 05/12] 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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()