8000 Merge pull request #244 from bnavigator/ci-2024-12 · python-control/Slycot@a2ee35a · GitHub
[go: up one dir, main page]

Skip to content

Commit a2ee35a

Browse files
authored
Merge pull request #244 from bnavigator/ci-2024-12
Fix some CI errors
2 parents 60d5fa6 + af3fe2d commit a2ee35a

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

.github/scripts/set-conda-test-matrix.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
'win': 'windows',
1111
}
1212

13-
blas_implementations = ['unset', 'Generic', 'OpenBLAS', 'Intel10_64lp']
14-
15-
combinations = {'ubuntu': blas_implementations,
16-
'macos': blas_implementations,
13+
combinations = {'ubuntu': ['unset', 'Generic', 'OpenBLAS', 'Intel10_64lp'],
14+
'macos': ['unset', 'Generic', 'OpenBLAS'],
1715
'windows': ['unset', 'Intel10_64lp'],
1816
}
1917

.github/workflows/slycot-build-and-test.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -154,21 +154,20 @@ jobs:
154154
fetch-depth: 0
155155
submodules: 'recursive'
156156
- name: Setup Conda
157-
uses: conda-incubator/setup-miniconda@v2
157+
uses: conda-incubator/setup-miniconda@v3
158158
with:
159159
python-version: ${{ matrix.python }}
160160
activate-environment: build-env
161161
environment-file: .github/conda-env/build-env.yml
162162
miniforge-version: latest
163-
miniforge-variant: Mambaforge
164163
channel-priority: strict
165164
auto-update-conda: false
166165
auto-activate-base: false
167166
- name: Conda build
168-
shell: bash -l {0}
167+
shell: bash -el {0}
169168
run: |
170169
set -e
171-
conda mambabuild conda-recipe
170+
conda build conda-recipe
172171
# preserve directory structure for custom conda channel
173172
find "${CONDA_PREFIX}/conda-bld" -maxdepth 2 -name 'slycot*.tar.bz2' | while read -r conda_pkg; do
174173
conda_platform=$(basename $(dirname "${conda_pkg}"))
@@ -261,7 +260,7 @@ jobs:
261260
sudo apt-get -y update
262261
case ${{ matrix.blas_lib }} in
263262
Generic ) sudo apt-get -y install libblas3 liblapack3 ;;
264-
unset | OpenBLAS ) sudo apt-get -y install libopenblas-base ;;
263+
unset | OpenBLAS ) sudo apt-get -y install libopenblas0 ;;
265264
*)
266265
echo "BLAS ${{ matrix.blas_lib }} not supported for wheels on Ubuntu"
267266
exit 1 ;;
@@ -317,7 +316,7 @@ jobs:
317316

318317
defaults:
319318
run:
320-
shell: bash -l {0}
319+
shell: bash -el {0}
321320

322321
steps:
323322
- name: Checkout Slycot
@@ -333,11 +332,10 @@ jobs:
333332
if: matrix.os == 'macos'
334333
run: brew install coreutils
335334
- name: Setup Conda
336-
uses: conda-incubator/setup-miniconda@v2
335+
uses: conda-incubator/setup-miniconda@v3
337336
with:
338337
python-version: ${{ matrix.python }}
339338
miniforge-version: latest
340-
miniforge-variant: Mambaforge
341339
activate-environment: test-env
342340
environment-file: slycot-src/.github/conda-env/test-env.yml
343341
channel-priority: strict
@@ -352,25 +350,25 @@ jobs:
352350
set -e
353351
case ${{ matrix.blas_lib }} in
354352
unset ) # the conda-forge default (os dependent)
355-
mamba install libblas libcblas liblapack
353+
conda install libblas libcblas liblapack
356354
;;
357355
Generic )
358-
mamba install 'libblas=*=*netlib' 'libcblas=*=*netlib' 'liblapack=*=*netlib'
356+
conda install 'libblas=*=*netlib' 'libcblas=*=*netlib' 'liblapack=*=*netlib'
359357
echo "libblas * *netlib" >> $CONDA_PREFIX/conda-meta/pinned
360358
;;
361359
OpenBLAS )
362-
mamba install 'libblas=*=*openblas' openblas
360+
conda install 'libblas=*=*openblas' openblas
363361
echo "libblas * *openblas" >> $CONDA_PREFIX/conda-meta/pinned
364362
;;
365363
Intel10_64lp )
366-
mamba install 'libblas=*=*mkl' mkl
364+
conda install 'libblas=*=*mkl' mkl
367365
echo "libblas * *mkl" >> $CONDA_PREFIX/conda-meta/pinned
368366
;;
369367
esac
370-
mamba install -c ./slycot-conda-pkgs slycot
368+
conda install -c ./slycot-conda-pkgs slycot
371369
conda list
372370
- name: Slycot and python-control tests
373-
run: JOBNAME="$JOBNAME" bash slycot-src/.github/scripts/run-tests.sh
371+
run: JOBNAME="$JOBNAME" bash -el slycot-src/.github/scripts/run-tests.sh
374372
env:
375373
JOBNAME: conda ${{ matrix.packagekey }} ${{ matrix.blas_lib }}
376374
- name: report coverage

0 commit comments

Comments
 (0)
0