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

Find conda-installed binaries on Windows #134

Merged
merged 7 commits into from
Aug 22, 2023
Merged

Conversation

willGraham01
Copy link
Contributor

@willGraham01 willGraham01 commented Aug 21, 2023

niftyreg backend binaries

Addresses a difference between Windows and Mac/Linux OSes when attempting to locate CONDA-installed niftyreg binaries.

Addresses #116, but does not close it.

Changes

If the user has installed niftyreg into a conda environment, then installed brainreg into the same environment, we should detect the conda-installed niftyref binaries and use these in the backend rather than the binaries that we bundle with the package.

Previously, Windows users experienced an error due to the conda install path of the niftyreg binaries being different to that on Linux/MacOS. Full changes are:

  • .exe is now explicitly appended to all executables/binaries when on Windows OS
  • The conda install path is properly set when the underlying OS is Windows (CONDA_PREFIX/Library/bin vs CONDA_PREFIX/bin on Mac/Linux)
  • Some backend tests have been added along with an additional step in the CI to confirm that package installs now correctly detect when there are CONDA-binaries that can be used.

@willGraham01 willGraham01 force-pushed the conda_prefix_fix branch 3 times, most recently from d5dc89c to f3b3b11 Compare August 21, 2023 11:07
@willGraham01 willGraham01 changed the title Tmate session for windows debugging Find conda-installed binaries on Windows Aug 21, 2023
@willGraham01 willGraham01 changed the base branch from main to update-ci August 21, 2023 11:07
@willGraham01 willGraham01 force-pushed the conda_prefix_fix branch 10 times, most recently from 4c5ddc8 to 3858e59 Compare August 21, 2023 12:30
Base automatically changed from update-ci to main August 21, 2023 12:34
@willGraham01 willGraham01 marked this pull request as ready for review August 21, 2023 14:50
@willGraham01 willGraham01 merged commit 091120d into main Aug 22, 2023
@willGraham01 willGraham01 deleted the conda_prefix_fix branch August 22, 2023 12:45
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.

2 participants