From 5220d47113f577143273ebd40c87748c890e9644 Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Mon, 8 May 2023 20:36:02 +0200
Subject: [PATCH] Update tox / rtfd setup

---
 .github/workflows/test.yml | 10 ++++++++++
 .pre-commit-config.yaml    |  4 ++--
 .readthedocs.yml           |  6 +++++-
 setup.cfg                  |  1 +
 tox.ini                    |  6 +++---
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6919c176..5a58a563 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,11 +12,16 @@ jobs:
         python-version: ["3.11", "3.10", "3.9"]
         django: [42, 41, 32]
         cms: [311, 39]
+        continue-on-error: [false]
         exclude:
           - django: 41
             cms: 39
           - django: 42
             cms: 39
+          - django: 32
+            cms: 311
+          - django: 42
+            cms: 311
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -57,3 +62,8 @@ jobs:
         flags: unittests
         files: ./coverage.xml
         fail_ci_if_error: false
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d24df8c4..297de8d1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,11 +26,11 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: 'v0.0.262'
+    rev: 'v0.0.265'
     hooks:
       - id: ruff
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2
+    rev: v3.4.0
     hooks:
       - id: pyupgrade
         args:
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 239f5cc4..0086f8a5 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,5 +1,10 @@
 version: 2
 
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
 sphinx:
   configuration: docs/conf.py
   fail_on_warning: false
@@ -9,7 +14,6 @@ formats:
   - pdf
 
 python:
-  version: 3.8
   install:
     - requirements: requirements-test.txt
     - method: pip
diff --git a/setup.cfg b/setup.cfg
index 5a70b049..7aa28f16 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -65,6 +65,7 @@ djangocms_blog = *.html *.png *.gif *js *jpg *jpeg *svg *py *mo *po
 taggit-helpers = django-taggit-helpers
 docs =
 	django<5.0
+    sphinx>2,<5
 
 [sdist]
 formats = zip
diff --git a/tox.ini b/tox.ini
index d1b19fac..94d99d00 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ envlist =
     pypi-description
     towncrier
     py{311,310,39}-django{42,41}-cms{311}
-    py{311,310,39}-django{32}-cms{311,39}
+    py{311,310,39}-django{32}-cms{39}
 
 [testenv]
 commands = {env:COMMAND:python} cms_helper.py djangocms_blog test {posargs}
@@ -26,8 +26,8 @@ deps =
     django42: django-mptt>=0.9
     django42: django-filer>=2.0
     django42: django-appdata>=0.3.2
-    cms39: https://github.com/divio/django-cms/archive/release/3.9.x.zip
-    cms311: https://github.com/divio/django-cms/archive/release/3.11.x.zip
+    cms39: https://github.com/django-cms/django-cms/archive/release/3.9.x.zip
+    cms311: https://github.com/yakky/django-cms/archive/release/3.11.x.zip
     channels[daphne]~=4.0.0
     django-knocker~=0.5.1
     channels-redis