From 03bff7923ec4da59cecff8757d3673d0608f1573 Mon Sep 17 00:00:00 2001 From: "Scott C. Livingston" Date: Sun, 16 Feb 2025 16:22:43 -0800 Subject: [PATCH 1/3] CI: explicitly include defaults channel Similar to changes from https://github.com/python-control/python-control/pull/1129 https://github.com/python-control/python-control/pull/1128 --- .github/workflows/slycot-build-and-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 4050bad9..f1d14d42 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -179,6 +179,7 @@ jobs: environment-file: .github/conda-env/build-env.yml miniforge-version: latest channel-priority: strict + channels: conda-forge,defaults auto-update-conda: false auto-activate-base: false - name: Conda build @@ -356,6 +357,7 @@ jobs: miniforge-version: latest activate-environment: test-env environment-file: slycot-src/.github/conda-env/test-env.yml + channels: conda-forge,defaults channel-priority: strict auto-activate-base: false - name: Download conda packages From 0ef94cee26ff48f6daadb3484bc192a8559ecff9 Mon Sep 17 00:00:00 2001 From: "Scott C. Livingston" Date: Mon, 17 Feb 2025 13:35:47 -0800 Subject: [PATCH 2/3] CI: skip python-control/docstrings_test.py It is not useful when testing Slycot, and skipping it allows us to avoid installing numpydoc. --- .github/scripts/run-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/scripts/run-tests.sh b/.github/scripts/run-tests.sh index 2ba81756..f9a8b9fa 100644 --- a/.github/scripts/run-tests.sh +++ b/.github/scripts/run-tests.sh @@ -18,6 +18,7 @@ donttest="$donttest or test_default_deprecation" pytest control/tests \ --cov=$slycot_libdir \ --cov-config=${slycot_srcdir}/.coveragerc \ + --ignore=control/tests/docstrings_test.py \ -k "not ($donttest)" mv .coverage ${slycot_srcdir}/.coverage.control popd From 81a578ac1a8627ada1a51617502bef1073aa5c36 Mon Sep 17 00:00:00 2001 From: "Scott C. Livingston" Date: Mon, 17 Feb 2025 15:09:16 -0800 Subject: [PATCH 3/3] CI: detect errors from set-...-test-matrix scripts --- .github/workflows/slycot-build-and-test.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index f1d14d42..9970af4d 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -222,7 +222,10 @@ jobs: name: slycot-wheels path: slycot-wheels - id: set-matrix - run: echo "matrix=$(python3 .github/scripts/set-pip-test-matrix.py)" >> $GITHUB_OUTPUT + run: | + TEMPFILE="$(mktemp)" + python3 .github/scripts/set-pip-test-matrix.py | tee $TEMPFILE + echo "matrix=$(cat $TEMPFILE)" >> $GITHUB_OUTPUT create-conda-test-matrix: name: Create conda test matrix @@ -245,7 +248,10 @@ jobs: name: slycot-conda-pkgs path: slycot-conda-pkgs - id: set-matrix - run: echo "matrix=$(python3 .github/scripts/set-conda-test-matrix.py)" >> $GITHUB_OUTPUT + run: | + TEMPFILE="$(mktemp)" + python3 .github/scripts/set-conda-test-matrix.py | tee $TEMPFILE + echo "matrix=$(cat $TEMPFILE)" >> $GITHUB_OUTPUT test-wheel: