From 31afc088b64b8cbfc9761b6ca49d4d22538fcd16 Mon Sep 17 00:00:00 2001
From: Michael Howitz <mh@gocept.com>
Date: Tue, 11 Feb 2020 14:21:04 +0100
Subject: [PATCH] Allow to use a common Sphinx version for Python 2 and 3.

---
 CHANGES.rst | 2 ++
 setup.py    | 2 +-
 tox.ini     | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 86a6a70..158618a 100644
--- 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
index 59a69fa..1a241ab 100644
--- 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
index 8c8d88e..fb50343 100644
--- 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 =