diff options
| author | Valentin Valls <valentin.valls@esrf.fr> | 2016-09-06 11:10:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 11:10:34 +0200 |
| commit | 54343cdaee7de324b15f3ace93657f34a53c5e34 (patch) | |
| tree | eaf4fab2656810069786c3dd84ea29c96e0f3d4b /setuptools/msvc.py | |
| parent | 60abc4ea72003ea21b28a03249537f30060a71d4 (diff) | |
| download | external_python_setuptools-54343cdaee7de324b15f3ace93657f34a53c5e34.tar.gz external_python_setuptools-54343cdaee7de324b15f3ace93657f34a53c5e34.tar.bz2 external_python_setuptools-54343cdaee7de324b15f3ace93657f34a53c5e34.zip | |
Use LegacyVersion instead of LooseVersion
- Also apply the patch for numpy 1.11.2 pre release
Diffstat (limited to 'setuptools/msvc.py')
| -rw-r--r-- | setuptools/msvc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index c7dd7976..ecbea818 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -6,7 +6,7 @@ import sys import platform import itertools import distutils.errors -from distutils.version import LooseVersion +from pkg_resources.extern.packaging.version import LegacyVersion from setuptools.extern.six.moves import filterfalse @@ -229,7 +229,7 @@ def msvc14_gen_lib_options(*args, **kwargs): """ if "numpy.distutils" in sys.modules: 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 unpatched['msvc14_gen_lib_options'](*args, **kwargs) |