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

System python updated #974

Merged
merged 24 commits into from Jan 21, 2015

Conversation

Projects
None yet
6 participants
@aashish24
Contributor

aashish24 commented Jan 19, 2015

Updated

cjh1 and others added some commits Apr 4, 2014

Variable PYTHON_SITE_PACKAGES should point to site-packages/
Rather than pointing to CMAKE_INSTALL_PREFIX it should
point to ${CMAKE_INSTALL_PREFIX}/lib/python${PYVER}/site-packages
Disable pixman tests that need Cairo
A pixman is needed by Cairo, we don't want to require Cairo before
it can be built.
Use PYTHONPATH from CMake rather than environment
Use CMake variable so that we pick up the correct version of SIP
Ensure correct FFMPEG header are found
If system FFMPEG is present these header will be picked up and there
may be a version miss match.

Conflicts:
	CMake/cdat_modules_extra/ffmpeg_configure_step.cmake.in
Move misplaced "
The misplaced " result in a ; separated string as CMake treats the
variable as a list.
Add vanilla python find modules.
The Ubuntu packaged modules appear to be broken.
Merge remote-tracking branch 'origin/master' into system-python
Conflicts:
	testing/dv3d/CMakeLists.txt
	testing/dv3d/TestManager.py
	testing/dv3d/basic_run_test.py
	testing/vcs/test_vcs_close.py

aashish24 added a commit that referenced this pull request Jan 21, 2015

@aashish24 aashish24 merged commit 71421b7 into master Jan 21, 2015

1 check failed

continuous-integration/travis-ci The Travis CI build failed
Details

@aashish24 aashish24 deleted the system-python-updated branch Jan 21, 2015

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Jan 21, 2015

did you test it? Last I tried it didn't work, we shouldn't approve our own branches @aashish24 will run a build now on my systems and will report any issues (if any). This shouldn't hurt the regular build so I guess it's ok.

@chaosphere2112

This comment has been minimized.

Contributor

chaosphere2112 commented Jan 23, 2015

This PR breaks the build for OSX 10.8. I was attempting to update my dev version of UV-CDAT and ran into a bunch of build errors in the same vein; it turned out the MyProxyClient was trying to install itself into $INSTALL_PREFIX/lib/python2.7/site-packages instead of $INSTALL_PREFIX/Library/.../python2.7/site-packages, and didn't like it.

I checked out commit e114e06, and the build worked fine.

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Jan 23, 2015

@aashish24 we should either fix quickly or revert right, see, never self merge ;)

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