Refactor distutils -> setuptools

doc/build.rst

@@ -63,7 +63,7 @@ In Ubunutu 20.04::
  $ sudo apt install build-essential curl git file pkg-config swig \
  libcairo2-dev libnetpbm10-dev netpbm libpng-dev libjpeg-dev \
  zlib1g-dev libbz2-dev libcfitsio-dev wcslib-dev \
- python3 python3-pip python3-distutils python3-dev \
+ python3 python3-pip python3-dev \
  python3-numpy python3-scipy python3-pil
  $ pip install fitsio # or astropy
 

libkd/setup-min.py

@@ -1,7 +1,7 @@
 # This file is part of libkd.
 # Licensed under a 3-clause BSD style license - see LICENSE
 from __future__ import print_function
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 import os.path
 
 from numpy import get_include

libkd/setup.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 # This file is part of libkd.
 # Licensed under a 3-clause BSD style license - see LICENSE
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 import os.path
 
 from numpy import get_include

plot/setup.py

@@ -13,7 +13,7 @@
 from an_build_ext import an_build_ext
 from setuputils import *
 
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 
 import numpy
 numpy_inc = numpy.get_include()

sdss/setup.py

@@ -1,6 +1,6 @@
 # This file is part of the Astrometry.net suite.
 # Licensed under a 3-clause BSD style license - see LICENSE
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 import os
 import sys
 

setup-libkd.py

@@ -1,5 +1,5 @@
 import os
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 
 from numpy import get_include
 numpy_inc = get_include()

setup.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 from setuptools.command.install import install
 import subprocess
 import os

solver/setup-solver.py

@@ -11,7 +11,7 @@
 
 
 from an_build_ext import an_build_ext
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 import numpy
 
 numpy_inc = [numpy.get_include()]

util/an_build_ext.py

@@ -1,9 +1,14 @@
 # This file is part of the Astrometry.net suite.
 # Licensed under a 3-clause BSD style license - see LICENSE
-from distutils.command.build_ext import build_ext # as _build_py
-#from distutils.command import build_ext as _build_ext
-from distutils.dep_util import newer_group, newer
-from distutils import log
+from setuptools.command.build_ext import build_ext # as _build_py
+#from setuptools.command import build_ext as _build_ext
+try:
+ from setuptools.modified import newer_group, newer
+except ModuleNotFoundError:
+ from setuptools import distutils
+ newer_group = distutils.dep_util.newer_group
+ newer = distutils.dep_util.newer
+import logging as log
 import os
 
 class an_build_ext(build_ext):

util/makefile.common

@@ -118,16 +118,16 @@ SHAREDLIBFLAGS_DEF := $(shell $(LINKTEST))
 SHAREDLIB_SUFFIX = so
 
 # Cygwin peculiarities:
-# --.dll filename suffix for shared libraries (created by python distutils)
+# --.dll filename suffix for shared libraries (created by python setuptools)
 # -- -fPIC produces warnings
 
 UNAME = $(shell uname -s)
 ifneq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
  SHAREDLIBFLAGS_DEF += -fPIC
 endif 
 
-# Get the library suffix used by python distutils (.dll on cygwin, .so elsewhere for py2; .PLATFORM.so for py3)
-PYTHON_SO_EXT ?= $(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))")
+# Get the library suffix used by python sysconfig (.dll on cygwin, .so elsewhere for py2; .PLATFORM.so for py3)
+PYTHON_SO_EXT ?= $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))")
 
 # Set a default, otherwise terrible things happen:
 # in util/Makefile : clean: rm -f *$(PYTHON_SO_EXT)

util/setup.py

@@ -9,7 +9,7 @@
 
 from an_build_ext import *
 
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 import numpy
 from setuputils import *