Update for 1.24

openturns · Nov 25, 2024 · a18a94b · a18a94b
1 parent 0d8b90b
commit a18a94b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
@@ -8,7 +8,7 @@ jobs:
       - name: Build
         run: |
           docker pull openturns/manylinux2014_x86_64
-          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh openturns v1.24rc1
+          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh openturns v1.24
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -29,7 +29,7 @@ jobs:
       - name: Build
         run: |
           docker pull openturns/archlinux-mingw
-          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh openturns v1.24rc1
+          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh openturns v1.24
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -71,7 +71,7 @@ jobs:
       - name: Build
         env:
           MAKEFLAGS: -j3
-        run: ./build-wheels-macos.sh openturns v1.24rc1 14
+        run: ./build-wheels-macos.sh openturns v1.24 14
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest

diff --git a/build-wheels-linux.sh b/build-wheels-linux.sh
@@ -74,8 +74,8 @@ do
   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
-#   ./utils/setVersionNumber.sh ${pkgver}
+  pkgver=${pkgver}.post1
+  ./utils/setVersionNumber.sh ${pkgver}
   cmake -DCMAKE_INSTALL_PREFIX=$PWD/build/install -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_UNITY_BUILD=ON \
         -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03090000" \

diff --git a/build-wheels-macos.sh b/build-wheels-macos.sh
@@ -20,6 +20,7 @@ TAG=${PYTAG}-abi3-${PLATFORM}
 PYVER=${PYTAG:2:1}.${PYTAG:3}
 
 # setup brew dependencies
+brew install pkgconf --overwrite --force
 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
@@ -95,8 +96,9 @@ do
   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
-#   ./utils/setVersionNumber.sh ${pkgver}
+  pkgver=${pkgver}.post1
+  curl -o utils/setVersionNumber.sh https://raw.githubusercontent.com/openturns/ottemplate/refs/heads/master/utils/setVersionNumber.sh
+  ./utils/setVersionNumber.sh ${pkgver}
   cmake -LAH -DCMAKE_INSTALL_PREFIX=$PWD/build/install \
         -DCMAKE_UNITY_BUILD=ON \
         -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03090000" \

diff --git a/build-wheels-mingw.sh b/build-wheels-mingw.sh
@@ -62,8 +62,8 @@ do
   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
-#   ./utils/setVersionNumber.sh ${pkgver}
+  pkgver=${pkgver}.post1
+  ./utils/setVersionNumber.sh ${pkgver}
   PREFIX=$PWD/install
   ${ARCH}-w64-mingw32-cmake \
     -DCMAKE_INSTALL_PREFIX=${PREFIX} \