diff --git a/.github/workflows/slycot-build-and-test.yml b/.github/workflows/slycot-build-and-test.yml index 9c68b243..050a6097 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: wheel ${{ 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: conda ${{ matrix.packagekey }} ${{ matrix.blas_lib }} - name: Report coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 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 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, ) 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