ImportError when running nbmerge

[tarmstrong]

When Greg tried to run nbmerge, he got the following error:

~/p/nbdiff/scripts/merge-conflict-testfolder-a487: nbmerge
Traceback (most recent call last):
  File "/Users/gwilson/anaconda/bin/nbmerge", line 9, in <module>
    load_entry_point('nbdiff==0.0.0', 'console_scripts', 'nbmerge')()
  File "/Users/gwilson/anaconda/lib/python2.7/site-packages/nbdiff-0.0.0-py2.7.egg/nbdiff/commands.py", line 160, in merge
    from . import server
ImportError: cannot import name server

[tarmstrong]

Problem 1:

distribute wants you to specify the sub-packages in your project.

setup(
    name='nbdiff',
    # ... snip
    packages=[
        'nbdiff',
        'nbdiff.server',
        'nbdiff.adapter',
    ],

Problem 2:

distribute wants you to specify static files that should be included as well.

    packages=[
        'nbdiff',
        'nbdiff.server',
        'nbdiff.adapter',
    ],
    package_data={
        'nbdiff.server': ['templates/*', 'static/*'],
    },

[tarmstrong]

Should be fixed by #119 - waiting for confirmation from Greg.

[tarmstrong]

Greg confirms the fix!