Update for 1.22

openturns · Jan 9, 2024 · b9a332f · b9a332f
1 parent 50b3c46
commit b9a332f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -22,7 +22,7 @@ cirrus_wheels_macos_arm64_task:
         PYVER: 3.12
         ABI: cp312
   build_script:
-    ./build-wheels-macos.sh v1.22rc1 ${ABI}
+    ./build-wheels-macos.sh v1.22 ${ABI}
   upload_script:
     - ls -l wheelhouse/*.whl
     - if test -n "${CIRRUS_TAG}"; then python${PYVER} -m pip install twine && python${PYVER} -m twine upload wheelhouse/*.whl; fi
diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Build
         run: |
           docker pull openturns/manylinux2014_x86_64
-          docker run --rm -e MAKEFLAGS='-j2' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh v1.22rc1 ${{ matrix.abi }}
+          docker run --rm -e MAKEFLAGS='-j2' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh v1.22 ${{ matrix.abi }}
       - uses: conda-incubator/setup-miniconda@v2
         with:
           auto-activate-base: true
@@ -36,7 +36,7 @@ jobs:
       - name: Build
         run: |
           docker pull openturns/archlinux-mingw
-          docker run --rm -e MAKEFLAGS='-j2' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh v1.22rc1 ${{ matrix.abi }}
+          docker run --rm -e MAKEFLAGS='-j2' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh v1.22 ${{ matrix.abi }}
       - uses: conda-incubator/setup-miniconda@v2
         with:
           auto-activate-base: true
@@ -61,7 +61,7 @@ jobs:
       - name: Build
         env:
           MAKEFLAGS: -j3
-        run: ./build-wheels-macos.sh v1.22rc1 ${{ matrix.abi }}
+        run: ./build-wheels-macos.sh v1.22 ${{ matrix.abi }}
       - id: getfilename
         run: echo "file=$(ls wheelhouse/*.whl)" >> $GITHUB_OUTPUT
       - name: Archive wheel

diff --git a/build-wheels-linux.sh b/build-wheels-linux.sh
@@ -68,14 +68,14 @@ NEW_LIBOT=`basename openturns.libs/libOT-*.so*`
 cd -
 
 # modules
-for pkgnamever in otfftw-0.14 otmixmod-0.15 otmorris-0.15 otrobopt-0.13 otsvm-0.13
+for pkgnamever in otfftw-0.14 otmixmod-0.16 otmorris-0.15 otrobopt-0.13 otsvm-0.13
 do
   pkgname=`echo ${pkgnamever} | cut -d "-" -f1`
   pkgver=`echo ${pkgnamever} | cut -d "-" -f2`
   cd /tmp
   git clone --depth 1 -b v${pkgver} https://github.com/openturns/${pkgname}.git && cd ${pkgname}
-#   pkgver=${pkgver}.post4
-#   ./setVersionNumber.sh ${pkgver}
+  pkgver=${pkgver}.post1
+  ./setVersionNumber.sh ${pkgver}
   mkdir build && cd build
   cmake -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_INSTALL_LIBDIR=lib \
         -DUSE_SPHINX=OFF -DBUILD_DOC=OFF \
@@ -95,6 +95,7 @@ do
   mkdir ${pkgname}.libs
   cp -v ../../lib${pkgname}.so.0 ${pkgname}.libs
   if test "${pkgname}" = "otfftw"; then cp -v /usr/local/lib/libfftw3.so.3 otfftw.libs; fi
+  if test "${pkgname}" = "otmixmod"; then cp -v /usr/local/lib/libmixmod.so.3.* otmixmod.libs; fi
 
   # relink
   patchelf --remove-rpath ${pkgname}.libs/lib${pkgname}.so.0 ${pkgname}/_${pkgname}.so

diff --git a/build-wheels-mingw.sh b/build-wheels-mingw.sh
@@ -56,14 +56,14 @@ grep -q dev <<< "${VERSION}" && exit 0
 sudo pacman -Sy --noconfirm mingw-w64-fftw mingw-w64-agrum  # for otfftw, otagrum
 
 # modules
-for pkgnamever in otfftw-0.14 otmixmod-0.15 otmorris-0.15 otrobopt-0.13 otsvm-0.13
+for pkgnamever in otfftw-0.14 otmixmod-0.16 otmorris-0.15 otrobopt-0.13 otsvm-0.13
 do
   pkgname=`echo ${pkgnamever} | cut -d "-" -f1`
   pkgver=`echo ${pkgnamever} | cut -d "-" -f2`
   cd /tmp
   git clone --depth 1 -b v${pkgver} https://github.com/openturns/${pkgname}.git && cd ${pkgname}
-#   pkgver=${pkgver}.post4
-#   ./setVersionNumber.sh ${pkgver}
+  pkgver=${pkgver}.post1
+  ./setVersionNumber.sh ${pkgver}
   PREFIX=$PWD/install
   ${ARCH}-w64-mingw32-cmake \
     -DCMAKE_INSTALL_PREFIX=${PREFIX} \
@@ -78,6 +78,7 @@ do
   cp -v ${PREFIX}/bin/*.dll ${PREFIX}/Lib/site-packages/${pkgname}
   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
   cd ${PREFIX}/Lib/site-packages
   python /io/write_RECORD.py ${pkgname} ${pkgver}
   zip -r ${pkgname}-${pkgver}-${TAG}.whl ${pkgname} ${pkgname}-${pkgver}.dist-info