start replacing distutils by setuptools

Author: fchapoton

src/sage_setup/command/sage_build_cython.py

@@ -9,9 +9,7 @@
 import time
 import json
 from distutils import log
-from distutils.cmd import Command
-from distutils.errors import (DistutilsModuleError,
-                              DistutilsOptionError)
+from setuptools import Command
 
 from sage_setup.util import stable_uniq
 from sage_setup.find import find_extra_files
@@ -130,12 +128,12 @@ def finalize_options(self):
         try:
             self.parallel = int(self.parallel)
         except ValueError:
-            raise DistutilsOptionError("parallel should be an integer")
+            raise ValueError("parallel should be an integer")
 
         try:
             import Cython
         except ImportError:
-            raise DistutilsModuleError(
+            raise ImportError(
                 "Cython must be installed and importable in order to run "
                 "the cythonize command")
 

src/sage_setup/find.py

@@ -1,16 +1,15 @@
 """
 Recursive Directory Contents
 """
-#*****************************************************************************
+# ****************************************************************************
 #       Copyright (C) 2014 Volker Braun <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 #                  http://www.gnu.org/licenses/
-#*****************************************************************************
-
+# ****************************************************************************
 
 import importlib.machinery
 import importlib.util
@@ -19,6 +18,7 @@
 
 from collections import defaultdict
 
+
 def read_distribution(src_file):
     """
     Parse ``src_file`` for a ``# sage_setup: distribution = PKG`` directive.
@@ -58,6 +58,7 @@ def read_distribution(src_file):
                     return value
     return ''
 
+
 def find_python_sources(src_dir, modules=['sage'], distributions=None):
     """
     Find all Python packages and Python/Cython modules in the sources.
@@ -115,7 +116,7 @@ def find_python_sources(src_dir, modules=['sage'], distributions=None):
     Filtering by distribution (distutils package)::
 
         sage: find_python_sources(SAGE_SRC, distributions=['sage-tdlib'])
-        ([], [], [<distutils.extension.Extension('sage.graphs.graph_decompositions.tdlib')...>])
+        ([], [], [<setuptools.extension.Extension('sage.graphs.graph_decompositions.tdlib')...>])
 
     Benchmarking::
 
@@ -130,7 +131,7 @@ def find_python_sources(src_dir, modules=['sage'], distributions=None):
         sage: find_python_sources(SAGE_SRC, modules=['sage_setup'])
         (['sage_setup', ...], [...'sage_setup.find'...], [])
     """
-    from distutils.extension import Extension
+    from setuptools import Extension
 
     PYMOD_EXT = get_extensions('source')[0]
     INIT_FILE = '__init__' + PYMOD_EXT
@@ -172,6 +173,7 @@ def is_in_distributions(filename):
         os.chdir(cwd)
     return python_packages, python_modules, cython_modules
 
+
 def find_extra_files(src_dir, modules, cythonized_dir, special_filenames=[]):
     """
     Find all extra files which should be installed.

src/sage_setup/optional_extension.py

@@ -7,18 +7,17 @@
 package which must be installed.
 """
 
-#*****************************************************************************
+# ****************************************************************************
 #       Copyright (C) 2015 Jeroen Demeyer <[email protected]>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
+#                  https://www.gnu.org/licenses/
+# ****************************************************************************
 
-
-from distutils.extension import Extension
+from setuptools.extension import Extension
 from sage.misc.package import list_packages
 
 all_packages = list_packages(local=True)
@@ -40,6 +39,7 @@ class CythonizeExtension(Extension):
     """
     skip_build = True
 
+
 def is_package_installed_and_updated(pkg):
     from sage.misc.package import is_package_installed
     try:
@@ -51,6 +51,7 @@ def is_package_installed_and_updated(pkg):
         condition = (pkginfo["installed_version"] == pkginfo["remote_version"])
     return condition
 
+
 def OptionalExtension(*args, **kwds):
     """
     If some condition (see INPUT) is satisfied, return an ``Extension``.