Require Sphinx 1.6 or newer

AA-Turner · bitprophet · commit 0bd2b356dbcd · 2023-01-12T19:53:15.000-05:00
diff --git a/alabaster/__init__.py b/alabaster/__init__.py
@@ -16,9 +16,8 @@ def update_context(app, pagename, templatename, context, doctree):
 
 
 def setup(app):
-    # add_html_theme is new in Sphinx 1.6+
-    if hasattr(app, "add_html_theme"):
-        theme_path = os.path.abspath(os.path.dirname(__file__))
-        app.add_html_theme("alabaster", theme_path)
+    app.require_sphinx("1.6")
+    theme_path = os.path.abspath(os.path.dirname(__file__))
+    app.add_html_theme("alabaster", theme_path)
     app.connect("html-page-context", update_context)
     return {"version": version.__version__, "parallel_read_safe": True}
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,4 +1,4 @@
-sphinx>=1.3,<1.8
+sphinx>=1.6
 invoke>=1.0.0
 invocations>=1.2.0
 semantic_version>=2.4,<2.5
diff --git a/docs/installation.rst b/docs/installation.rst
@@ -2,43 +2,20 @@
 Installation
 ============
 
-The bare minimum required to install Alabaster is as follows:
+Alabaster requires **Sphinx 1.6 or newer**, and is included as the default
+theme.
 
-* If you're on **Sphinx 1.2 or older**:
+.. note::
+  If you distribute your documentation via `Read the Docs
+  <https://readthedocs.org>`_, you will need to explicitly enable
+  Alabaster by adding this line to your ``conf.py``::
 
-    * ``pip install alabaster`` or equivalent.
-    * Add the following to your ``conf.py`` so Alabaster's theme location &
-      mini-extension are located & loaded:
+  .. code:: python
 
-       .. code-block:: python
+     html_theme = 'alabaster'
 
-            import alabaster
-
-            html_theme_path = [alabaster.get_path()]
-            extensions = ['alabaster']
-            html_theme = 'alabaster'
-
-    * If you've installed Alabaster by hand (without using ``pip``) and/or are
-      doing funky things to your PYTHONPATH, you may need to replace the
-      ``alabaster.get_path()`` call with your own explicit string, as per `the
-      Sphinx config docs
-      <http://sphinx-doc.org/config.html#confval-html_theme_path>`_.
-
-* If you have **Sphinx 1.3 or above**:
-
-    * You already have Alabaster installed as a dependency! No need to manually
-      install it or explicitly load it.
-
-      .. note::
-        If you distribute your documentation via the excellent `Read the Docs
-        <https://readthedocs.org>`_, you may need to explicitly enable
-        Alabaster (as RTD defaults to using its own theme) by adding this line
-        to your ``conf.py``::
-
-            html_theme = 'alabaster'
-
-* **Either way**, add an explicit ``html_sidebars`` setting so Alabaster's
-  customized sidebar templates are loaded:
+To set-up Alabaster, add an explicit ``html_sidebars`` setting so
+Alabaster's customized sidebar templates are loaded:
    
    .. code-block:: python
     

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-sphinx>=1.3,<1.8`
	`1`	`+sphinx>=1.6`
`2`	`2`	`invoke>=1.0.0`
`3`	`3`	`invocations>=1.2.0`
`4`	`4`	`semantic_version>=2.4,<2.5`