Skip to content

Update with nbformat #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arokem merged 11 commits into from
Sep 21, 2015
Merged

Update with nbformat #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cfe7de4
IPython.nbformat is now nbformat in Jupyter
josephcslater Aug 29, 2015
58f12f0
IPython.nbformat deprecated
josephcslater Aug 29, 2015
38a4439
Update publish.py
josephcslater Aug 29, 2015
03e9fd2
Update .travis.yml to include nbformat.
josephcslater Aug 29, 2015
e7a687e
Update .travis.yml- CONDA_Jupyter env added.
josephcslater Aug 29, 2015
d98c05c
Undid commit of changes to .travid.yml file.
josephcslater Aug 29, 2015
5c2a472
Try pip installing nbformat, until it comes in as a conda package for…
arokem Sep 21, 2015
09ab6e5
travis_retry ?
arokem Sep 21, 2015
562f269
Install nbformat in different ways, depending on python version.
arokem Sep 21, 2015
e4b2b9d
Ugh bash.
arokem Sep 21, 2015
fca113a
Activate my env first, so that nbformat gets installed into it.
arokem Sep 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 7 additions & 2 deletions pymatbridge/publish.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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


Expand Down