From 72b1fe35ff1618fd01554102243266bd35b2ca95 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Wed, 21 Oct 2020 11:08:52 +0100
Subject: [PATCH] Correct the minimum Sphinx version in README (#1320)

* Correct the minimum Sphinx version in README

We require Sphinx >= 2.1.

Related: #1216.

* Restore minimum version for Sphinx; see #1216 and #1276
---
 README.rst | 2 +-
 etstool.py | 2 +-
 setup.py   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 1b0040cde..6ad7dc408 100644
--- a/README.rst
+++ b/README.rst
@@ -55,7 +55,7 @@ Traits has the following optional dependencies:
 
 To build the full documentation one needs:
 
-* `Sphinx <https://pypi.org/project/Sphinx>`_ version 1.8 or later.
+* `Sphinx <https://pypi.org/project/Sphinx>`_ version 2.1 or later.
 * The `Enthought Sphinx Theme <https://pypi.org/project/enthought-sphinx-theme>`_.
   (A version of the documentation can be built without this, but
   some formatting may be incorrect.)
diff --git a/etstool.py b/etstool.py
index 34e7630ff..7ef15ec2a 100644
--- a/etstool.py
+++ b/etstool.py
@@ -93,7 +93,7 @@
     "mypy",
     "numpy",
     "pyqt5",
-    "Sphinx!=3.2.0",
+    "Sphinx",
     "traitsui",
 }
 
diff --git a/setup.py b/setup.py
index 137dc946f..b5c768ee1 100644
--- a/setup.py
+++ b/setup.py
@@ -301,14 +301,14 @@ def get_long_description():
     extras_require={
         "docs": [
             "enthought-sphinx-theme",
-            "Sphinx!=3.2.0",
+            "Sphinx>=2.1.0,!=3.2.0",
         ],
         "test": [
             "Cython",
             "flake8",
             "mypy",
             "setuptools",
-            "Sphinx!=3.2.0",
+            "Sphinx>=2.1.0,!=3.2.0",
             # Python 3.9 exclusions:
             #
             # * NumPy installation fails on Python 3.9 on the Ubuntu Xenial