Merge branch 'release/0.4.3'

wmayner · Mar 4, 2017 · 284ea57 · 284ea57
2 parents 82ac4f4 + 68f3634
commit 284ea57
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Will Mayner
+Copyright (c) 2014-2017 Will Mayner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1,9 @@
-include pyemd/emd.cpp
+graft pyemd
+graft test
+
+include README.rst
+include LICENSE
+include conftest.py
+
+global-exclude __pycache__ *.py[cod]
+global-exclude *.so *.dylib
diff --git a/pyemd/__about__.py b/pyemd/__about__.py
@@ -5,14 +5,14 @@
 """PyEMD metadata"""
 
 __title__ = 'pyemd'
-__version__ = '0.4.2'
+__version__ = '0.4.3'
 __description__ = ("A Python wrapper for Ofir Pele and Michael Werman's "
                    "implementation of the Earth Mover's Distance.")
 __author__ = 'Will Mayner'
 __author_email__ = '[email protected]'
 __author_website__ = 'http://willmayner.com'
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2016 Will Mayner'
+__copyright__ = 'Copyright (c) 2014-2017 Will Mayner'
 __url__ = 'http://github.com/wmayner/pyemd'
 
 __all__ = ['__title__', '__version__', '__description__', '__author__',

diff --git a/pyemd/__init__.py b/pyemd/__init__.py
@@ -59,7 +59,7 @@
   easy to write.
 
 
-:copyright: Copyright (c) 2016 by Will Mayner.
+:copyright: Copyright (c) 2014-2017 Will Mayner.
 :license: See the LICENSE file.
 """
 

diff --git a/setup.py b/setup.py
@@ -88,7 +88,6 @@ def no_cythonize(extensions, **_ignore):
     url=about['__url__'],
     license=about['__license__'],
     packages=['pyemd'],
-    package_data={'pyemd': ['emd.pyx', 'lib/*.hpp', '../README.rst']},
     install_requires=requires,
     cmdclass=cmdclass,
     setup_requires=requires,