Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include LICENSE and data files via MANIFEST.in #16

Merged
merged 1 commit into from Mar 4, 2017

Conversation

rmax
Copy link
Contributor

@rmax rmax commented Mar 4, 2017

This includes files required for compilation and distribution via
MANIFEST.in rather than package_data which gets installed.


Before this change, this is the content of the source distribution file:

x pyemd-0.4.2/
x pyemd-0.4.2/PKG-INFO
x pyemd-0.4.2/pyemd/
x pyemd-0.4.2/pyemd/__about__.py
x pyemd-0.4.2/pyemd/__init__.py
x pyemd-0.4.2/pyemd/emd.cpp
x pyemd-0.4.2/pyemd/emd.pyx
x pyemd-0.4.2/pyemd/lib/
x pyemd-0.4.2/pyemd/lib/EMD_DEFS.hpp
x pyemd-0.4.2/pyemd/lib/emd_hat.hpp
x pyemd-0.4.2/pyemd/lib/emd_hat_impl.hpp
x pyemd-0.4.2/pyemd/lib/emd_hat_signatures_interface.hpp
x pyemd-0.4.2/pyemd/lib/flow_utils.hpp
x pyemd-0.4.2/pyemd/lib/min_cost_flow.hpp
x pyemd-0.4.2/README.rst
x pyemd-0.4.2/setup.py
x pyemd-0.4.2/test/
x pyemd-0.4.2/test/test_pyemd.py

And the files to be installed:

build/lib.macosx-10.6-x86_64-3.5
build/lib.macosx-10.6-x86_64-3.5/pyemd
build/lib.macosx-10.6-x86_64-3.5/pyemd/__about__.py
build/lib.macosx-10.6-x86_64-3.5/pyemd/__init__.py
build/lib.macosx-10.6-x86_64-3.5/pyemd/emd.cpython-35m-darwin.so
build/lib.macosx-10.6-x86_64-3.5/pyemd/emd.pyx
build/lib.macosx-10.6-x86_64-3.5/pyemd/lib
build/lib.macosx-10.6-x86_64-3.5/pyemd/lib/EMD_DEFS.hpp
build/lib.macosx-10.6-x86_64-3.5/pyemd/lib/emd_hat.hpp
build/lib.macosx-10.6-x86_64-3.5/pyemd/lib/emd_hat_impl.hpp
build/lib.macosx-10.6-x86_64-3.5/pyemd/lib/emd_hat_signatures_interface.hpp
build/lib.macosx-10.6-x86_64-3.5/pyemd/lib/flow_utils.hpp
build/lib.macosx-10.6-x86_64-3.5/pyemd/lib/min_cost_flow.hpp
build/lib.macosx-10.6-x86_64-3.5/README.rst

After this change, this is the source distribution content:

x pyemd-0.4.2/
x pyemd-0.4.2/conftest.py
x pyemd-0.4.2/LICENSE
x pyemd-0.4.2/PKG-INFO
x pyemd-0.4.2/pyemd/
x pyemd-0.4.2/pyemd/__about__.py
x pyemd-0.4.2/pyemd/__init__.py
x pyemd-0.4.2/pyemd/emd.cpp
x pyemd-0.4.2/pyemd/emd.pyx
x pyemd-0.4.2/pyemd/lib/
x pyemd-0.4.2/pyemd/lib/EMD_DEFS.hpp
x pyemd-0.4.2/pyemd/lib/emd_hat.hpp
x pyemd-0.4.2/pyemd/lib/emd_hat_impl.hpp
x pyemd-0.4.2/pyemd/lib/emd_hat_signatures_interface.hpp
x pyemd-0.4.2/pyemd/lib/flow_utils.hpp
x pyemd-0.4.2/pyemd/lib/min_cost_flow.hpp
x pyemd-0.4.2/README.rst
x pyemd-0.4.2/setup.py
x pyemd-0.4.2/test/
x pyemd-0.4.2/test/test_pyemd.py

And the files to be installed:

build/lib.macosx-10.6-x86_64-3.5
build/lib.macosx-10.6-x86_64-3.5/pyemd
build/lib.macosx-10.6-x86_64-3.5/pyemd/__about__.py
build/lib.macosx-10.6-x86_64-3.5/pyemd/__init__.py
build/lib.macosx-10.6-x86_64-3.5/pyemd/emd.cpython-35m-darwin.so

Unless the .pyx and .hpp files are intended for final user's usage, then the latter result is the correct one.

This includes files required for compilation and distribution via
MANIFEST.in rather than package_data which gets installed.
@wmayner wmayner merged commit a8a6c29 into wmayner:develop Mar 4, 2017
@wmayner
Copy link
Owner

wmayner commented Mar 4, 2017

Thanks @rolando!

@rmax
Copy link
Contributor Author

rmax commented Mar 4, 2017

@wmayner great! FYI, I'm adding a recipe for pyemd to conda-forge as part of this PR: conda-forge/staged-recipes#2455

@wmayner
Copy link
Owner

wmayner commented Mar 4, 2017

Cool. I'm not familiar with conda-forge, but I guess it just makes pyemd easier to install with Anaconda?

@rmax
Copy link
Contributor Author

rmax commented Mar 4, 2017

Yes, either with anaconda or miniconda. Conda-forge is a community-driven effort to bring more packages to conda.

Conda really helps to avoid issues with system libraries and compiled packages (i.e.: compiling with numpy 1.11 and then upgrading to numpy 1.12 may break the module).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants