Show More
@@ -62,7 +62,7 b' def stop_console(p, pexpect, t):' | |||||
62 |
|
62 | |||
63 | def start_console(): |
|
63 | def start_console(): | |
64 | "Start `ipython console` using pexpect" |
|
64 | "Start `ipython console` using pexpect" | |
65 |
|
|
65 | import pexpect | |
66 |
|
66 | |||
67 | args = ['-m', 'IPython', 'console', '--colors=NoColor'] |
|
67 | args = ['-m', 'IPython', 'console', '--colors=NoColor'] | |
68 | cmd = sys.executable |
|
68 | cmd = sys.executable |
@@ -60,7 +60,7 b' def test_ipython_embed():' | |||||
60 | @skip_win32 |
|
60 | @skip_win32 | |
61 | def test_nest_embed(): |
|
61 | def test_nest_embed(): | |
62 | """test that `IPython.embed()` is nestable""" |
|
62 | """test that `IPython.embed()` is nestable""" | |
63 |
|
|
63 | import pexpect | |
64 | ipy_prompt = r']:' #ansi color codes give problems matching beyond this |
|
64 | ipy_prompt = r']:' #ansi color codes give problems matching beyond this | |
65 |
|
65 | |||
66 |
|
66 |
@@ -42,12 +42,6 b' from IPython.external.decorators import KnownFailure, knownfailureif' | |||||
42 |
|
42 | |||
43 | pjoin = path.join |
|
43 | pjoin = path.join | |
44 |
|
44 | |||
45 |
|
||||
46 | #----------------------------------------------------------------------------- |
|
|||
47 | # Globals |
|
|||
48 | #----------------------------------------------------------------------------- |
|
|||
49 |
|
||||
50 |
|
||||
51 | #----------------------------------------------------------------------------- |
|
45 | #----------------------------------------------------------------------------- | |
52 | # Warnings control |
|
46 | # Warnings control | |
53 | #----------------------------------------------------------------------------- |
|
47 | #----------------------------------------------------------------------------- | |
@@ -127,7 +121,7 b' have = {}' | |||||
127 | have['curses'] = test_for('_curses') |
|
121 | have['curses'] = test_for('_curses') | |
128 | have['matplotlib'] = test_for('matplotlib') |
|
122 | have['matplotlib'] = test_for('matplotlib') | |
129 | have['numpy'] = test_for('numpy') |
|
123 | have['numpy'] = test_for('numpy') | |
130 |
have['pexpect'] = test_for(' |
|
124 | have['pexpect'] = test_for('pexpect') | |
131 | have['pymongo'] = test_for('pymongo') |
|
125 | have['pymongo'] = test_for('pymongo') | |
132 | have['pygments'] = test_for('pygments') |
|
126 | have['pygments'] = test_for('pygments') | |
133 | have['qt'] = test_for('IPython.external.qt') |
|
127 | have['qt'] = test_for('IPython.external.qt') |
@@ -21,7 +21,7 b' import os' | |||||
21 | import subprocess as sp |
|
21 | import subprocess as sp | |
22 | import sys |
|
22 | import sys | |
23 |
|
23 | |||
24 | from IPython.external import pexpect |
|
24 | import pexpect | |
25 |
|
25 | |||
26 | # Our own |
|
26 | # Our own | |
27 | from ._process_common import getoutput, arg_split |
|
27 | from ._process_common import getoutput, arg_split |
@@ -273,13 +273,16 b' install_requires = [' | |||||
273 | 'path.py', # required by pickleshare, remove when pickleshare is added here |
|
273 | 'path.py', # required by pickleshare, remove when pickleshare is added here | |
274 | ] |
|
274 | ] | |
275 |
|
275 | |||
276 | # add readline |
|
276 | # add platform-specific dependencies | |
277 | if sys.platform == 'darwin': |
|
277 | if sys.platform == 'darwin': | |
278 | install_requires.append('appnope') |
|
278 | install_requires.append('appnope') | |
279 | if 'bdist_wheel' in sys.argv[1:] or not setupext.check_for_readline(): |
|
279 | if 'bdist_wheel' in sys.argv[1:] or not setupext.check_for_readline(): | |
280 | install_requires.append('gnureadline') |
|
280 | install_requires.append('gnureadline') | |
281 | elif sys.platform.startswith('win'): |
|
281 | ||
|
282 | if sys.platform.startswith('win'): | |||
282 | extras_require['terminal'].append('pyreadline>=2.0') |
|
283 | extras_require['terminal'].append('pyreadline>=2.0') | |
|
284 | else: | |||
|
285 | install_requires.append('pexpect') | |||
283 |
|
286 | |||
284 | everything = set() |
|
287 | everything = set() | |
285 | for deps in extras_require.values(): |
|
288 | for deps in extras_require.values(): |
@@ -670,7 +670,7 b' def get_bdist_wheel():' | |||||
670 | if found: |
|
670 | if found: | |
671 | lis.pop(idx) |
|
671 | lis.pop(idx) | |
672 |
|
672 | |||
673 |
for pkg in ("gnureadline", "pyreadline", "mock", "appnope", " |
|
673 | for pkg in ("gnureadline", "pyreadline", "mock", "terminado", "appnope", "pexpect"): | |
674 | _remove_startswith(requires, pkg) |
|
674 | _remove_startswith(requires, pkg) | |
675 | requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'") |
|
675 | requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'") | |
676 | requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'") |
|
676 | requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'") | |
@@ -679,6 +679,7 b' def get_bdist_wheel():' | |||||
679 | requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") |
|
679 | requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'") | |
680 | requires.append("mock; extra == 'test' and python_version < '3.3'") |
|
680 | requires.append("mock; extra == 'test' and python_version < '3.3'") | |
681 | requires.append("appnope; sys.platform == 'darwin'") |
|
681 | requires.append("appnope; sys.platform == 'darwin'") | |
|
682 | requires.append("pexpect; sys.platform != 'win32'") | |||
682 | for r in requires: |
|
683 | for r in requires: | |
683 | pkg_info['Requires-Dist'] = r |
|
684 | pkg_info['Requires-Dist'] = r | |
684 | write_pkg_info(metadata_path, pkg_info) |
|
685 | write_pkg_info(metadata_path, pkg_info) |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now