From d82afd0c18c7c5eab5317d210030b420568a4561 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Wed, 5 Oct 2022 11:43:13 +0200 Subject: [PATCH 1/3] Refines tox matrix, adds a new target "sphinxdev" that can test the latest upstream development branch --- tox.ini | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 3c00b01eb..a4b7fef36 100644 --- a/tox.ini +++ b/tox.ini @@ -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{2,27}-sphinx{16,17,18}{-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,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 From a88e51b8f141a5bfe2061f76f6dd6ad429cca62b Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 10 Oct 2022 21:18:31 +0200 Subject: [PATCH 2/3] Adds missing tox environments in circle ci config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3963cae26..ac8a66583 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 From 13ec2614f5a2e6bc272daa3e9b53bd91a507a29d Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Tue, 11 Oct 2022 13:41:25 +0200 Subject: [PATCH 3/3] Remove odd undefined py2 and py3 tox environments --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index a4b7fef36..356006e44 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = # Python 2.7 support was removed in Sphinx 2 - py{2,27}-sphinx{16,17,18}{-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,52,latest}{-html4,-html5,}{-qa,} + 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,}