SciPy stack support, nanshe dependencies, some changes from upstream#1
Closed
jakirkham wants to merge 67 commits intojakirkham:fix__OSX_10_9__SciPy_Stackfrom
Closed
SciPy stack support, nanshe dependencies, some changes from upstream#1jakirkham wants to merge 67 commits intojakirkham:fix__OSX_10_9__SciPy_Stackfrom
jakirkham wants to merge 67 commits intojakirkham:fix__OSX_10_9__SciPy_Stackfrom
Conversation
…installers (yielding in x86_64_darwin or _osx paths), and to successfully link the shared libcplex against libstdc++
Update FindCPLEX and cplex-shared to deal with the two different osx ins...
…AKE compiler vars.
…AKE compiler vars.
Update psutil from 0.6.1 to 2.1.1
…ersion to today's master.
…icky to build in many cases: - janelia cluster - mac os x - compatibility issues with projects that use OpenMP
This reverts commit 23a7069.
…o prevent later packages from using system-python
… and finds the new VIGRA library
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changed branch. Related to ( chaubold#8 ), ( chaubold#9 ).