Require Sphinx 3.0

Author: saimn

setup.cfg

@@ -20,7 +20,7 @@ packages = find:
 python_requires = >=3.7
 install_requires =
     packaging
-    sphinx>=1.7
+    sphinx>=3.0.0
     astropy-sphinx-theme
     numpydoc
     sphinx-automodapi

sphinx_astropy/conf/v1.py

@@ -15,6 +15,7 @@
 
 from os import path
 
+import astropy_sphinx_theme
 import sphinx
 from packaging.version import Version
 
@@ -34,7 +35,7 @@
 # minor parts of the version number, not the micro.  To do a more
 # specific version check, call check_sphinx_version("x.y.z.") from
 # your project's conf.py
-needs_sphinx = '1.7'
+needs_sphinx = '3.0'
 
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
@@ -64,7 +65,8 @@ def check_sphinx_version(expected_version):
     'matplotlib': ('https://matplotlib.org/stable/',
                    (None, 'http://data.astropy.org/intersphinx/matplotlib.inv')),
     'astropy': ('https://docs.astropy.org/en/stable/', None),
-    'h5py': ('https://docs.h5py.org/en/stable/', None)}
+    'h5py': ('https://docs.h5py.org/en/stable/', None),
+}
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -270,7 +272,6 @@ def check_sphinx_version(expected_version):
 # pixels large.
 
 # We include by default the favicon that is in the bootstrap-astropy theme.
-import astropy_sphinx_theme
 html_theme_path = astropy_sphinx_theme.get_html_theme_path()
 html_favicon = os.path.join(html_theme_path[0], html_theme, 'static', 'astropy_logo.ico')
 

sphinx_astropy/ext/__init__.py

@@ -1,2 +1 @@
-from __future__ import division, absolute_import, print_function
 

sphinx_astropy/ext/changelog_links.py

@@ -4,8 +4,6 @@
 GitHub issues.
 """
 
-from __future__ import print_function
-
 import re
 from docutils.nodes import Text, reference
 

sphinx_astropy/ext/intersphinx_toggle.py

@@ -9,18 +9,12 @@
 
 This is used e.g. by astropy-helpers when using the build_docs command.
 """
-from packaging.version import Version
 
-from sphinx import __version__
-
-SPHINX_LT_18 = Version(__version__) < Version('1.8')
+from sphinx.util.console import bold
+from sphinx.util import logging
 
 
 def disable_intersphinx(app, config=None):
-
-    from sphinx.util.console import bold
-
-    from sphinx.util import logging
     info = logging.getLogger(__name__).info
 
     if app.config.disable_intersphinx:
@@ -29,16 +23,7 @@ def disable_intersphinx(app, config=None):
 
 
 def setup(app):
-
-    # Note that the config-inited setting was only added in Sphinx 1.8. For
-    # earlier versions we use builder-inited but we need to be careful in what
-    # order the extensions are declared so that this happens before intersphinx.
-    if SPHINX_LT_18:
-        app.connect('builder-inited', disable_intersphinx)
-    else:
-        app.connect('config-inited', disable_intersphinx)
-
+    app.connect('config-inited', disable_intersphinx)
     app.add_config_value('disable_intersphinx', 0, True)
-
     return {'parallel_read_safe': True,
             'parallel_write_safe': True}

sphinx_astropy/ext/missing_static.py

@@ -5,12 +5,7 @@
 a static directory to be present but it isn't.
 """
 import os
-from packaging.version import Version
-
-from sphinx import __version__
-
-SPHINX_LT_18 = Version(__version__) < Version('1.8')
-
+from sphinx.util import logging
 
 WARNING_TEMPLATE = """
 Note: The static directory '{0}' was not found. This is often because it is
@@ -22,8 +17,6 @@
 
 
 def static_warning(app, config=None):
-
-    from sphinx.util import logging
     info = logging.getLogger(__name__).info
 
     for directory in app.config.html_static_path:
@@ -32,7 +25,6 @@ def static_warning(app, config=None):
 
 
 def setup(app):
-
     app.connect('build-finished', static_warning)
 
     return {'parallel_read_safe': True,