diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2019-11-24 22:25:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 22:25:58 -0800 |
| commit | 51b04a56a89eebbd5618ad4fec8161efa49591c2 (patch) | |
| tree | 864ff5ab27ae727bc322118c6b10c46e0793d447 | |
| parent | ba834997aa5555926ec2464b4d27309f9dbb0eb8 (diff) | |
| parent | f37907ba674e8865aa41039bcce8a0057deef512 (diff) | |
| download | numpy-51b04a56a89eebbd5618ad4fec8161efa49591c2.tar.gz | |
Merge pull request #14974 from ilayn/os_add_dll_dir
MAINT: Added Python3.8 branch to dll lib discovery on Windows
| -rw-r--r-- | numpy/distutils/misc_util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 7ba8ad862..d46ff8981 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -2329,8 +2329,11 @@ def generate_config_py(target): extra_dll_dir = os.path.join(os.path.dirname(__file__), '.libs') if sys.platform == 'win32' and os.path.isdir(extra_dll_dir): - os.environ.setdefault('PATH', '') - os.environ['PATH'] += os.pathsep + extra_dll_dir + if sys.version_info >= (3, 8): + os.add_dll_directory(extra_dll_dir) + else: + os.environ.setdefault('PATH', '') + os.environ['PATH'] += os.pathsep + extra_dll_dir """)) |