Merge pull request #502 from kynan/long-description

Show README content as package description on PyPI

setup.py

@@ -68,17 +68,26 @@
 )
 
 
+with open(pjoin(here, 'README.md')) as f:
+    long_description = f.read().replace(
+        'docs/source/images',
+        'https://github.com/jupyter/nbdime/raw/{version}/docs/source/images'.format(version=version)
+    )
+
+
 setup_args = dict(
     name            = name,
     description     = "Diff and merge of Jupyter Notebooks",
+    long_description=long_description,
+    long_description_content_type='text/markdown',
     version         = version,
     scripts         = glob(pjoin('scripts', '*')),
     cmdclass        = cmdclass,
     packages        = find_packages(here),
     package_data    = package_data,
     author          = 'Jupyter Development Team',
     author_email    = 'jupyter@googlegroups.com',
-    url             = 'http://jupyter.org',
+    url             = 'https://nbdime.readthedocs.io',
     license         = 'BSD',
     platforms       = "Linux, Mac OS X, Windows",
     keywords        = ['Interactive', 'Interpreter', 'Shell', 'Web'],