summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-12-17 10:14:50 -0700
committerCharles Harris <charlesr.harris@gmail.com>2015-12-17 10:14:50 -0700
commit207b8385697deb164a6511e9bb71c7a899f633ca (patch)
tree30cd16c05a188d1dd2fc3b413b233a868c9b39d7
parenta32a78643c7ba3dfe9a8c9079e620bcf9926b419 (diff)
parent18b01010077b034556cdb73b751544a06f48dcdc (diff)
downloadnumpy-207b8385697deb164a6511e9bb71c7a899f633ca.tar.gz
Merge pull request #6848 from heni/fix/bdist_egg-support
BLD: use setuptools for bdist_egg distributions
-rwxr-xr-xsetup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 36889cc42..80ddd8ac3 100755
--- a/setup.py
+++ b/setup.py
@@ -237,9 +237,9 @@ def setup_package():
FULLVERSION, GIT_REVISION = get_version_info()
metadata['version'] = FULLVERSION
else:
- if (len(sys.argv) >= 2 and sys.argv[1] == 'bdist_wheel' or
+ if (len(sys.argv) >= 2 and sys.argv[1] in ('bdist_wheel', 'bdist_egg') or
sys.version_info[0] < 3 and sys.platform == "win32"):
- # bdist_wheel and the MS python2.7 VS sdk needs setuptools
+ # bdist_wheel, bdist_egg and the MS python2.7 VS sdk needs setuptools
# the latter can also be triggered by (see python issue23246)
# SET DISTUTILS_USE_SDK=1
# SET MSSdk=1