diff options
| author | Matti Picus <matti.picus@gmail.com> | 2020-11-09 09:21:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 09:21:44 +0200 |
| commit | 99dfa94528046b8b825adfe5c577a72b7e170b9f (patch) | |
| tree | 38fa06f9aa4054fdc77d53d747c730180235aee4 /numpy | |
| parent | 5f071c67660dd3eedd6eddb39681cd2943166e68 (diff) | |
| parent | 761641f4ce8e17ee53fd6964dcac90c8c7eebdf6 (diff) | |
| download | numpy-99dfa94528046b8b825adfe5c577a72b7e170b9f.tar.gz | |
Merge pull request #17729 from virtuald/get-np-dir-separate
BLD: Use importlib to find numpy root directory in distutils
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/misc_util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 778723bfe..a8e19d52c 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -9,6 +9,7 @@ import subprocess import shutil import multiprocessing import textwrap +import importlib.util import distutils from distutils.errors import DistutilsError @@ -2122,12 +2123,11 @@ def get_npy_pkg_dir(): environment, and using them when cross-compiling. """ - # XXX: import here for bootstrapping reasons - import numpy d = os.environ.get('NPY_PKG_CONFIG_PATH') if d is not None: return d - d = os.path.join(os.path.dirname(numpy.__file__), + spec = importlib.util.find_spec('numpy') + d = os.path.join(os.path.dirname(spec.origin), 'core', 'lib', 'npy-pkg-config') return d |