Merge pull request #51 from pllim/rm-distutils

MNT: Replace distutils with packaging

Author: pllim

CHANGES.rst

@@ -4,6 +4,9 @@ Changes in sphinx-astropy
 1.7 (unreleased)
 ----------------
 
+- Removed dependency on ``distutils``. As a result, ``packaging`` is now
+  a dependency. [#51]
+
 1.6 (2021-09-22)
 ----------------
 

setup.cfg

@@ -19,6 +19,7 @@ zip_safe = False
 packages = find:
 python_requires = >=3.7
 install_requires =
+    packaging
     sphinx>=1.7
     astropy-sphinx-theme
     numpydoc

sphinx_astropy/conf/v1.py

@@ -16,7 +16,7 @@
 from os import path
 
 import sphinx
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 try:
     import astropy
@@ -41,8 +41,8 @@
 
 
 def check_sphinx_version(expected_version):
-    sphinx_version = LooseVersion(sphinx.__version__)
-    expected_version = LooseVersion(expected_version)
+    sphinx_version = Version(sphinx.__version__)
+    expected_version = Version(expected_version)
     if sphinx_version < expected_version:
         raise RuntimeError(
             "At least Sphinx version {0} is required to build this "

sphinx_astropy/ext/intersphinx_toggle.py

@@ -9,14 +9,11 @@
 
 This is used e.g. by astropy-helpers when using the build_docs command.
 """
-
-from __future__ import print_function
-
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 from sphinx import __version__
 
-SPHINX_LT_18 = LooseVersion(__version__) < LooseVersion('1.8')
+SPHINX_LT_18 = Version(__version__) < Version('1.8')
 
 
 def disable_intersphinx(app, config=None):

sphinx_astropy/ext/missing_static.py

@@ -4,15 +4,12 @@
 The purpose of this extension is to give a clear warning if sphinx is expecting
 a static directory to be present but it isn't.
 """
-
-from __future__ import print_function
-
 import os
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 from sphinx import __version__
 
-SPHINX_LT_18 = LooseVersion(__version__) < LooseVersion('1.8')
+SPHINX_LT_18 = Version(__version__) < Version('1.8')
 
 
 WARNING_TEMPLATE = """

sphinx_astropy/tests/test_conf.py

@@ -1,22 +1,4 @@
-from distutils.version import LooseVersion
-
-from sphinx import __version__
-
-SPHINX_LT_17 = LooseVersion(__version__) < LooseVersion('1.7')
-
-if SPHINX_LT_17:
-
-    from sphinx import build_main as build_main_original
-
-    # As of Sphinx 1.7, the first argument is now no longer ignored, so we
-    # construct a wrapper for older versions.
-
-    def build_main(argv=None):
-        argv.insert(0, 'sphinx-build')
-        return build_main_original(argv=argv)
-
-else:
-    from sphinx.cmd.build import build_main
+from sphinx.cmd.build import build_main
 
 BASIC_CONF = """
 from sphinx_astropy.conf import *