Merge branch 'pydanny:master' into master

CHANGELOG.md

@@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [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))
+- 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))

{{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
         ports:
           - 6379:6379
       {%- endif %}

{{cookiecutter.project_slug}}/.readthedocs.yml

@@ -3,6 +3,9 @@ version: 2
 sphinx:
   configuration: docs/conf.py
 
+build:
+  image: testing
+
 python:
   version: 3.9
   install:

{{cookiecutter.project_slug}}/local.yml

@@ -64,7 +64,7 @@ services:
   {%- if cookiecutter.use_celery == 'y' %}
 
   redis:
-    image: redis:5.0
+    image: redis:6
     container_name: redis
 
   celeryworker:

{{cookiecutter.project_slug}}/production.yml

@@ -54,7 +54,7 @@ services:
       {%- endif %}
 
   redis:
-    image: redis:5.0
+    image: redis:6
   {%- if cookiecutter.use_celery == 'y' %}
 
   celeryworker: