summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2021-12-28 16:23:59 -0500
committerGitHub <noreply@github.com>2021-12-28 16:23:59 -0500
commitb324f92d0a9583f07c137d29d4c68f2ae7fc4b68 (patch)
tree4e7fbed4252a63772a13d9b9a77d7a7561014b49
parent7f795745bc23880ba8f40033a1ef3210c0718396 (diff)
parent5c24a555a322e9fd987fb2d82782858971795361 (diff)
downloadpython-setuptools-git-b324f92d0a9583f07c137d29d4c68f2ae7fc4b68.tar.gz
Merge pull request #2978 from abravalheri/revert-sphinx-workaround
Remove workaround for test/CI dependency on Sphinx
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini3
2 files changed, 1 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg
index 23c7d1ea..9ae3e02c 100644
--- 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
index 25b4eaf0..145c2209 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 =