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

Merge pull request #1755 from minrk/pygmentstest

Browse Source 
test for pygments before running qt tests, to avoid an error in the test suite itself if pygments isn't present.
This commit is contained in:
Fernando Perez 2012-05-29 14:04:46 -07:00
commit 5378cba25a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IPython/testing/iptest.py
View File

@ -144,6 +144,7 @@ have['curses'] = test_for('_curses')
have['matplotlib'] = test_for('matplotlib')
have['pexpect'] = test_for('IPython.external.pexpect')
have['pymongo'] = test_for('pymongo')
have['pygments'] = test_for('pygments')
have['wx'] = test_for('wx')
have['wx.aui'] = test_for('wx.aui')
have['qt'] = test_for('IPython.external.qt')
@ -255,7 +256,7 @@ def make_exclude():
exclusions.append(ipjoin('frontend', 'consoleapp.py'))
exclusions.append(ipjoin('frontend', 'terminal', 'console'))
exclusions.append(ipjoin('parallel'))
elif not have['qt']:
elif not have['qt'] or not have['pygments']:
exclusions.append(ipjoin('frontend', 'qt'))
if not have['pymongo']: