Update for 1.23rc1

openturns · May 3, 2024 · 84f24d6 · 84f24d6
1 parent 8d7abbc
commit 84f24d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
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.22 ${{ matrix.abi }}
+          docker run --rm -e MAKEFLAGS='-j2' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh v1.23rc1 ${{ 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.22 ${{ matrix.abi }}
+          docker run --rm -e MAKEFLAGS='-j2' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh v1.23rc1 ${{ 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.22 ${{ matrix.abi }}
+        run: ./build-wheels-macos.sh v1.23rc1 ${{ 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.16 otmorris-0.15 otrobopt-0.13 otsvm-0.13
+for pkgnamever in 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`
   cd /tmp
   git clone --depth 1 -b v${pkgver} https://github.com/openturns/${pkgname}.git && cd ${pkgname}
-  pkgver=${pkgver}.post1
-  ./setVersionNumber.sh ${pkgver}
+  #pkgver=${pkgver}.post1
+  #./utils/setVersionNumber.sh ${pkgver}
   mkdir build && cd build
   cmake -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_INSTALL_LIBDIR=lib \
         -DUSE_SPHINX=OFF -DBUILD_DOC=OFF \

diff --git a/build-wheels-macos.sh b/build-wheels-macos.sh
@@ -14,8 +14,7 @@ TAG=${PYTAG}-${ABI}-${PLATFORM}
 PYVER=${PYTAG:2:1}.${PYTAG:3}
 
 # setup brew dependencies
-brew update
-brew install --overwrite coreutils openblas swig boost python@${PYVER} tbb nlopt cminpack ceres-solver bison flex hdf5 ipopt primesieve spectra pagmo libxml2
+brew install --overwrite coreutils openblas swig boost python@${PYVER} tbb nlopt cminpack ceres-solver bison flex hdf5 ipopt primesieve spectra pagmo libxml2 nanoflann cuba
 export PATH=/Library/Frameworks/Python.framework/Versions/${PYVER}/bin:$PATH
 python${PYVER} -m pip install delocate --break-system-packages
 python${PYVER} -m pip debug --verbose