Fixes for VirtualBox #755
Merged
Fixes for VirtualBox #755
Conversation
This file contains 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
We no longer install cython via apt, so try to find both python and cython in the path (prefering python3/cython3).
KrisThielemans
requested changes
Aug 18, 2022
| @@ -203,7 +215,8 @@ SuperBuild(){ | |||
| -DBUILD_CIL=ON\ | |||
| -DCYTHON_EXECUTABLE="$CYTHON_EXECUTABLE"\ | |||
| -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE"\ | |||
| -DBUILD_pet_rd_tools=ON | |||
| -DBUILD_pet_rd_tools=ON\ | |||
| -DCYTHON_ROOT="${HOME}/.local/bin" | |||
| @@ -79,4 +79,5 @@ bash $userHOME/devel/SIRF-SuperBuild/VirtualBox/scripts/INSTALL_python_packages. | |||
| # Therefore no browser is installed on the VM | |||
|
|
|||
| chown -R $SIRFUSERNAME:users $userHOME | |||
| export PATH=${userHOME}/.local/bin:${PATH} | |||
There was a problem hiding this comment.
Suggested change
| export PATH=${userHOME}/.local/bin:${PATH} |
This PATH will be ignored, so why set it
| SET(Cython_FOUND TRUE) | ||
| SET(Cython_Compilation_Failed FALSE) | ||
| set(CYTHON_EXECUTABLE ${cy_exe}) | ||
| message(status "YAS! ${cy_exe} ${CYTHON_EXECUTABLE} ${cython_version}") |
There was a problem hiding this comment.
probably change this message :-)
| export DEBIAN_FRONTEND=noninteractive | ||
| SUDO=sudo | ||
| APT_GET_INSTALL="$SUDO apt-get install -y --no-install-recommends" | ||
| ${APT_GET_INSTALL} ${PYTHON}-dev |
There was a problem hiding this comment.
move to INSTALL_...with_apt...
Comment on lines
+82
to
+85
| # $PYTHON -m pip install $PIPOPTIONS --upgrade pip wheel setuptools | ||
| # $PYTHON -m pip install $PIPOPTIONS --only-binary=numpy,scipy,matplotlib numpy scipy matplotlib nose coverage docopt deprecation nibabel pytest tqdm | ||
| # $PYTHON -m pip install $PIPOPTIONS jupyter spyder | ||
| # $PYTHON -m pip uninstall $PIPOPTIONS -y spyder-kernels |
There was a problem hiding this comment.
Suggested change
| # $PYTHON -m pip install $PIPOPTIONS --upgrade pip wheel setuptools | |
| # $PYTHON -m pip install $PIPOPTIONS --only-binary=numpy,scipy,matplotlib numpy scipy matplotlib nose coverage docopt deprecation nibabel pytest tqdm | |
| # $PYTHON -m pip install $PIPOPTIONS jupyter spyder | |
| # $PYTHON -m pip uninstall $PIPOPTIONS -y spyder-kernels |
| PYTHON_EXECUTABLE=$(which python3) | ||
| else | ||
| PYTHON_EXECUTABLE=$(which python) | ||
| fi | ||
| PYTHON_EXECUTABLE=/usr/bin/python3 |
There was a problem hiding this comment.
Suggested change
| PYTHON_EXECUTABLE=/usr/bin/python3 |
|
so, did it work? |
|
doing most of these myself at the moment |
This was
linked to
issues
Aug 18, 2022
|
I'm going to squash-merge this now, and then fix some things later. |
Yes, it did! I opened the PR only after it all worked! |
|
great. I'm changing it anyway 😄 PR coming later today. |
This was referenced Aug 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Creates the VM from the docker files.
Installs custom pip.
closes #742