diff options
author | J. Goutin <JGoutin@users.noreply.github.com> | 2016-08-18 13:42:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-18 13:42:07 +0200 |
commit | 8d1eecaef52a1baf2b9fc6c772880d8c537b562f (patch) | |
tree | c8567fe77405921b10d31323a14ee36b2c7df696 /setuptools/msvc.py | |
parent | 21be70b60cfea8da91df4687a21f262a59809073 (diff) | |
download | python-setuptools-git-8d1eecaef52a1baf2b9fc6c772880d8c537b562f.tar.gz |
Add numpy version check
Diffstat (limited to 'setuptools/msvc.py')
-rw-r--r-- | setuptools/msvc.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index 360c1a68..bffaa6aa 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -6,6 +6,7 @@ import sys import platform import itertools import distutils.errors +from distutils.version import StrictVersion from setuptools.extern.six.moves import filterfalse @@ -228,9 +229,9 @@ def msvc14_gen_lib_options(*args, **kwargs): """ if "numpy.distutils" in sys.modules: import numpy as np - return np.distutils.ccompiler.gen_lib_options(*args, **kwargs) - else: - return unpatched['msvc14_gen_lib_options'](*args, **kwargs) + if StrictVersion(np.__version__) < StrictVersion('1.11.2'): + return np.distutils.ccompiler.gen_lib_options(*args, **kwargs) + return unpatched['msvc14_gen_lib_options'](*args, **kwargs) def _augment_exception(exc, version, arch=''): |