Skip to content

Commit 20607e8

Browse files
authored
Additions to Tox and Circle CI matrix (#1349)
* Refines tox matrix, adds a new target "sphinxdev" that can test the latest upstream development branch * Adds missing tox environments in circle ci config * Remove odd undefined py2 and py3 tox environments
1 parent b33f27c commit 20607e8

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ commands:
1111
type: string
1212
sphinx-version:
1313
type: string
14-
default: "16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,50,51,52,latest"
14+
default: "16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42,43,44,45,50,51,52,latest"
1515
steps:
1616
- checkout
1717
- run: pip install --user tox

tox.ini

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
[tox]
22
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,}
5-
py{310}-sphinx{42,43,44,45,50,51,latest}{-html4,-html5,}{-qa,}
3+
# Python 2.7 support was removed in Sphinx 2
4+
py{27}-sphinx{16,17,18}{-html4,-html5,}{-qa,}
5+
py{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,52,latest}{-html4,-html5,}{-qa,}
6+
# Python 3.10 working from Sphinx 4.2 and up
7+
py{310}-sphinx{42,43,44,45,50,51,52}{-html4,-html5,latest}{-qa,}
68

79
[testenv]
810
setev =
@@ -35,8 +37,12 @@ deps =
3537
sphinx50: Sphinx>=5.0,<5.1
3638
sphinx51: Sphinx>=5.1,<5.2
3739
sphinx52: Sphinx>=5.2,<5.3
40+
# All these Sphinx versions actually break since docutils 0.18, so we need to add this upper bound
41+
# Projects using these Sphinx versions will have to do the same
42+
# See: https://github.com/readthedocs/sphinx_rtd_theme/pull/1304
3843
sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42}: docutils<0.18
3944
sphinxlatest: Sphinx
45+
sphinxdev: https://github.com/sphinx-doc/sphinx/archive/refs/heads/master.zip
4046
commands =
4147
pytest {posargs} tests/
4248
!html4: sphinx-build -b html -Dhtml4_writer=0 -d {envtmpdir}/doctrees docs/ {envtmpdir}/html

0 commit comments

Comments
 (0)