From 2a91fab31b909e36afcf6371697d3b17f9ec0ade Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Mon, 27 Dec 2021 22:11:07 +0000 Subject: [PATCH 1/2] Remove workaround for test/CI dependency on Sphinx It seems that Sphinx now supports Python 3.10, which means that we can remove the dependency workaround. --- setup.cfg | 4 ++-- tox.ini | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3daca1df8d..30ca1945b5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -61,12 +61,12 @@ testing = pip>=19.1 # For proper file:// URLs support. jaraco.envs>=2.2 pytest-xdist - sphinx + sphinx>=4.3.2 jaraco.path>=3.2.0 docs = # upstream - sphinx + sphinx >= 4.3.2 jaraco.packaging >= 8.2 rst.linker >= 1.9 jaraco.tidelift >= 1.4 diff --git a/tox.ini b/tox.ini index 25b4eaf018..145c220996 100644 --- a/tox.ini +++ b/tox.ini @@ -7,9 +7,6 @@ toxworkdir={env:TOX_WORK_DIR:.tox} [testenv] deps = - # workaround for sphinx-doc/sphinx#9562 - # TODO: remove after Sphinx>4.1.2 is available. - sphinx@git+https://github.com/sphinx-doc/sphinx; python_version>="3.10" # TODO: remove after man-group/pytest-plugins#188 is solved pytest-virtualenv @ git+https://github.com/jaraco/pytest-plugins@distutils-deprecated#subdirectory=pytest-virtualenv commands = From 5c24a555a322e9fd987fb2d82782858971795361 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 28 Dec 2021 16:23:39 -0500 Subject: [PATCH 2/2] Leave sphinx unpinned as found upstream. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 30ca1945b5..9135969284 100644 --- a/setup.cfg +++ b/setup.cfg @@ -66,7 +66,7 @@ testing = docs = # upstream - sphinx >= 4.3.2 + sphinx jaraco.packaging >= 8.2 rst.linker >= 1.9 jaraco.tidelift >= 1.4