From efc4b600d469ff89aae3ee70067e9b1396465d94 Mon Sep 17 00:00:00 2001 From: Rolando Espinoza Date: Sat, 4 Mar 2017 15:21:37 -0300 Subject: [PATCH 1/3] Include LICENSE and data files via MANIFEST.in This includes files required for compilation and distribution via MANIFEST.in rather than package_data which gets installed. --- MANIFEST.in | 10 +++++++++- setup.py | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 1ea23b7..966751d 100644 --- 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/setup.py b/setup.py index cc129fd..4f7ce79 100644 --- 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, From f74deaf2d5b49d020c5527e7991a884bf5ae7913 Mon Sep 17 00:00:00 2001 From: Will Mayner Date: Sat, 4 Mar 2017 13:45:45 -0600 Subject: [PATCH 2/3] Update Copyright year --- LICENSE | 2 +- pyemd/__about__.py | 2 +- pyemd/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 3860855..797a2c5 100644 --- 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/pyemd/__about__.py b/pyemd/__about__.py index 4a03aa0..e0c7054 100644 --- a/pyemd/__about__.py +++ b/pyemd/__about__.py @@ -12,7 +12,7 @@ __author_email__ = 'wmayner@gmail.com' __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 index 84bba73..e78a8c7 100644 --- 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. """ From 68f3634901266691230a0e6e92411859113f3b8f Mon Sep 17 00:00:00 2001 From: Will Mayner Date: Sat, 4 Mar 2017 13:46:38 -0600 Subject: [PATCH 3/3] Bump version to 0.4.3 --- pyemd/__about__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyemd/__about__.py b/pyemd/__about__.py index e0c7054..1bfce1c 100644 --- a/pyemd/__about__.py +++ b/pyemd/__about__.py @@ -5,7 +5,7 @@ """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'