Show More
@@ -19,13 +19,14 b' requires utilities which are not available under Windows."""' | |||
|
19 | 19 | |
|
20 | 20 | from __future__ import print_function |
|
21 | 21 | |
|
22 | import os | |
|
22 | 23 | import sys |
|
23 | 24 | |
|
24 | 25 | # **Python version check** |
|
25 | 26 | # |
|
26 | 27 | # This check is also made in IPython/__init__, don't forget to update both when |
|
27 | 28 | # changing Python version requirements. |
|
28 | if sys.version_info < (3,3): | |
|
29 | if sys.version_info < (3, 3): | |
|
29 | 30 | pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.' |
|
30 | 31 | try: |
|
31 | 32 | import pip |
@@ -55,15 +56,6 b' Python {py} detected.' | |||
|
55 | 56 | |
|
56 | 57 | # At least we're on the python version we need, move on. |
|
57 | 58 | |
|
58 | #------------------------------------------------------------------------------- | |
|
59 | # Imports | |
|
60 | #------------------------------------------------------------------------------- | |
|
61 | ||
|
62 | # Stdlib imports | |
|
63 | import os | |
|
64 | ||
|
65 | from glob import glob | |
|
66 | ||
|
67 | 59 | # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly |
|
68 | 60 | # update it when the contents of directories change. |
|
69 | 61 | if os.path.exists('MANIFEST'): os.remove('MANIFEST') |
@@ -162,10 +154,10 b" setup_args['cmdclass'] = {" | |||
|
162 | 154 | |
|
163 | 155 | # For some commands, use setuptools. Note that we do NOT list install here! |
|
164 | 156 | # If you want a setuptools-enhanced install, just run 'setupegg.py install' |
|
165 |
needs_setuptools = |
|
|
157 | needs_setuptools = {'develop', 'release', 'bdist_egg', 'bdist_rpm', | |
|
166 | 158 | 'bdist', 'bdist_dumb', 'bdist_wininst', 'bdist_wheel', |
|
167 | 159 | 'egg_info', 'easy_install', 'upload', 'install_egg_info', |
|
168 |
|
|
|
160 | } | |
|
169 | 161 | |
|
170 | 162 | if len(needs_setuptools.intersection(sys.argv)) > 0: |
|
171 | 163 | import setuptools |
General Comments 0
You need to be logged in to leave comments.
Login now