From 68565e7eb6dd903d9e1f104aa308b947f5635070 Mon Sep 17 00:00:00 2001 From: Richard Murray Date: Sat, 24 Dec 2022 18:45:17 -0800 Subject: [PATCH 1/6] update workflow to pass jobname to python-control pytest --- .github/workflows/slycot-build-and-test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 9c68b243..7d931e82 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -283,7 +283,9 @@ jobs: pip install slycot-wheels/${{ matrix.packagekey }}/slycot*.whl pip show slycot - name: Slycot and python-control tests - run: bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME=$JOBNAME bash slycot-src/.github/scripts/run-tests.sh + env: + JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -359,7 +361,9 @@ jobs: mamba install -c ./slycot-conda-pkgs slycot conda list - name: Slycot and python-control tests - run: bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME=$JOBNAME bash slycot-src/.github/scripts/run-tests.sh + env: + JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: Report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 23c0093abc86a02d857d71043b3da35e7a324378 Mon Sep 17 00:00:00 2001 From: Richard Murray Date: Mon, 26 Dec 2022 07:51:47 -0800 Subject: [PATCH 2/6] add quotes to JOBNAME expansion --- .github/workflows/slycot-build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 7d931e82..1f45b719 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -283,7 +283,7 @@ jobs: pip install slycot-wheels/${{ matrix.packagekey }}/slycot*.whl pip show slycot - name: Slycot and python-control tests - run: JOBNAME=$JOBNAME bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh env: JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: report coverage @@ -361,7 +361,7 @@ jobs: mamba install -c ./slycot-conda-pkgs slycot conda list - name: Slycot and python-control tests - run: JOBNAME=$JOBNAME bash slycot-src/.github/scripts/run-tests.sh + run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh env: JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: Report coverage From 73f575e8c08cc114bb1fc21ad8c1927718d91928 Mon Sep 17 00:00:00 2001 From: Richard Murray Date: Mon, 26 Dec 2022 08:49:44 -0800 Subject: [PATCH 3/6] add build type to JOBNAME --- .github/workflows/slycot-build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 1f45b719..050a6097 100644 --- a/.github/workflows/slycot-build-and-test.yml +++ b/.github/workflows/slycot-build-and-test.yml @@ -285,7 +285,7 @@ jobs: - name: Slycot and python-control tests run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh env: - JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} + JOBNAME: wheel ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -363,7 +363,7 @@ jobs: - name: Slycot and python-control tests run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh env: - JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }} + JOBNAME: conda ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: Report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 753f08caa4c8a0c543f40266c22192676178a94d Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Thu, 2 Feb 2023 20:13:50 +0100 Subject: [PATCH 4/6] Add lower numpy bound --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 1f3314db..601aafed 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -27,7 +27,7 @@ requirements: - libcblas * *netlib - liblapack * *netlib - python - - numpy !=1.23.0 + - numpy >=1.19,!=1.23.0 - pip - scikit-build >=0.15 - setuptools >=45 From 02249d367fb75d28580a7de32f1ffab7905fe726 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Tue, 25 Apr 2023 21:04:19 +0200 Subject: [PATCH 5/6] Don't include package data --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5ee3cb4f..230460fe 100644 --- a/setup.py +++ b/setup.py @@ -58,9 +58,10 @@ def run(self): # These need to stay in setup.py # https://scikit-build.readthedocs.io/en/latest/usage.html#setuptools-options -setup( +setup( packages=['slycot', 'slycot.tests'], cmdclass={'sdist': sdist_checked}, cmake_languages=('C', 'Fortran'), use_scm_version = True, + include_package_data = False, ) From 6c9394e892078e768ddea7b3434792f4b7318ba5 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Wed, 26 Apr 2023 09:33:28 +0200 Subject: [PATCH 6/6] Update SLICOT to 5.8 Update 1 --- slycot/src/SLICOT-Reference | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slycot/src/SLICOT-Reference b/slycot/src/SLICOT-Reference index c1104834..979f39d7 160000 --- a/slycot/src/SLICOT-Reference +++ b/slycot/src/SLICOT-Reference @@ -1 +1 @@ -Subproject commit c1104834c7348b3412973bd86b063faa74219003 +Subproject commit 979f39d7863628407b0f9cae6804efc2833849ab