diff options
| author | Benjamin Balder Bach <benjamin@overtag.dk> | 2022-10-11 15:01:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 15:01:07 +0300 |
| commit | 20607e85259f5a1885505807f932fc16cdad9449 (patch) | |
| tree | 24ef877e36de25e1238af84a2b49cd12862b4313 | |
| parent | b33f27cf95bba370d1c8a92b300daa7c1eb483ff (diff) | |
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
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 3963cae..ac8a665 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ commands: type: string sphinx-version: type: string - default: "16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,50,51,52,latest" + 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" steps: - checkout - run: pip install --user tox @@ -1,8 +1,10 @@ [tox] 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,} - py{310}-sphinx{42,43,44,45,50,51,latest}{-html4,-html5,}{-qa,} + # Python 2.7 support was removed in Sphinx 2 + py{27}-sphinx{16,17,18}{-html4,-html5,}{-qa,} + 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,} + # Python 3.10 working from Sphinx 4.2 and up + py{310}-sphinx{42,43,44,45,50,51,52}{-html4,-html5,latest}{-qa,} [testenv] setev = @@ -35,8 +37,12 @@ deps = sphinx50: Sphinx>=5.0,<5.1 sphinx51: Sphinx>=5.1,<5.2 sphinx52: Sphinx>=5.2,<5.3 + # All these Sphinx versions actually break since docutils 0.18, so we need to add this upper bound + # Projects using these Sphinx versions will have to do the same + # See: https://github.com/readthedocs/sphinx_rtd_theme/pull/1304 sphinx{16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,42}: docutils<0.18 sphinxlatest: Sphinx + sphinxdev: https://github.com/sphinx-doc/sphinx/archive/refs/heads/master.zip commands = pytest {posargs} tests/ !html4: sphinx-build -b html -Dhtml4_writer=0 -d {envtmpdir}/doctrees docs/ {envtmpdir}/html |