Commit 6a3f121a authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'rf/conda' into 'master'

RF: God damn I hate conda. Call conda shell function (assumed to be defined),

See merge request fsl/conda/manifest-rules!42
parents 2273e6e4 5ee46b9e
......@@ -20,7 +20,7 @@ default:
CONDABINDIR=$(dirname ${CONDABIN})/../bin/;
${CONDABIN} create -c conda-forge -p ./env python=3.9;
if [ -f "$CONDABINDIR"/activate ]; then source $CONDABINDIR/activate ./env;
else ${CONDABIN} activate ./env; fi;
else conda activate ./env; fi;
python -m pip install git+https://git.fmrib.ox.ac.uk/fsl/conda/fsl-ci-rules.git;
python -m pip install git+https://git.fmrib.ox.ac.uk/fsl/conda/manifest-rules.git;
......
#!/usr/bin/env python
__version__ = '0.7.4'
__version__ = '0.7.5'
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment