Merge pull request #289 from mattiaverga/numpy-distutils-removal

Remove calls to numpy.distutils
dstndstn · Jan 30, 2024 · e1fcd4c · e1fcd4c
2 parents 35435dc + 6b98ac6
commit e1fcd4c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/libkd/setup-min.py b/libkd/setup-min.py
@@ -2,11 +2,10 @@
 # Licensed under a 3-clause BSD style license - see LICENSE
 from __future__ import print_function
 from distutils.core import setup, Extension
-import numpy
 import os.path
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-numpy_inc = get_numpy_include_dirs()
+from numpy import get_include
+numpy_inc = get_include()
 print('Numpy inc:', numpy_inc)
 
 def strlist(s, split=' '):
@@ -29,7 +28,7 @@ def strlist(s, split=' '):
 
 c_module = Extension('spherematch_c',
                      sources = ['pyspherematch.c'],
-                     include_dirs = numpy_inc + inc,
+                     include_dirs = [numpy_inc] + inc,
                      extra_objects = ['libkd-min.a'],
                      extra_compile_args = cflags,
                      extra_link_args=link,

diff --git a/libkd/setup.py b/libkd/setup.py
@@ -2,11 +2,10 @@
 # This file is part of libkd.
 # Licensed under a 3-clause BSD style license - see LICENSE
 from distutils.core import setup, Extension
-import numpy
 import os.path
 
 from numpy import get_include
-numpy_inc = [get_include()]
+numpy_inc = get_include()
 
 def strlist(s, split=' '):
     lst = s.split(split)
@@ -28,7 +27,7 @@ def strlist(s, split=' '):
 
 c_module = Extension('spherematch_c',
                      sources = ['pyspherematch.c'],
-                     include_dirs = numpy_inc + inc,
+                     include_dirs = [numpy_inc] + inc,
                      extra_objects = objs,
                      extra_compile_args = cflags,
                      extra_link_args=link,

diff --git a/setup-libkd.py b/setup-libkd.py
@@ -1,8 +1,8 @@
 import os
 from distutils.core import setup, Extension
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-numpy_inc = get_numpy_include_dirs()
+from numpy import get_include
+numpy_inc = get_include()
 
 inc = ['include', 'include/astrometry', 'util', 'qfits-an']
 
@@ -37,7 +37,7 @@
 
 ext = Extension('astrometry.libkd.spherematch_c',
                 sources = srcs,
-                include_dirs = numpy_inc + inc,
+                include_dirs = [numpy_inc] + inc,
                 )
 
 setup(name='libkd',