From 3e73d1ea1cd824e17bf801df95c1d15dfbbb28ae Mon Sep 17 00:00:00 2001
From: Benjamin Balder Bach <benjamin@overtag.dk>
Date: Sat, 27 Aug 2022 08:17:19 +0200
Subject: [PATCH] Build matrix fixes (#1338)

* Add new Sphinx versions to tox test matrix, but do not allow docutils >= 0.17 on Sphinx>=4.3

* Stop py2 and py27 support from sphinxlatest because of build breakage

* Circle CI: Repeat sphinx versions for Python 2.7 (pending adjustments)

* tox.ini config: Ensure that we are getting the expected Sphinx version
---
 .circleci/config.yml |  1 +
 tox.ini              | 43 ++++++++++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ae6709199..1af2cfccd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,6 +46,7 @@ jobs:
     steps:
       - run-tox:
           version: py27
+          sphinx-version: "16,17,18"
   py36:
     docker:
       - image: 'cimg/python:3.6'
diff --git a/tox.ini b/tox.ini
index e16684c31..12b7daa32 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,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 =
@@ -9,22 +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
+    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/