Skip to content

Commit 3e73d1e

Browse files
authored
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
1 parent b2f52f4 commit 3e73d1e

File tree

2 files changed

+27
-17
lines changed

2 files changed

+27
-17
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
steps:
4747
- run-tox:
4848
version: py27
49+
sphinx-version: "16,17,18"
4950
py36:
5051
docker:
5152
- image: 'cimg/python:3.6'

tox.ini

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[tox]
2-
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,}
2+
envlist =
3+
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,}
4+
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,}
35

46
[testenv]
57
setev =
@@ -9,22 +11,29 @@ deps =
911
readthedocs-sphinx-ext
1012
pytest
1113
sphinxcontrib-httpdomain
12-
sphinx16: Sphinx < 1.7
13-
sphinx17: Sphinx < 1.8
14-
sphinx18: Sphinx < 1.9
15-
sphinx20: Sphinx < 2.1
16-
sphinx21: Sphinx < 2.2
17-
sphinx22: Sphinx < 2.3
18-
sphinx23: Sphinx < 2.4
19-
sphinx24: Sphinx < 2.5
20-
sphinx30: Sphinx < 3.1
21-
sphinx31: Sphinx < 3.2
22-
sphinx32: Sphinx < 3.3
23-
sphinx33: Sphinx < 3.4
24-
sphinx34: Sphinx < 3.5
25-
sphinx35: Sphinx < 3.6
26-
sphinx40: Sphinx < 4.1
27-
sphinx41: Sphinx < 4.2
14+
sphinx16: Sphinx>=1.6,<1.7
15+
sphinx17: Sphinx>=1.7,<1.8
16+
sphinx18: Sphinx>=1.8,<1.9
17+
sphinx20: Sphinx>=2.0,<2.1
18+
sphinx21: Sphinx>=2.1,<2.2
19+
sphinx22: Sphinx>=2.2,<2.3
20+
sphinx23: Sphinx>=2.3,<2.4
21+
sphinx24: Sphinx>=2.4,<2.5
22+
sphinx30: Sphinx>=3.0,<3.1
23+
sphinx31: Sphinx>=3.1,<3.2
24+
sphinx32: Sphinx>=3.2,<3.3
25+
sphinx33: Sphinx>=3.3,<3.4
26+
sphinx34: Sphinx>=3.4,<3.5
27+
sphinx35: Sphinx>=3.5,<3.6
28+
sphinx40: Sphinx>=4.0,<4.1
29+
sphinx41: Sphinx>=4.1,<4.2
30+
sphinx42: Sphinx>=4.2,<4.3
31+
sphinx43: Sphinx>=4.3,<4.4
32+
sphinx44: Sphinx>=4.4,<4.5
33+
sphinx45: Sphinx>=4.5,<4.6
34+
sphinx50: Sphinx>=5.0,<5.1
35+
sphinx51: Sphinx>=5.1,<5.2
36+
sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42}: docutils<0.18
2837
sphinxlatest: Sphinx
2938
commands =
3039
pytest {posargs} tests/

0 commit comments

Comments
 (0)