SusanEAllen

takluyver

Copy nbflatten.py to somewhere on $PATH. Then, in the root of a git repository, run these commands:

echo "*.ipynb diff=ipynb" >> .gitattributes 
git config diff.ipynb.textconv nbflatten.py

When you change a notebook and run git diff, you'll see the diff of flattened, simplified notebooks, rather than the full JSON. This does lose some information (metadata, non-text output), but it makes it easier to see simple changes in the notebook.

This doesn't help with merging conflicting changes in notebooks. For that, see nbdiff.org.

krischer

#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
Fortran namelist parser. Converts nameslists to python dictionaries.

Should be fairly robust. Cannot be used for verifying fortran namelists as it
is rather forgiving.

Error messages during parsing are kind of messy right now.

jvanasco

import logging
log = logging.getLogger(__name__)


from sqlalchemy import Table 
from sqlalchemy import MetaData 
from sqlalchemy.orm import mapper 
from sqlalchemy.orm import scoped_session 
from sqlalchemy.orm import sessionmaker 
from zope.sqlalchemy import ZopeTransactionExtension