##// END OF EJS Templates
Merge pull request #1755 from minrk/pygmentstest...
Fernando Perez -
r7064:31e46ab9 merge
parent child Browse files
Show More
@@ -144,6 +144,7 b" have['curses'] = test_for('_curses')"
144 have['matplotlib'] = test_for('matplotlib')
144 have['matplotlib'] = test_for('matplotlib')
145 have['pexpect'] = test_for('IPython.external.pexpect')
145 have['pexpect'] = test_for('IPython.external.pexpect')
146 have['pymongo'] = test_for('pymongo')
146 have['pymongo'] = test_for('pymongo')
147 have['pygments'] = test_for('pygments')
147 have['wx'] = test_for('wx')
148 have['wx'] = test_for('wx')
148 have['wx.aui'] = test_for('wx.aui')
149 have['wx.aui'] = test_for('wx.aui')
149 have['qt'] = test_for('IPython.external.qt')
150 have['qt'] = test_for('IPython.external.qt')
@@ -255,7 +256,7 b' def make_exclude():'
255 exclusions.append(ipjoin('frontend', 'consoleapp.py'))
256 exclusions.append(ipjoin('frontend', 'consoleapp.py'))
256 exclusions.append(ipjoin('frontend', 'terminal', 'console'))
257 exclusions.append(ipjoin('frontend', 'terminal', 'console'))
257 exclusions.append(ipjoin('parallel'))
258 exclusions.append(ipjoin('parallel'))
258 elif not have['qt']:
259 elif not have['qt'] or not have['pygments']:
259 exclusions.append(ipjoin('frontend', 'qt'))
260 exclusions.append(ipjoin('frontend', 'qt'))
260
261
261 if not have['pymongo']:
262 if not have['pymongo']:
General Comments 0
You need to be logged in to leave comments. Login now