From ad0c3cdaf4afd91e14d09816e405b338a776c5f7 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Tue, 23 Aug 2022 16:55:03 +0200
Subject: [PATCH 1/4] Add new Sphinx versions to tox test matrix, but do not
 allow docutils >= 0.17 on Sphinx>=4.3

---
 tox.ini | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index e16684c31..ca1275ca7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{2,27,3,36,37,38,39}-sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,latest}{-html4,-html5,}{-qa,}
+envlist = py{2,27,3,36,37,38,39}-sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,latest}{-html4,-html5,}{-qa,}
 
 [testenv]
 setev =
@@ -25,6 +25,13 @@ deps =
     sphinx35: Sphinx < 3.6
     sphinx40: Sphinx < 4.1
     sphinx41: Sphinx < 4.2
+    sphinx42: Sphinx < 4.3
+    sphinx43: Sphinx < 4.4
+    sphinx44: Sphinx < 4.5
+    sphinx45: Sphinx < 4.6
+    sphinx50: Sphinx < 5.1
+    sphinx51: Sphinx < 5.2
+    sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42}: docutils < 0.18
     sphinxlatest: Sphinx
 commands =
     pytest {posargs} tests/

From bb1c14392e6ee33eaafb8c558ebd09a73f4c809a Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Tue, 23 Aug 2022 21:34:54 +0200
Subject: [PATCH 2/4] Stop py2 and py27 support from sphinxlatest because of
 build breakage

---
 tox.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index ca1275ca7..8e1e46161 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
 [tox]
-envlist = py{2,27,3,36,37,38,39}-sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,latest}{-html4,-html5,}{-qa,}
+envlist =
+    py{2,27}-sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51}{-html4,-html5,}{-qa,}
+    py{3,36,37,38,39}-sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,latest}{-html4,-html5,}{-qa,}
 
 [testenv]
 setev =

From f2195f576034c39afaedfc66ee6f9132a4cbcf99 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Tue, 23 Aug 2022 21:58:52 +0200
Subject: [PATCH 3/4] Circle CI: Repeat sphinx versions for Python 2.7 (pending
 adjustments)

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ae6709199..bd6052ab4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,6 +46,7 @@ jobs:
     steps:
       - run-tox:
           version: py27
+          sphinx-version: "16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51"
   py36:
     docker:
       - image: 'cimg/python:3.6'

From ace7dd1054d482aebcdc9a1fbfb920470cefa814 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Tue, 23 Aug 2022 22:24:37 +0200
Subject: [PATCH 4/4] tox.ini config: Ensure that we are getting the expected
 Sphinx version

---
 .circleci/config.yml |  2 +-
 tox.ini              | 46 ++++++++++++++++++++++----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd6052ab4..1af2cfccd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,7 +46,7 @@ jobs:
     steps:
       - run-tox:
           version: py27
-          sphinx-version: "16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51"
+          sphinx-version: "16,17,18"
   py36:
     docker:
       - image: 'cimg/python:3.6'
diff --git a/tox.ini b/tox.ini
index 8e1e46161..12b7daa32 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,29 +11,29 @@ deps =
     readthedocs-sphinx-ext
     pytest
     sphinxcontrib-httpdomain
-    sphinx16: Sphinx < 1.7
-    sphinx17: Sphinx < 1.8
-    sphinx18: Sphinx < 1.9
-    sphinx20: Sphinx < 2.1
-    sphinx21: Sphinx < 2.2
-    sphinx22: Sphinx < 2.3
-    sphinx23: Sphinx < 2.4
-    sphinx24: Sphinx < 2.5
-    sphinx30: Sphinx < 3.1
-    sphinx31: Sphinx < 3.2
-    sphinx32: Sphinx < 3.3
-    sphinx33: Sphinx < 3.4
-    sphinx34: Sphinx < 3.5
-    sphinx35: Sphinx < 3.6
-    sphinx40: Sphinx < 4.1
-    sphinx41: Sphinx < 4.2
-    sphinx42: Sphinx < 4.3
-    sphinx43: Sphinx < 4.4
-    sphinx44: Sphinx < 4.5
-    sphinx45: Sphinx < 4.6
-    sphinx50: Sphinx < 5.1
-    sphinx51: Sphinx < 5.2
-    sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42}: docutils < 0.18
+    sphinx16: Sphinx>=1.6,<1.7
+    sphinx17: Sphinx>=1.7,<1.8
+    sphinx18: Sphinx>=1.8,<1.9
+    sphinx20: Sphinx>=2.0,<2.1
+    sphinx21: Sphinx>=2.1,<2.2
+    sphinx22: Sphinx>=2.2,<2.3
+    sphinx23: Sphinx>=2.3,<2.4
+    sphinx24: Sphinx>=2.4,<2.5
+    sphinx30: Sphinx>=3.0,<3.1
+    sphinx31: Sphinx>=3.1,<3.2
+    sphinx32: Sphinx>=3.2,<3.3
+    sphinx33: Sphinx>=3.3,<3.4
+    sphinx34: Sphinx>=3.4,<3.5
+    sphinx35: Sphinx>=3.5,<3.6
+    sphinx40: Sphinx>=4.0,<4.1
+    sphinx41: Sphinx>=4.1,<4.2
+    sphinx42: Sphinx>=4.2,<4.3
+    sphinx43: Sphinx>=4.3,<4.4
+    sphinx44: Sphinx>=4.4,<4.5
+    sphinx45: Sphinx>=4.5,<4.6
+    sphinx50: Sphinx>=5.0,<5.1
+    sphinx51: Sphinx>=5.1,<5.2
+    sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42}: docutils<0.18
     sphinxlatest: Sphinx
 commands =
     pytest {posargs} tests/