##// END OF EJS Templates
Fixing test logic for nbconvert to get tests to pass.
Brian E. Granger -
Show More
@@ -166,6 +166,8 b" have['jinja2'] = test_for('jinja2')"
166 have['wx'] = test_for('wx')
166 have['wx'] = test_for('wx')
167 have['wx.aui'] = test_for('wx.aui')
167 have['wx.aui'] = test_for('wx.aui')
168 have['azure'] = test_for('azure')
168 have['azure'] = test_for('azure')
169 have['sphinx'] = test_for('sphinx')
170 have['markdown'] = test_for('markdown')
169
171
170 min_zmq = (2,1,11)
172 min_zmq = (2,1,11)
171
173
@@ -305,6 +307,9 b' def make_exclude():'
305 if not have['azure']:
307 if not have['azure']:
306 exclusions.append(ipjoin('html', 'services', 'notebooks', 'azurenbmanager'))
308 exclusions.append(ipjoin('html', 'services', 'notebooks', 'azurenbmanager'))
307
309
310 if not all((have['pygments'], have['jinja2'], have['markdown'], have['sphinx'])):
311 exclusions.append(ipjoin('nbconvert'))
312
308 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
313 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
309 if sys.platform == 'win32':
314 if sys.platform == 'win32':
310 exclusions = [s.replace('\\','\\\\') for s in exclusions]
315 exclusions = [s.replace('\\','\\\\') for s in exclusions]
@@ -436,7 +441,7 b' def make_runners(inc_slow=False):'
436
441
437 # Packages to be tested via nose, that only depend on the stdlib
442 # Packages to be tested via nose, that only depend on the stdlib
438 nose_pkg_names = ['config', 'core', 'extensions', 'lib', 'terminal',
443 nose_pkg_names = ['config', 'core', 'extensions', 'lib', 'terminal',
439 'testing', 'utils', 'nbformat' ]
444 'testing', 'utils', 'nbformat']
440
445
441 if have['qt']:
446 if have['qt']:
442 nose_pkg_names.append('qt')
447 nose_pkg_names.append('qt')
@@ -450,6 +455,9 b' def make_runners(inc_slow=False):'
450 if inc_slow:
455 if inc_slow:
451 nose_pkg_names.append('parallel')
456 nose_pkg_names.append('parallel')
452
457
458 if all((have['pygments'], have['jinja2'], have['markdown'], have['sphinx'])):
459 nose_pkg_names.append('nbconvert')
460
453 # For debugging this code, only load quick stuff
461 # For debugging this code, only load quick stuff
454 #nose_pkg_names = ['core', 'extensions'] # dbg
462 #nose_pkg_names = ['core', 'extensions'] # dbg
455
463
General Comments 0
You need to be logged in to leave comments. Login now