Skip to content

Commit 400cd69

Browse files
authored
Merge pull request #832 from nipype/ci-cd-bugfix
fixes ci-cd issues
2 parents 47c3958 + 281fc48 commit 400cd69

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/workflows/ci-cd.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
docker exec slurm bash -c "ls -la /pydra && echo list pydra dir"
183183
docker exec slurm bash -c "CONFIGURE_OPTS=\"-with-openssl=/opt/openssl\" pyenv install -v ${{ matrix.python-version }}"
184184
docker exec slurm bash -c "pyenv global ${{ matrix.python-version }}"
185-
docker exec slurm bash -c "pip install --upgrade pip && pip install -e /pydra[test,psij] && python -c 'import pydra.engine; print(pydra.utils.__version__)'"
185+
docker exec slurm bash -c "pip install --upgrade pip && pip install 'numpy<2' -e /pydra[test,psij] && python -c 'import pydra.engine; print(pydra.utils.__version__)'"
186186
- name: Run pytest
187187
run: |
188188
docker exec slurm bash -c "cd /pydra; pytest pydra/workers/tests/test_worker.py --only-worker=slurm --color=yes"
@@ -315,9 +315,12 @@ jobs:
315315
with:
316316
auto-activate-base: true
317317
activate-environment: ""
318+
# We generate dummy aliases so they can be deleted by conda later without throwing an error
318319
- name: Install MRtrix via Conda
319320
run: |
320-
conda install -c mrtrix3 mrtrix3
321+
alias shview='ls'
322+
alias mrview='ls'
323+
conda install -c conda-forge -c MRtrix3 mrtrix3 libstdcxx-ng
321324
mrconvert --version
322325
- name: Set up Python
323326
uses: actions/setup-python@v5

0 commit comments

Comments
 (0)