Author: Matti Picus <[email protected]>
Branch: msvc-discovery
Changeset: r98032:ad2012524c8e
Date: 2019-11-12 06:51 -0500
http://bitbucket.org/pypy/pypy/changeset/ad2012524c8e/
Log: delay problematic import
diff --git a/rpython/tool/setuptools_msvc.py b/rpython/tool/setuptools_msvc.py
--- a/rpython/tool/setuptools_msvc.py
+++ b/rpython/tool/setuptools_msvc.py
@@ -32,7 +32,6 @@
import platform
import itertools
import distutils.errors
-from setuptools.extern.packaging.version import LegacyVersion
from setuptools.extern.six.moves import filterfalse
@@ -187,6 +186,7 @@
(for Numpy < 1.11.2)
"""
if "numpy.distutils" in sys.modules:
+ from setuptools.extern.packaging.version import LegacyVersion
import numpy as np
if LegacyVersion(np.__version__) < LegacyVersion('1.11.2'):
return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
