mirror of
https://github.com/jupyter/notebook.git
synced 2025-04-12 14:00:27 +08:00
Fixes so the test suite runs when Twisted is not available.
Other minor cleanups (formatting and unused imports)
This commit is contained in:
parent
f64ae7afe9
commit
2f50493d06
@ -107,6 +107,23 @@ if not os.name == 'posix':
|
||||
if not have_pexpect:
|
||||
EXCLUDE.append(pjoin('IPython', 'irunner'))
|
||||
|
||||
if not have_twisted:
|
||||
EXCLUDE.append(pjoin('IPython', 'frontend', 'asyncfrontendbase'))
|
||||
EXCLUDE.append(pjoin('IPython', 'frontend', 'prefilterfrontend'))
|
||||
EXCLUDE.append(pjoin('IPython', 'frontend', 'frontendbase'))
|
||||
EXCLUDE.append(pjoin('IPython', 'frontend', 'linefrontendbase'))
|
||||
EXCLUDE.append(pjoin('IPython', 'frontend', 'tests', 'test_linefrontend'))
|
||||
EXCLUDE.append(pjoin('IPython', 'frontend', 'tests', 'test_frontendbase'))
|
||||
EXCLUDE.append(pjoin('IPython', 'frontend', 'tests',
|
||||
'test_prefilterfrontend'))
|
||||
EXCLUDE.append(pjoin('IPython', 'frontend', 'tests',
|
||||
'test_asyncfrontendbase'))
|
||||
EXCLUDE.append(pjoin('IPython', 'kernel', 'error'))
|
||||
EXCLUDE.append(pjoin('IPython', 'testing', 'parametric'))
|
||||
EXCLUDE.append(pjoin('IPython', 'testing', 'util'))
|
||||
EXCLUDE.append(pjoin('IPython', 'testing', 'tests', 'test_decorators_trial'))
|
||||
|
||||
|
||||
# This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
|
||||
if sys.platform == 'win32':
|
||||
EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE]
|
||||
@ -232,12 +249,15 @@ def make_runners():
|
||||
'Logger.py', 'macro.py', 'Magic.py', 'OInspect.py',
|
||||
'OutputTrap.py', 'platutils.py', 'prefilter.py', 'Prompts.py',
|
||||
'PyColorize.py', 'Release.py', 'rlineimpl.py', 'shadowns.py',
|
||||
'shellglobals.py', 'strdispatch.py', 'twshell.py',
|
||||
'shellglobals.py', 'strdispatch.py',
|
||||
'ultraTB.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py',
|
||||
# See note above for why this is skipped
|
||||
# 'Shell.py',
|
||||
'winconsole.py']
|
||||
|
||||
if have_twisted:
|
||||
top_mod.append('twshell.py')
|
||||
|
||||
if have_pexpect:
|
||||
top_mod.append('irunner.py')
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user