Merge d726f9d into 8930f70

.travis.yml

@@ -72,21 +72,21 @@ before_install:
     fi
 
 install:
-  - pip install -U pip setuptools
-  - pip install -U coveralls coverage
+  - python -m pip install -U pip setuptools
+  - python -m pip install -U coveralls coverage
   # pip install zope.proxy here because because setup_requires will use
   # easy_install, which fails on Python 3.5 on Mac OS
-  - pip install -U zope.proxy
-  - pip install -U -e .[test,docs]
+  - python -m pip install -U zope.proxy
+  - python -m pip install -U -e .[test,docs]
 
 script:
   - python --version
-  - coverage run -m zope.testrunner --test-path=src
-  - coverage run -a -m sphinx -b doctest -d docs/_build/doctrees docs docs/_build/doctest
+  - python -m coverage run -m zope.testrunner --test-path=src
+  - python -m coverage run -a -m sphinx -b doctest -d docs/_build/doctrees docs docs/_build/doctest
   - python setup.py bdist_wheel
 
 after_success:
-  - coveralls
+  - python -m coveralls
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       # macpython 3.5 doesn't support recent TLS protocols which causes twine

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)
 ==================

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',
           ],
       },

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 =