diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-22 09:23:42 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-22 09:23:42 -0400 |
| commit | f6b5e29275f9a54bda847de79760f24a613a3d28 (patch) | |
| tree | 6669f1ad56d804b1018e2412480ff255d991fc20 /setuptools/command/install.py | |
| parent | 97fbee720d6dd5bda37dc2a945d60ec056d49d9e (diff) | |
| parent | 8e3f9d3253d1d0fb820dad4249d5110d017595c1 (diff) | |
| download | python-setuptools-git-f6b5e29275f9a54bda847de79760f24a613a3d28.tar.gz | |
Merge Pull Request 67 from bb://agronholm/bitbucket
Diffstat (limited to 'setuptools/command/install.py')
| -rw-r--r-- | setuptools/command/install.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/setuptools/command/install.py b/setuptools/command/install.py index 1f489734..d2bca2ec 100644 --- a/setuptools/command/install.py +++ b/setuptools/command/install.py @@ -1,22 +1,24 @@ -import setuptools +from distutils.errors import DistutilsArgError import inspect import glob import warnings import platform import distutils.command.install as orig -from distutils.errors import DistutilsArgError + +import setuptools # Prior to numpy 1.9, NumPy relies on the '_install' name, so provide it for -# now. See https://bitbucket.org/pypa/setuptools/issue/199/ +# now. See https://bitbucket.org/pypa/setuptools/issue/199/ _install = orig.install + class install(orig.install): """Use easy_install to install the package, w/dependencies""" user_options = orig.install.user_options + [ ('old-and-unmanageable', None, "Try not to use this!"), ('single-version-externally-managed', None, - "used by system package builders to create 'flat' eggs"), + "used by system package builders to create 'flat' eggs"), ] boolean_options = orig.install.boolean_options + [ 'old-and-unmanageable', 'single-version-externally-managed', @@ -115,7 +117,9 @@ class install(orig.install): cmd.run() setuptools.bootstrap_install_from = None + # XXX Python 3.1 doesn't see _nc if this is inside the class -install.sub_commands = [ - cmd for cmd in orig.install.sub_commands if cmd[0] not in install._nc - ] + install.new_commands +install.sub_commands = ( + [cmd for cmd in orig.install.sub_commands if cmd[0] not in install._nc] + + install.new_commands +) |
