Commit 60abc4ea authored by Jason R. Coombs's avatar Jason R. Coombs Committed by GitHub

Merge pull request #774 from vallsv/patch-1

Use LooseVersion instread of StrictVersion
parents 64b10c60 fa187c39
...@@ -6,7 +6,7 @@ import sys ...@@ -6,7 +6,7 @@ import sys
import platform import platform
import itertools import itertools
import distutils.errors import distutils.errors
from distutils.version import StrictVersion from distutils.version import LooseVersion
from setuptools.extern.six.moves import filterfalse from setuptools.extern.six.moves import filterfalse
...@@ -229,7 +229,7 @@ def msvc14_gen_lib_options(*args, **kwargs): ...@@ -229,7 +229,7 @@ def msvc14_gen_lib_options(*args, **kwargs):
""" """
if "numpy.distutils" in sys.modules: if "numpy.distutils" in sys.modules:
import numpy as np import numpy as np
if StrictVersion(np.__version__) < StrictVersion('1.11.2'): if LooseVersion(np.__version__) < LooseVersion('1.11.2'):
return np.distutils.ccompiler.gen_lib_options(*args, **kwargs) return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
return unpatched['msvc14_gen_lib_options'](*args, **kwargs) return unpatched['msvc14_gen_lib_options'](*args, **kwargs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment