Allow to use a common Sphinx version for Python 2 and 3.

zopefoundation · Feb 11, 2020 · 31afc08 · 31afc08
1 parent 8930f70
commit 31afc08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -9,6 +9,8 @@
   Python 2, but raised ``ForbiddenAttribute`` an Python 3. See
   `zope.interface issue 141 <https://github.com/zopefoundation/zope.interface/issues/141>`_.
 
+- Allow to use a common Sphinx version for Python 2 and 3.
+
 
 5.0.0 (2019-11-11)
 ==================

diff --git a/setup.py b/setup.py
@@ -197,7 +197,7 @@ def __str__(self):
           'test': TESTS_REQUIRE,
           'docs': [
               'Sphinx < 2; python_version < "3"',
-              'Sphinx >= 2; python_version >= "3"',
+              'Sphinx; python_version >= "3"',
               'repoze.sphinx.autointerface',
           ],
       },

diff --git a/tox.ini b/tox.ini
@@ -9,8 +9,11 @@ envlist =
 commands =
     zope-testrunner --test-path=src []
     sphinx-build -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
+extras =
+    test
+    docs
 deps =
-    .[test,docs]
+    py27,py27-watch,pypy: sphinxcontrib-websupport < 1.2
 
 [testenv:py27-watch]
 basepython =