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

Improve pip install #726

Merged
merged 6 commits into from Aug 17, 2016

Conversation

Projects
None yet
2 participants
@patricksnape
Contributor

patricksnape commented Aug 11, 2016

Allow pip installing without requiring Cython (which will now work from the sdist upload). Stole the requisite function from the Cython documentation.

@patricksnape

This comment has been minimized.

Contributor

patricksnape commented Aug 12, 2016

@jabooth look good?

@@ -1,5 +1,4 @@
# distutils: language = c++
# distutils: sources = menpo/feature/cpp/ImageWindowIterator.cpp menpo/feature/cpp/WindowFeature.cpp menpo/feature/cpp/HOG.cpp menpo/feature/cpp/LBP.cpp
# distutils: sources =

This comment has been minimized.

@jabooth

jabooth Aug 16, 2016

Member

intentionally left empty?

setup.py Outdated
'transform/piecewiseaffine/fastpwa/*.h'],
'': ['*.pxd', '*.pyx']},
'transform/piecewiseaffine/fastpwa/*.cpp'],
'': ['*.pxd', '*.pyx', '*.h']},

This comment has been minimized.

@jabooth

jabooth Aug 16, 2016

Member

can't we simplify this down now?

       package_data={'menpo': ['data/*',
-                              'feature/cpp/*.cpp',
-                              'transform/piecewiseaffine/fastpwa/*.cpp'],
-                    '': ['*.pxd', '*.pyx', '*.h']},
+                    '': ['*.pxd', '*.pyx', '*.cpp', '*.h']},

(i.e. we always want .cpp files, just like .pyx etc)

This comment has been minimized.

@patricksnape

patricksnape Aug 16, 2016

Contributor

Good catch.

Fixes by @jabooth
Include ALL C++ files
Remove unused distutils flag from windowiterator.pyx
@patricksnape

This comment has been minimized.

Contributor

patricksnape commented Aug 16, 2016

Fixed - thanks @jabooth

Typo Fix
Never edit something in the web editor then copy into your pc
and commit...

@patricksnape patricksnape merged commit 7dc90fe into menpo:master Aug 17, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
macOS MenpoBot Jenkins build passed
Details

@patricksnape patricksnape deleted the patricksnape:improve_pip_install branch Aug 17, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment