Commit 11db2604 authored by Jason R. Coombs's avatar Jason R. Coombs Committed by GitHub

Merge pull request #775 from vallsv/patch-2

Use LegacyVersion instead of LooseVersion
parents 60abc4ea 54343cda
...@@ -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 LooseVersion from pkg_resources.extern.packaging.version import LegacyVersion
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 LooseVersion(np.__version__) < LooseVersion('1.11.2'): if LegacyVersion(np.__version__) < LegacyVersion('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