From 3b05e02aa091cb629de00c378319ec70d310dc88 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Sep 2022 12:55:37 -0700 Subject: [PATCH 01/28] Update crispy-bootstrap5 from 0.6 to 0.7 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 7d664a39b..a1aee1c8b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -34,7 +34,7 @@ django-environ==0.9.0 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.51.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms -crispy-bootstrap5==0.6 # https://github.com/django-crispy-forms/crispy-bootstrap5 +crispy-bootstrap5==0.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} django-compressor==4.1 # https://github.com/django-compressor/django-compressor {%- endif %} From f51e8e88e5c4779643f2e0e961a4886a63813440 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 29 Oct 2022 10:17:18 -0700 Subject: [PATCH 02/28] Update pillow from 9.2.0 to 9.3.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 2c8f5312f..b65c228eb 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2022.5 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify -Pillow==9.2.0 # https://github.com/python-pillow/Pillow +Pillow==9.3.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.1.0 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From 2f4bb6c1ba566af7bb73a131c75cb47352e2a215 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 31 Oct 2022 02:54:35 +0000 Subject: [PATCH 03/28] Release 2022.10.30 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ab184396..e7ef7f8f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.10.30 + +### Updated +- Auto-update pre-commit hooks ([#3924](https://github.com/cookiecutter/cookiecutter-django/pull/3924)) + ## 2022.10.28 ### Updated diff --git a/setup.py b/setup.py index b87d2a54b..8bc2d7a73 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.28" +version = "2022.10.30" with open("README.rst") as readme_file: long_description = readme_file.read() From 8bc9e1cabd7af41ca9f3eb76bcbb6789dc3b2663 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Oct 2022 05:19:20 -0700 Subject: [PATCH 04/28] Update django-coverage-plugin from 2.0.3 to 2.0.4 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index df77fba4b..2b40810b5 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -44,5 +44,5 @@ factory-boy==3.2.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.7.0 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.1 # https://github.com/django-extensions/django-extensions -django-coverage-plugin==2.0.3 # https://github.com/nedbat/django_coverage_plugin +django-coverage-plugin==2.0.4 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From f4668797b937a76930ea8ac44f78fade54dc6b0e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Oct 2022 19:23:53 -0700 Subject: [PATCH 05/28] Update pytz from 2022.5 to 2022.6 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 2c8f5312f..655a65e56 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2022.5 # https://github.com/stub42/pytz +pytz==2022.6 # https://github.com/stub42/pytz python-slugify==6.1.2 # https://github.com/un33k/python-slugify Pillow==9.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} From 9cc2a202d2555d8e2844208168b7fabf7ba85666 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 Nov 2022 13:37:23 -0700 Subject: [PATCH 06/28] Update sphinx-rtd-theme from 1.0.0 to 1.1.0 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index c3b371b13..2c673d1b4 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ sphinx==5.3.0 -sphinx-rtd-theme==1.0.0 +sphinx-rtd-theme==1.1.0 From 11b8ffa93de38ebf5cc12bcf57e3fb0976420430 Mon Sep 17 00:00:00 2001 From: Abe Date: Tue, 1 Nov 2022 20:59:58 -0400 Subject: [PATCH 07/28] fix typo - closes #3931 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 28bb81e38..69bce6f2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ is: $ tox -e py310 -This will run pytest with the python3.9 interpreter, for example. +This will run pytest with the python3.10 interpreter, for example. To run a particular test with tox for against your current Python version: From ca422e9916e247f24c93b6f564e0b32dfee724c0 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Wed, 2 Nov 2022 01:14:12 +0000 Subject: [PATCH 08/28] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 2467ed3e1..190b81d38 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1297,5 +1297,10 @@ "name": "krati yadav", "github_login": "krati5", "twitter_username": "" + }, + { + "name": "Abe Hanoka", + "github_login": "abe-101", + "twitter_username": "abe__101" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 669e9d772..86ee9251c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -138,6 +138,13 @@ Listed in alphabetical order. abdadeel_ + + Abe Hanoka + + abe-101 + + abe__101 + Adam Bogdał From 0247ea5d37e6c3f99eee096b57a7b899b06dc5ef Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 3 Nov 2022 02:45:00 +0000 Subject: [PATCH 09/28] Release 2022.11.02 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7ef7f8f6..81a35d4b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.02 + +### Changed +- fix typo in CONTRIBUTING.md ([#3932](https://github.com/cookiecutter/cookiecutter-django/pull/3932)) +### Updated +- Update crispy-bootstrap5 to 0.7 ([#3886](https://github.com/cookiecutter/cookiecutter-django/pull/3886)) +- Update django-coverage-plugin to 2.0.4 ([#3927](https://github.com/cookiecutter/cookiecutter-django/pull/3927)) +- Update pytz to 2022.6 ([#3928](https://github.com/cookiecutter/cookiecutter-django/pull/3928)) +- Update sphinx-rtd-theme to 1.1.0 ([#3929](https://github.com/cookiecutter/cookiecutter-django/pull/3929)) +- Update pillow to 9.3.0 ([#3922](https://github.com/cookiecutter/cookiecutter-django/pull/3922)) + ## 2022.10.30 ### Updated diff --git a/setup.py b/setup.py index 8bc2d7a73..46dd4d16c 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.10.30" +version = "2022.11.02" with open("README.rst") as readme_file: long_description = readme_file.read() From d1d6ee4dd79645e4b756640676655b1358e33995 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 06:24:07 -0500 Subject: [PATCH 10/28] Update sphinx-rtd-theme to 1.1.1 (#3935) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 2c673d1b4..2cc8302a2 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ sphinx==5.3.0 -sphinx-rtd-theme==1.1.0 +sphinx-rtd-theme==1.1.1 From 725f524b9ccad4f5df6b114ce5019d3d8edaf369 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 06:24:18 -0500 Subject: [PATCH 11/28] Update pygithub to 1.57 (#3936) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 691ecf0b4..ea9671876 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ pyyaml==6.0 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.56 +PyGithub==1.57 gitpython==3.1.29 jinja2==3.1.2 requests==2.28.1 From 76234ca9e641e8b05efab272b716dd25b493e0c9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 6 Nov 2022 07:34:58 -0500 Subject: [PATCH 12/28] Update pytest-sugar to 0.9.6 (#3937) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 2b40810b5..b108431b1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -16,7 +16,7 @@ watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles mypy==0.982 # https://github.com/python/mypy django-stubs==1.12.0 # https://github.com/typeddjango/django-stubs pytest==7.2.0 # https://github.com/pytest-dev/pytest -pytest-sugar==0.9.5 # https://github.com/Frozenball/pytest-sugar +pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs==1.7.0 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} From 3359f6a4dfdfdab34a749bd9ffb4e12e2a59c68e Mon Sep 17 00:00:00 2001 From: Abe Hanoka Date: Sun, 6 Nov 2022 07:36:17 -0500 Subject: [PATCH 13/28] add os requirements for Ubuntu 22.04 (Jammy) (#3930) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fábio C. Barrionuevo da Luz --- .../utility/requirements-jammy.apt | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 {{cookiecutter.project_slug}}/utility/requirements-jammy.apt diff --git a/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt new file mode 100644 index 000000000..63d1587e6 --- /dev/null +++ b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt @@ -0,0 +1,23 @@ +##basic build dependencies of various Django apps for Ubuntu Jammy 22.04 +#build-essential metapackage install: make, gcc, g++, +build-essential +#required to translate +gettext +python3-dev + +##shared dependencies of: +##Pillow, pylibmc +zlib1g-dev + +##Postgresql and psycopg2 dependencies +libpq-dev + +##Pillow dependencies +libtiff5-dev +libjpeg8-dev +libfreetype6-dev +liblcms2-dev +libwebp-dev + +##django-extensions +graphviz-dev From ca82618526d8f2424c721a4bfaeb8abc54b5b030 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Sun, 6 Nov 2022 13:40:16 +0100 Subject: [PATCH 14/28] Store extended Celery task attributes in backend (#3855) --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index ad879fa72..9cd6a081b 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -283,6 +283,8 @@ if USE_TZ: CELERY_BROKER_URL = env("CELERY_BROKER_URL") # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend CELERY_RESULT_BACKEND = CELERY_BROKER_URL +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended +CELERY_RESULT_EXTENDED = True # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-accept_content CELERY_ACCEPT_CONTENT = ["json"] # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer From a22f842f16879ac9d62b19ada4c03f63b1203fbd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 7 Nov 2022 02:43:39 +0000 Subject: [PATCH 15/28] Release 2022.11.06 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a35d4b6..a253b878c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.06 + +### Changed +- Store extended Celery task attributes in backend ([#3855](https://github.com/cookiecutter/cookiecutter-django/pull/3855)) +- add os requirements for Ubuntu 22.04 (Jammy) ([#3930](https://github.com/cookiecutter/cookiecutter-django/pull/3930)) +### Updated +- Update pytest-sugar to 0.9.6 ([#3937](https://github.com/cookiecutter/cookiecutter-django/pull/3937)) +- Update pygithub to 1.57 ([#3936](https://github.com/cookiecutter/cookiecutter-django/pull/3936)) +- Update sphinx-rtd-theme to 1.1.1 ([#3935](https://github.com/cookiecutter/cookiecutter-django/pull/3935)) + ## 2022.11.02 ### Changed diff --git a/setup.py b/setup.py index 46dd4d16c..1633d385b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.02" +version = "2022.11.06" with open("README.rst") as readme_file: long_description = readme_file.read() From b74584a4673078bf22111aa431baa7a63609282c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 7 Nov 2022 07:42:26 -0500 Subject: [PATCH 16/28] Update watchfiles to 0.18.1 (#3938) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b108431b1..130cb24cc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 psycopg2-binary==2.9.5 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.18.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From d4184cc1c68eee2c27f7b38fbc1bdf3fad6b6494 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 8 Nov 2022 02:43:08 +0000 Subject: [PATCH 17/28] Release 2022.11.07 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a253b878c..bc6394eac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.07 + +### Updated +- Update watchfiles to 0.18.1 ([#3938](https://github.com/cookiecutter/cookiecutter-django/pull/3938)) + ## 2022.11.06 ### Changed diff --git a/setup.py b/setup.py index 1633d385b..8100edc12 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.06" +version = "2022.11.07" with open("README.rst") as readme_file: long_description = readme_file.read() From 040537a5d69ea96b245b24214105da740f8bca53 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:00:06 +0000 Subject: [PATCH 18/28] Auto-update pre-commit hooks (#3942) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 10af89e41..e31055bb1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: check-yaml - repo: https://github.com/asottile/pyupgrade - rev: v3.2.0 + rev: v3.2.2 hooks: - id: pyupgrade args: [--py310-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 5cf841bc3..433d97de9 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: check-yaml - repo: https://github.com/asottile/pyupgrade - rev: v3.2.0 + rev: v3.2.2 hooks: - id: pyupgrade args: [--py310-plus] From aa6cc603e24616d6e16761e1596153b0d0f04141 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 12 Nov 2022 02:41:33 +0000 Subject: [PATCH 19/28] Release 2022.11.11 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6394eac..88f2ab45b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.11.11 + +### Updated +- Auto-update pre-commit hooks ([#3942](https://github.com/cookiecutter/cookiecutter-django/pull/3942)) + ## 2022.11.07 ### Updated diff --git a/setup.py b/setup.py index 8100edc12..ea0d169e3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.11.07" +version = "2022.11.11" with open("README.rst") as readme_file: long_description = readme_file.read() From 27655eca7ee1a9647ff67af2eed3b419a766aff6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Nov 2022 00:51:28 -0800 Subject: [PATCH 20/28] Update tox from 3.27.0 to 3.27.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ea9671876..783edeb18 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.20.0 # Testing # ------------------------------------------------------------------------------ -tox==3.27.0 +tox==3.27.1 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 7bdc6aea668464216b77d9492dd3ba7631a299fe Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 18 Nov 2022 14:21:59 -0600 Subject: [PATCH 21/28] Update python-slugify from 6.1.2 to 7.0.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index af9c4b52e..3fa109387 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2022.6 # https://github.com/stub42/pytz -python-slugify==6.1.2 # https://github.com/un33k/python-slugify +python-slugify==7.0.0 # https://github.com/un33k/python-slugify Pillow==9.3.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From 202da796b36afbc7f9aabc88960ba301ff3b5acd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Nov 2022 08:12:28 -0600 Subject: [PATCH 22/28] Update uvicorn from 0.19.0 to 0.20.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index af9c4b52e..3d0da64f9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.2.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.19.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.20.0 # https://github.com/encode/uvicorn {%- endif %} # Django From f70b397c8672fad1a71b1e08872625c57f1d8f62 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 22 Nov 2022 02:58:49 -0600 Subject: [PATCH 23/28] Update redis from 4.3.4 to 4.3.5 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index af9c4b52e..9073d7034 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.2.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.3.4 # https://github.com/redis/redis-py +redis==4.3.5 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.0.0 # https://github.com/redis/hiredis-py {%- endif %} From 0e91f40969fd7a0cdcf59be2f03f8e08dc43bce5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 22 Nov 2022 07:59:10 -0600 Subject: [PATCH 24/28] Update sentry-sdk from 1.10.1 to 1.11.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index e2c2046d2..275633dd4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.5 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.10.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.11.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.0.0 # https://github.com/redis/hiredis-py From 7d517dc6775a6d3cf7c231ec38468108c259b640 Mon Sep 17 00:00:00 2001 From: adinhodovic Date: Tue, 22 Nov 2022 20:08:02 +0100 Subject: [PATCH 25/28] feat(celery): Send task events for Celery by default Is useful for e.g Flower and Celery-exporter --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 9cd6a081b..b8368b6cb 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -299,6 +299,8 @@ CELERY_TASK_TIME_LIMIT = 5 * 60 CELERY_TASK_SOFT_TIME_LIMIT = 60 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#beat-scheduler CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler" +# https://docs.celeryq.dev/en/stable/userguide/configuration.html#worker-send-task-events +CELERY_WORKER_SEND_TASK_EVENTS = True {%- endif %} # django-allauth From 65ac3d8a3f2e9ec5e66c21ba23c1e589ef7b29c7 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Tue, 22 Nov 2022 19:20:22 +0000 Subject: [PATCH 26/28] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 190b81d38..bdbc76158 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1302,5 +1302,10 @@ "name": "Abe Hanoka", "github_login": "abe-101", "twitter_username": "abe__101" + }, + { + "name": "Adin Hodovic", + "github_login": "adinhodovic", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 86ee9251c..29db8acb3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -166,6 +166,13 @@ Listed in alphabetical order. + + Adin Hodovic + + adinhodovic + + + Agam Dua From d98aad07109fe02613cab9850378eefc9f350748 Mon Sep 17 00:00:00 2001 From: Leifur Halldor Asgeirsson Date: Tue, 22 Nov 2022 14:59:34 -0500 Subject: [PATCH 27/28] Remove platform from compose file (#3957) --- {{cookiecutter.project_slug}}/local.yml | 2 -- {{cookiecutter.project_slug}}/production.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index fb203acd6..33a8db07a 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -11,7 +11,6 @@ services: dockerfile: ./compose/local/django/Dockerfile image: {{ cookiecutter.project_slug }}_local_django container_name: {{ cookiecutter.project_slug }}_local_django - platform: linux/x86_64 depends_on: - postgres {%- if cookiecutter.use_celery == 'y' %} @@ -44,7 +43,6 @@ services: docs: image: {{ cookiecutter.project_slug }}_local_docs container_name: {{ cookiecutter.project_slug }}_local_docs - platform: linux/x86_64 build: context: . dockerfile: ./compose/local/docs/Dockerfile diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index 4c1d64c20..ea4292a0d 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -11,7 +11,6 @@ services: context: . dockerfile: ./compose/production/django/Dockerfile image: {{ cookiecutter.project_slug }}_production_django - platform: linux/x86_64 depends_on: - postgres - redis From a78b052bcce3a67ff7bc2634fcd4590cb1e0bb77 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 22 Nov 2022 19:59:59 +0000 Subject: [PATCH 28/28] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index bdbc76158..c8da987a2 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1307,5 +1307,10 @@ "name": "Adin Hodovic", "github_login": "adinhodovic", "twitter_username": "" + }, + { + "name": "Leifur Halldor Asgeirsson", + "github_login": "leifurhauks", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 29db8acb3..000e5fb1f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1160,6 +1160,13 @@ Listed in alphabetical order. + + Leifur Halldor Asgeirsson + + leifurhauks + + + Leo won