Merge pull request #222 from arokem/josephcslater-master

Update with nbformat

Author: arokem

.travis.yml

@@ -26,6 +26,11 @@ before_install:
   - conda info -a
   - travis_retry conda create -n test $CONDA IPython pip nose pyzmq jsonschema
   - source activate test
+  - if [[ $CONDA == python=3.3* ]]; then
+      pip install nbformat;
+    else
+      travis_retry conda install nbformat;
+    fi
   - travis_retry pip install coveralls
 
 install:

pymatbridge/publish.py

@@ -1,5 +1,10 @@
-import IPython.nbformat.v4 as nbformat
-from IPython.nbformat import write as nbwrite
+try:
+    import nbformat.v4 as nbformat
+    from nbformat import write as nbwrite
+except ImportError:
+    import IPython.nbformat.v4 as nbformat
+    from IPython.nbformat import write as nbwrite
+
 import numpy as np