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

manifest-gitlab-ci.yml

@@ -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;
 

manifest_rules/__init__.py

 #!/usr/bin/env python
 
 
-__version__ = '0.7.4'
+__version__ = '0.7.5'