From 391874b426fa5bb20a95ea59a8b58e1b2bb6daee Mon Sep 17 00:00:00 2001 From: Andrew-Chen-Wang Date: Mon, 5 Jul 2021 16:37:35 -0400 Subject: [PATCH 1/8] Add Redis 6 support --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 2 +- {{cookiecutter.project_slug}}/local.yml | 2 +- {{cookiecutter.project_slug}}/production.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 70023b53d..d2d7f703c 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: services: {%- if cookiecutter.use_celery == 'y' %} redis: - image: redis:5.0 + image: redis:6.2.4 ports: - 6379:6379 {%- endif %} diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 6241ceede..a9f80307f 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -64,7 +64,7 @@ services: {%- if cookiecutter.use_celery == 'y' %} redis: - image: redis:5.0 + image: redis:6.2.4 container_name: redis celeryworker: diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index 3cccdb653..551d05a0d 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -47,7 +47,7 @@ services: {%- endif %} redis: - image: redis:5.0 + image: redis:6.2.4 {%- if cookiecutter.use_celery == 'y' %} celeryworker: From 4c45aa2e6004a2c2d592fd74bc12a5b39f087a66 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Wed, 11 Aug 2021 23:13:30 -0400 Subject: [PATCH 2/8] Fix RTD Python version * Python 3.9 is technically supported via the testing image. --- {{cookiecutter.project_slug}}/.readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml index 1b6020f3a..05bdd5157 100644 --- a/{{cookiecutter.project_slug}}/.readthedocs.yml +++ b/{{cookiecutter.project_slug}}/.readthedocs.yml @@ -4,6 +4,6 @@ sphinx: configuration: docs/conf.py python: - version: 3.9 + image: testing install: - requirements: requirements/local.txt From c0a61573731ae488ce44858b1e5ae4a96d942602 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 12 Aug 2021 09:18:19 -0400 Subject: [PATCH 3/8] Use major version 6 without minor --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index d2d7f703c..1e17068ee 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: services: {%- if cookiecutter.use_celery == 'y' %} redis: - image: redis:6.2.4 + image: redis:6 ports: - 6379:6379 {%- endif %} From 29f3706aef8ddc0fbf1505146b3d038199787a41 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 12 Aug 2021 16:28:21 -0400 Subject: [PATCH 4/8] Update production.yml --- {{cookiecutter.project_slug}}/production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index 551d05a0d..ea4292a0d 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -47,7 +47,7 @@ services: {%- endif %} redis: - image: redis:6.2.4 + image: redis:6 {%- if cookiecutter.use_celery == 'y' %} celeryworker: From 64d3dfba8c418dd1c6dd7edf92ef43141b995b46 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 12 Aug 2021 16:31:35 -0400 Subject: [PATCH 5/8] Add back version number but use testing image --- {{cookiecutter.project_slug}}/.readthedocs.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml index 05bdd5157..b4cf0c080 100644 --- a/{{cookiecutter.project_slug}}/.readthedocs.yml +++ b/{{cookiecutter.project_slug}}/.readthedocs.yml @@ -3,7 +3,10 @@ version: 2 sphinx: configuration: docs/conf.py -python: +build: image: testing + +python: + version: 3.9 install: - requirements: requirements/local.txt From 9359d8f3f1fe79f8136148c6611a01fe1a8cedc2 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 13 Aug 2021 02:13:00 +0000 Subject: [PATCH 6/8] Update Changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9a9cd24f..d76f08110 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-08-12] +### Changed +- Add documentation for automating backups ([#3268](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3268)) +- Add missing step to getting started locally in docs ([#3291](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3291)) +- Moved isort config from `.editorconfig` to `setup.cfg` ([#3290](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3290)) +- How to pre-commit in Docker Development ([#3287](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3287)) +### Updated +- Update sentry-sdk to 1.3.1 ([#3281](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3281)) +- Update tox to 3.24.1 ([#3285](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3285)) +- Update pre-commit to 2.14.0 ([#3289](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3289)) + ## [2021-07-30] ### Updated - Auto-update pre-commit hooks ([#3283](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3283)) From d28bd97f3ade81a0ef80bd8aa7189f3f61763a2a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 13 Aug 2021 09:52:25 +0200 Subject: [PATCH 7/8] Update {{cookiecutter.project_slug}}/local.yml --- {{cookiecutter.project_slug}}/local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index a9f80307f..8cce827c1 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -64,7 +64,7 @@ services: {%- if cookiecutter.use_celery == 'y' %} redis: - image: redis:6.2.4 + image: redis:6 container_name: redis celeryworker: From c5671cf242bb930812b4b311cfd0e978424915b1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 14 Aug 2021 02:13:26 +0000 Subject: [PATCH 8/8] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d76f08110..110c3b3f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-08-13] +### Changed +- Upgrade to Redis 6 ([#3255](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3255)) +### Fixed +- Fix RTD build image to support Python 3.9 ([#3293](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3293)) + ## [2021-08-12] ### Changed - Add documentation for automating backups ([#3268](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3268))