Commit 019559ad authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'bf/conda' into 'master'

Bf/conda

See merge request fsl/conda/manifest-rules!40
parents b379727f bbfb902d
......@@ -18,9 +18,9 @@ default:
export CONDA_PKGS_DIRS=$(pwd)/conda-dir/.pkgs;
CONDABIN=$(which conda || echo "${HOME}/miniconda3/bin/conda");
CONDABINDIR=$(dirname ${CONDABIN})/../bin/;
conda create -c conda-forge -p ./env python=3.9;
${CONDABIN} create -c conda-forge -p ./env python=3.9;
if [ -f "$CONDABINDIR"/activate ]; then source $CONDABINDIR/activate ./env;
else conda activate ./env; fi;
else ${CONDABIN} 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;
......@@ -247,7 +247,7 @@ generate-development-manifest-file:
# file. Concrete jobs should define SUFFIX
# so that environments/*${SUFFIX}.yml should
# also resolve to one file.
- test_manifest manifest/*.json environments/
- test_manifest fsl-release.yml manifest/*.json environments/
test-manifest:linux-64:
......
#!/usr/bin/env python
__version__ = '0.7.2'
__version__ = '0.7.3'
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