Skip to content

Commit 071890b

Browse files
Merge pull request #342 from neutrons/fix_ci
Pin pytest-qt to <= 3.3.0, after that it dropped support for PyQt5<5.11
2 parents 468df3d + d99bf68 commit 071890b

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.github/workflows/actions.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
- uses: conda-incubator/setup-miniconda@v2
2828
with:
2929
auto-update-conda: true
30+
mamba-version: "*"
3031
python-version: ${{ matrix.python-version }}
3132
channels: neutrons,conda-forge,mantid,neutrons
3233

@@ -37,13 +38,7 @@ jobs:
3738
3839
- name: Conda install deps
3940
shell: bash -l {0}
40-
run: |
41-
conda config --remove channels defaults
42-
conda install -c conda-forge nexus==4.4.3
43-
conda install -c conda-forge poco==1.7.3
44-
conda install mantid-workbench
45-
conda install mantid-total-scattering-python-wrapper
46-
conda install --file requirements.txt --file requirements-dev.txt
41+
run: mamba install mantid-workbench mantid-total-scattering-python-wrapper --file requirements.txt --file requirements-dev.txt
4742

4843
- name: Mantid pre-requisites
4944
shell: bash -l {0}

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ flake8
22
mock
33
pytest
44
pytest-mpl
5-
pytest-qt
5+
pytest-qt<=3.3.0
66
typing

0 commit comments

Comments
 (0)