##// END OF EJS Templates
nbconvert no longer depends on markdown
Jonathan Frederic -
Show More
@@ -8,7 +8,6 b' python:'
8 before_install:
8 before_install:
9 - easy_install -q pyzmq
9 - easy_install -q pyzmq
10 - sudo apt-get install pandoc
10 - sudo apt-get install pandoc
11 - pip install markdown
12 - pip install pygments
11 - pip install pygments
13 - pip install sphinx
12 - pip install sphinx
14 - "if [[ $TRAVIS_PYTHON_VERSION == '3.2'* ]]; then pip install -Iv https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz; fi"
13 - "if [[ $TRAVIS_PYTHON_VERSION == '3.2'* ]]; then pip install -Iv https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz; fi"
@@ -167,7 +167,6 b" 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')
169 have['sphinx'] = test_for('sphinx')
170 have['markdown'] = test_for('markdown')
171
170
172 min_zmq = (2,1,11)
171 min_zmq = (2,1,11)
173
172
@@ -313,7 +312,7 b' def make_exclude():'
313 if not have['azure']:
312 if not have['azure']:
314 exclusions.append(ipjoin('html', 'services', 'notebooks', 'azurenbmanager'))
313 exclusions.append(ipjoin('html', 'services', 'notebooks', 'azurenbmanager'))
315
314
316 if not all((have['pygments'], have['jinja2'], have['markdown'], have['sphinx'])):
315 if not all((have['pygments'], have['jinja2'], have['sphinx'])):
317 exclusions.append(ipjoin('nbconvert'))
316 exclusions.append(ipjoin('nbconvert'))
318
317
319 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
318 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
@@ -465,7 +464,7 b' def make_runners(inc_slow=False):'
465 if inc_slow:
464 if inc_slow:
466 nose_pkg_names.append('parallel')
465 nose_pkg_names.append('parallel')
467
466
468 if all((have['pygments'], have['jinja2'], have['markdown'], have['sphinx'])):
467 if all((have['pygments'], have['jinja2'], have['sphinx'])):
469 nose_pkg_names.append('nbconvert')
468 nose_pkg_names.append('nbconvert')
470
469
471 # For debugging this code, only load quick stuff
470 # For debugging this code, only load quick stuff
General Comments 0
You need to be logged in to leave comments. Login now