Merge pull request #2978 from abravalheri/revert-sphinx-workaround

Remove workaround for test/CI dependency on Sphinx
pypa · Dec 28, 2021 · b324f92 · b324f92
2 parents 7f79574 + 5c24a55
commit b324f92
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -61,7 +61,7 @@ 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 =

diff --git 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 =