Commit 85f35912 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'mnt/token' into 'master'

RF: Installation is now performed in two steps - fsl-base first, then

See merge request fsl/conda/manifest-rules!16
parents 398b259a f23b8d24
#!/usr/bin/env python
__version__ = '0.3.12'
__version__ = '0.4.0'
......@@ -75,10 +75,23 @@ def full_test(envfile, release_info):
preprocess_environment(envfile, 'fsl', True)
basever = None
with open(envfile, 'rt') as f:
for line in f:
if line.strip().startswith('- fsl-base'):
basever = line.strip().split()[2]
break
env = os.environ.copy()
env['CONDARC'] = op.abspath(op.join('fsl', 'condarc'))
env_out = sprun(f'./fsl/bin/conda env update -n base -f {envfile}',
if basever is None:
env_out = ''
else:
env_out = sprun(f'./fsl/bin/conda install -y '
'-n base fsl-base={basever}')
env_out += sprun(f'./fsl/bin/conda env update -n base -f {envfile}',
env=env)
return install_out, env_out
......
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