Skip to content

Commit 6ac699a

Browse files
This is the one (#1090)
* attempt to fix pipelines * attempt nr2 * 3rd time's the charm * let's go!
1 parent 224d96d commit 6ac699a

File tree

3 files changed

+33
-11
lines changed

3 files changed

+33
-11
lines changed

.github/workflows/coverage.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,12 @@ jobs:
5151
- name: Run pyscipopt tests
5252
run: |
5353
sudo apt-get install tzdata locales -y && sudo locale-gen pt_PT && sudo update-locale # add pt_PT locale that is used in tests
54-
coverage run -m pytest -nauto
55-
coverage combine
54+
if python -m pip help install | grep -q -- '--group'; then
55+
coverage run -m pytest -nauto
56+
coverage combine
57+
else
58+
coverage run -m pytest
59+
fi
5660
coverage report -m
5761
coverage xml
5862

.github/workflows/integration-test.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ jobs:
4545

4646
- name: Run pyscipopt tests
4747
run: |
48-
py.test -nauto
48+
if python -m pip help install | grep -q -- '--group'; then
49+
py.test -nauto
50+
else
51+
py.test
52+
fi
4953
5054
Windows-test:
5155
env:
@@ -73,12 +77,13 @@ jobs:
7377
- name: Prepare python environment
7478
shell: powershell
7579
run: |
76-
python -m pip install --upgrade pip
77-
if python -m pip help install | grep -q -- '--group'; then
80+
$pipHelp = python -m pip help install
81+
if ($pipHelp -match '--group') {
7882
python -m pip install --group test-full
79-
else
80-
python -m pip install networkx pytest-cov numpy
81-
fi
83+
}
84+
else {
85+
python -m pip install wheel cython networkx pytest-cov
86+
}
8287
8388
- name: Install PySCIPOpt
8489
shell: powershell
@@ -89,7 +94,12 @@ jobs:
8994
- name: Run pyscipopt tests
9095
shell: powershell
9196
run: |
92-
py.test -nauto
97+
$pipHelp = python -m pip help install
98+
if ($pipHelp -match '--group') {
99+
py.test -nauto
100+
} else {
101+
py.test
102+
}
93103
94104
MacOS-test:
95105
runs-on: macos-latest

.github/workflows/update-packages-and-documentation.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ jobs:
6060

6161
- name: Run pyscipopt tests
6262
run: |
63-
py.test -nauto
63+
if python -m pip help install | grep -q -- '--group'; then
64+
py.test -nauto
65+
else
66+
py.test
67+
fi
6468
6569
windows-test:
6670
needs: release-integration-test
@@ -103,7 +107,11 @@ jobs:
103107
- name: Run pyscipopt tests
104108
shell: powershell
105109
run: |
106-
py.test -nauto
110+
if python -m pip help install | grep -q -- '--group'; then
111+
py.test -nauto
112+
else
113+
py.test
114+
fi
107115
108116
109117
deploy-packages-and-generate-documentation:

0 commit comments

Comments
 (0)