Merge pull request #62 from dopplershift/package-updates

Package updates
Unidata · Nov 23, 2015 · 23310b6 · 23310b6
2 parents 5386fad + 211e662
commit 23310b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,3 +1,4 @@
 sphinx>=1.3
-ipython==3.2
-jsonschema
+nbconvert>=4.0
+# Until nbconvert 4.1
+IPython>=4.0
diff --git a/docs/source/notebook_gen_sphinxext.py b/docs/source/notebook_gen_sphinxext.py
@@ -5,7 +5,7 @@
 import os
 import os.path
 
-from IPython.nbconvert.exporters import rst
+from nbconvert.exporters import rst
 
 def setup(app):
     setup.app = app

diff --git a/setup.py b/setup.py
@@ -17,8 +17,8 @@ def run(self):
         import glob
         import os
         import os.path
-        from IPython.nbconvert.exporters import python
-        from IPython.config import Config
+        from nbconvert.exporters import python
+        from traitlets.config import Config
         examples_dir = os.path.join(os.path.dirname(__file__), 'examples')
         script_dir = os.path.join(examples_dir, 'scripts')
         if not os.path.exists(script_dir):
@@ -68,7 +68,7 @@ def run(self):
     extras_require={
         'netcdf': ['netCDF4>=1.1.0'],
         'dev': ['ipython[all]>=3.1'],
-        'doc': ['sphinx>=1.3', 'ipython[all]>=3.1'],
+        'doc': ['sphinx>=1.3', 'nbconvert>=4.0', 'IPython>=4.0'],
         'test': ['nose', 'netCDF4>=1.1.0',
                  'vcrpy~=1.5,!=1.7.0,!=1.7.1,!=1.7.2,!=1.7.3'],
         'examples': ['matplotlib>=1.3']