From 73dc0aaae503ee24e9173fbfba1e846d1d15ad85 Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Wed, 5 Jun 2024 14:41:28 +0200 Subject: [PATCH] Update for 1.23 --- .github/workflows/build.yml | 17 ++++++++--------- run_docker_build.sh | 5 +++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0900294..7d6dd63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['1.21rc1'] - pyver: ['3.8', '3.9', '3.10', '3.11'] + version: ['1.23'] + pyver: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v3 - name: Build @@ -18,10 +18,9 @@ jobs: if: startsWith(github.ref, 'refs/tags/') with: files: | - otagrum-0.8-py${{ matrix.pyver }}-x86_64.exe - otfftw-0.13-py${{ matrix.pyver }}-x86_64.exe - otmixmod-0.14-py${{ matrix.pyver }}-x86_64.exe - otmorris-0.14-py${{ matrix.pyver }}-x86_64.exe - otrobopt-0.12-py${{ matrix.pyver }}-x86_64.exe - otsubsetinverse-1.10-py${{ matrix.pyver }}-x86_64.exe - otsvm-0.12-py${{ matrix.pyver }}-x86_64.exe + otagrum-0.10-py${{ matrix.pyver }}-x86_64.exe + otfftw-0.15-py${{ matrix.pyver }}-x86_64.exe + otmixmod-0.17-py${{ matrix.pyver }}-x86_64.exe + otmorris-0.16-py${{ matrix.pyver }}-x86_64.exe + otrobopt-0.14-py${{ matrix.pyver }}-x86_64.exe + otsvm-0.14-py${{ matrix.pyver }}-x86_64.exe diff --git a/run_docker_build.sh b/run_docker_build.sh index 59249c1..b9e2e4e 100755 --- a/run_docker_build.sh +++ b/run_docker_build.sh @@ -10,7 +10,7 @@ usage() test $# -ge 2 || usage -sudo pacman -Sy --noconfirm mingw-w64-fftw mingw-w64-agrum # for otfftw, otagrum +sudo pacman -Sy --noconfirm mingw-w64-fftw mingw-w64-agrum mingw-w64-libmixmod # for otfftw, otagrum, otmixmod OTVERSION=$1 PYBASEVER=$2 @@ -26,7 +26,7 @@ curl -L https://github.com/openturns/build/releases/download/v${OTVERSION}/opent sudo cp -r install/* ${MINGW_PREFIX} # for each module -for pkgnamever in otagrum-0.8 otfftw-0.13 otmixmod-0.14 otmorris-0.14 otrobopt-0.12 otsubsetinverse-1.10 otsvm-0.12 +for pkgnamever in otagrum-0.10 otfftw-0.15 otmixmod-0.17 otmorris-0.16 otrobopt-0.14 otsvm-0.14 do pkgname=`echo ${pkgnamever}|cut -d "-" -f1` pkgver=`echo ${pkgnamever}|cut -d "-" -f2` @@ -45,6 +45,7 @@ do ${ARCH}-w64-mingw32-strip --strip-unneeded ${PREFIX}/bin/*.dll ${PREFIX}/Lib/site-packages/${pkgname}/*.pyd if test "${pkgname}" = "otfftw"; then cp -v ${MINGW_PREFIX}/bin/libfftw*.dll ${PREFIX}/Lib/site-packages/${pkgname}; fi if test "${pkgname}" = "otagrum"; then cp -v ${MINGW_PREFIX}/bin/libagrum.dll ${PREFIX}/Lib/site-packages/${pkgname}; fi + if test "${pkgname}" = "otmixmod"; then cp -v ${MINGW_PREFIX}/bin/libmixmod.dll ${PREFIX}/Lib/site-packages/${pkgname}; fi if test "${pkgname}" != "otagrum"; then cp ${PREFIX}/bin/lib${pkgname}.dll ${PREFIX}/Lib/site-packages/${pkgname} && OPENTURNS_NUM_THREADS=2 ctest -R pyinstall --output-on-failure --timeout 200 ${MAKEFLAGS}; fi cd distro/windows