From e7842d1abe05618d96b4fd9bb0ed939c2f8718a2 2013-07-18 21:22:38
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: 2013-07-18 21:22:38
Subject: [PATCH] nbconvert no longer depends on markdown

---

diff --git a/.travis.yml b/.travis.yml
index 52baf72..7655176 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ python:
 before_install:
     - easy_install -q pyzmq
     - sudo apt-get install pandoc
-    - pip install markdown
     - pip install pygments
     - pip install sphinx
     - "if [[ $TRAVIS_PYTHON_VERSION == '3.2'* ]]; then pip install -Iv https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz; fi"
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index a99df1e..a8b8f22 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -167,7 +167,6 @@ have['wx'] = test_for('wx')
 have['wx.aui'] = test_for('wx.aui')
 have['azure'] = test_for('azure')
 have['sphinx'] = test_for('sphinx')
-have['markdown'] = test_for('markdown')
 
 min_zmq = (2,1,11)
 
@@ -313,7 +312,7 @@ def make_exclude():
     if not have['azure']:
         exclusions.append(ipjoin('html', 'services', 'notebooks', 'azurenbmanager'))
 
-    if not all((have['pygments'], have['jinja2'], have['markdown'], have['sphinx'])):
+    if not all((have['pygments'], have['jinja2'], have['sphinx'])):
         exclusions.append(ipjoin('nbconvert'))
 
     # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
@@ -465,7 +464,7 @@ def make_runners(inc_slow=False):
         if inc_slow:
             nose_pkg_names.append('parallel')
 
-    if all((have['pygments'], have['jinja2'], have['markdown'], have['sphinx'])):
+    if all((have['pygments'], have['jinja2'], have['sphinx'])):
         nose_pkg_names.append('nbconvert')
 
     # For debugging this code, only load quick stuff