Skip to content

Commit 24a15b4

Browse files
valeriupredoibvreedeKlaus Zimmermann
authored
remove flag to use pip 2020 solver from Github Action pip install command on OSX (#1357)
* remove flag to use pip 2020 solver * run actions on this PR (temporary commit) * re-add feature resolver in one actions wf * re-remove feature resolver in one actions wf * remask GA runs on push Co-authored-by: Barbara Vreede <b.vreede@esciencecenter.nl> Co-authored-by: Klaus Zimmermann <klaus.zimmermann@smhi.se>
1 parent 4b8bf66 commit 24a15b4

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

.github/workflows/install-from-source.yml

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
# in one single call; declaring the shell variable makes the action run each
99
# command separately (better for debugging);
1010
# - can try multiple shells eg pwsh or cmd /C CALL {0} (but overkill for now!);
11-
# FIXME OSX/Python3.8: 3.8.5 available on OSX only from July 20, 2020
12-
# TODO: read the cron tasking documentation:
13-
# https://www.netiq.com/documentation/cloud-manager-2-5/ncm-reference/data/bexyssf.html
1411

1512
name: Install from Source
1613

.github/workflows/run-tests-monitor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- shell: bash -l {0}
4242
run: pytest -n 2 -m "not installation and not sequential" 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/test_report.txt
4343
- shell: bash -l {0}
44-
run: python tests/parse_pymon.py
44+
run: python tests/parse_pymon.py
4545
- shell: bash -l {0}
4646
run: pytest -n 0 -m "sequential"
4747
- shell: bash -l {0}
@@ -78,7 +78,7 @@ jobs:
7878
- shell: bash -l {0}
7979
run: pip install pytest-monitor
8080
- shell: bash -l {0}
81-
run: pip install -e .[develop] --use-feature=2020-resolver 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
81+
run: pip install -e .[develop] 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
8282
- shell: bash -l {0}
8383
run: pytest -n 2 -m "not installation and not sequential" 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/test_report.txt
8484
- shell: bash -l {0}

.github/workflows/run-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- shell: bash -l {0}
8989
run: python -V 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/python_version.txt
9090
- shell: bash -l {0}
91-
run: pip install -e .[develop] --use-feature=2020-resolver 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
91+
run: pip install -e .[develop] 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
9292
- shell: bash -l {0}
9393
run: pytest -n 2 -m "not installation and not sequential" 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/test_report.txt
9494
- shell: bash -l {0}

0 commit comments

Comments
 (0)