mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-18 11:55:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove pexpect from external

Browse Source 
make it a dependency on non-Windows
This commit is contained in:
MinRK 2014-10-07 16:13:00 -07:00 committed by Min RK
parent e34f926e0e
commit 3f93c80d7e
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IPython/testing/iptest.py
View File

@ -42,12 +42,6 @@ from IPython.external.decorators import KnownFailure, knownfailureif
pjoin = path.join pjoin = path.join
#-----------------------------------------------------------------------------
# Globals
#-----------------------------------------------------------------------------
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Warnings control # Warnings control
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@ -127,7 +121,7 @@ have = {}
have['curses'] = test_for('_curses') have['curses'] = test_for('_curses')
have['matplotlib'] = test_for('matplotlib') have['matplotlib'] = test_for('matplotlib')
have['numpy'] = test_for('numpy') have['numpy'] = test_for('numpy')
have['pexpect'] = test_for('IPython.external.pexpect') have['pexpect'] = test_for('pexpect')
have['pymongo'] = test_for('pymongo') have['pymongo'] = test_for('pymongo')
have['pygments'] = test_for('pygments') have['pygments'] = test_for('pygments')
have['qt'] = test_for('IPython.external.qt') have['qt'] = test_for('IPython.external.qt')

7
setup.py
View File

@ -273,13 +273,16 @@ install_requires = [
'path.py', # required by pickleshare, remove when pickleshare is added here 'path.py', # required by pickleshare, remove when pickleshare is added here
] ]
# add readline # add platform-specific dependencies
if sys.platform == 'darwin': if sys.platform == 'darwin':
install_requires.append('appnope') install_requires.append('appnope')
if 'bdist_wheel' in sys.argv[1:] or not setupext.check_for_readline(): if 'bdist_wheel' in sys.argv[1:] or not setupext.check_for_readline():
install_requires.append('gnureadline') install_requires.append('gnureadline')
elif sys.platform.startswith('win'):
if sys.platform.startswith('win'):
extras_require['terminal'].append('pyreadline>=2.0') extras_require['terminal'].append('pyreadline>=2.0')
else:
install_requires.append('pexpect')
everything = set() everything = set()
for deps in extras_require.values(): for deps in extras_require.values():

3
setupbase.py
View File

@ -670,7 +670,7 @@ def get_bdist_wheel():
if found: if found:
lis.pop(idx) lis.pop(idx)
for pkg in ("gnureadline", "pyreadline", "mock", "appnope", "terminado"): for pkg in ("gnureadline", "pyreadline", "mock", "terminado", "appnope", "pexpect"):
_remove_startswith(requires, pkg) _remove_startswith(requires, pkg)
requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'") requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'")
requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'") requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'")
@ -679,6 +679,7 @@ def get_bdist_wheel():
requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'")
requires.append("mock; extra == 'test' and python_version < '3.3'") requires.append("mock; extra == 'test' and python_version < '3.3'")
requires.append("appnope; sys.platform == 'darwin'") requires.append("appnope; sys.platform == 'darwin'")
requires.append("pexpect; sys.platform != 'win32'")
for r in requires: for r in requires:
pkg_info['Requires-Dist'] = r pkg_info['Requires-Dist'] = r
write_pkg_info(metadata_path, pkg_info) write_pkg_info(metadata_path, pkg_info)