##// END OF EJS Templates
Merge pull request #10099 from takluyver/rm-py2-requires...
Matthias Bussonnier -
r23042:5e96a045 merge
parent child Browse files
Show More
@@ -212,20 +212,15 b' install_requires = ['
212 # but requires pip >= 6. pip < 6 ignores these.
212 # but requires pip >= 6. pip < 6 ignores these.
213
213
214 extras_require.update({
214 extras_require.update({
215 ':python_version == "2.7"': ['backports.shutil_get_terminal_size'],
215 ':python_version == "3.3"': ['pathlib2'],
216 ':python_version == "2.7" or python_version == "3.3"': ['pathlib2'],
217 ':sys_platform != "win32"': ['pexpect'],
216 ':sys_platform != "win32"': ['pexpect'],
218 ':sys_platform == "darwin"': ['appnope'],
217 ':sys_platform == "darwin"': ['appnope'],
219 ':sys_platform == "win32"': ['colorama'],
218 ':sys_platform == "win32"': ['colorama'],
220 ':sys_platform == "win32" and python_version < "3.6"': ['win_unicode_console>=0.5'],
219 ':sys_platform == "win32" and python_version < "3.6"': ['win_unicode_console>=0.5'],
221 'test:python_version == "2.7"': ['mock'],
222 })
220 })
223 # FIXME: re-specify above platform dependencies for pip < 6
221 # FIXME: re-specify above platform dependencies for pip < 6
224 # These would result in non-portable bdists.
222 # These would result in non-portable bdists.
225 if not any(arg.startswith('bdist') for arg in sys.argv):
223 if not any(arg.startswith('bdist') for arg in sys.argv):
226 if sys.version_info < (3, 3):
227 extras_require['test'].append('mock')
228
229 if sys.platform == 'darwin':
224 if sys.platform == 'darwin':
230 install_requires.extend(['appnope'])
225 install_requires.extend(['appnope'])
231
226
General Comments 0
You need to be logged in to leave comments. Login now