Update to 1.24rc1

openturns · Oct 23, 2024 · c3327f1 · c3327f1
1 parent 251f8f3
commit c3327f1
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 45 deletions.
diff --git a/.github/workflows/lola.yml b/.github/workflows/lola.yml
@@ -11,12 +11,12 @@ 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 jschueller lola cp38
+          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh jschueller lola
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/LOLA')
         with:
-          files: wheelhouse/openturns-1.24dev-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
+          files: wheelhouse/openturns-1.25dev-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
 
   mingw:
     runs-on: ubuntu-latest
@@ -25,9 +25,9 @@ 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 jschueller lola cp38
+          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh jschueller lola
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/LOLA')
         with:
-          files: wheelhouse/openturns-1.24dev-cp38-abi3-win_amd64.whl
+          files: wheelhouse/openturns-1.25dev-cp39-abi3-win_amd64.whl
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -13,7 +13,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 master cp38
+          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh openturns master
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -31,7 +31,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 master cp38
+          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh openturns master
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -49,7 +49,7 @@ jobs:
       - name: Build
         env:
           MAKEFLAGS: -j3
-        run: ./build-wheels-macos.sh openturns master cp39 13
+        run: ./build-wheels-macos.sh openturns master 13
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -67,7 +67,7 @@ jobs:
       - name: Build
         env:
           MAKEFLAGS: -j3
-        run: ./build-wheels-macos.sh openturns master cp39 14
+        run: ./build-wheels-macos.sh openturns master 14
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -76,4 +76,4 @@ jobs:
         shell: bash -l {0}
         run: |
           conda install -y anaconda-client
-          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force -u openturns-wheels-nightly wheelhouse/*.whl
+          anaconda -t ${{ secrets.ANACONDA_TOKEN }} upload --force -u openturns-wheels-nightly wheelhouse/*.whl
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.23 cp38
+          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh openturns v1.24rc1
       - 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.23 cp38
+          docker run --rm -e MAKEFLAGS='-j4' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh openturns v1.24rc1
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -43,14 +43,35 @@ jobs:
           conda install -y twine
           twine upload --non-interactive wheelhouse/*.whl
 
-  macos:
+  macos-x86_64:
     runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - name: Build
         env:
           MAKEFLAGS: -j3
-        run: ./build-wheels-macos.sh openturns v1.23 cp39 13
+        run: ./build-wheels-macos.sh openturns v1.24rc1 13
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          miniforge-version: latest
+      - name: Upload
+        if: startsWith(github.ref, 'refs/tags/v')
+        shell: bash -l {0}
+        env:
+          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+        run: |
+          conda install -y twine
+          twine upload --non-interactive wheelhouse/*.whl
+
+  macos-arm64:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        env:
+          MAKEFLAGS: -j3
+        run: ./build-wheels-macos.sh openturns v1.24rc1 14
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest

diff --git a/build-wheels-linux.sh b/build-wheels-linux.sh
@@ -2,12 +2,12 @@
 
 set -e -x
 
-test $# = 3 || exit 1
+test $# = 2 || exit 1
 
 REPO="$1"
 GIT_VERSION="$2"
-ABI="$3"
 
+ABI=cp39
 PLATFORM=manylinux2014_x86_64
 PYTAG=${ABI/m/}
 TAG=${PYTAG}-abi3-${PLATFORM}
@@ -25,10 +25,10 @@ VERSION=`cat VERSION`
 #VERSION=${VERSION}.post2
 #./utils/setVersionNumber.sh ${VERSION}
 
-cmake -DCMAKE_INSTALL_PREFIX=$PWD/build/install -DUSE_SPHINX=OFF \
+cmake -DCMAKE_INSTALL_PREFIX=$PWD/build/install \
       -DPython_EXECUTABLE=/opt/python/${PYTAG}-${ABI}/bin/python \
       -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
-      -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03080000" \
+      -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03090000" \
       -B build .
 cd build
 make install
@@ -68,19 +68,17 @@ NEW_LIBOT=`basename openturns.libs/libOT-*.so*`
 cd -
 
 # modules
-for pkgnamever in otfftw-0.15 otmixmod-0.17 otmorris-0.16 otrobopt-0.14 otsvm-0.14
+for pkgnamever in otfftw-0.16 otmixmod-0.18 otmorris-0.17 otrobopt-0.15 otsvm-0.15
 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}
-  sed -i "s|Metadata-Version: 2.0|Metadata-Version: 1.2|g" python/src/METADATA.in
-  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=0x03080000" \
-        -DUSE_SPHINX=OFF -DBUILD_DOC=OFF \
+        -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03090000" \
         -DPython_EXECUTABLE=/opt/python/${PYTAG}-${ABI}/bin/python \
         -DOpenTURNS_DIR=/tmp/openturns/build/install/lib64/cmake/openturns \
         -B build .

diff --git a/build-wheels-macos.sh b/build-wheels-macos.sh
@@ -2,19 +2,19 @@
 
 set -e -x
 
-test $# = 4 || exit 1
+test $# = 3 || exit 1
 
 REPO="$1"
 GIT_VERSION="$2"
-ABI="$3"
-SDK_VERSION="$4"
+SDK_VERSION="$3"
 
 env
 uname -a
 sw_vers -productVersion
 
 # this should reflect the CI image being used
 PLATFORM="macosx_${SDK_VERSION}_0_`uname -m`"
+ABI=cp39
 PYTAG=${ABI/m/}
 TAG=${PYTAG}-abi3-${PLATFORM}
 PYVER=${PYTAG:2:1}.${PYTAG:3}
@@ -52,8 +52,6 @@ cmake -LAH -DCMAKE_INSTALL_PREFIX=$PWD/build/install \
       -DLIBXML2_INCLUDE_DIR=${BREWPREFIX}/opt/libxml2/include \
       -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
       -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03090000" \
-      -DUSE_SPHINX=OFF \
-      -DUSE_HDF5=OFF \
       -DOPENTURNS_HAVE_USELOCALE=0 \
       -DCMAKE_OSX_DEPLOYMENT_TARGET=${SDK_VERSION}.0 \
       -B build .
@@ -91,19 +89,17 @@ python${PYVER} -c "import openturns as ot; print(ot.__version__)"
 grep -q dev <<< "${VERSION}" && exit 0
 
 # modules
-for pkgnamever in otmorris-0.16 otrobopt-0.14 otsvm-0.14
+for pkgnamever in otmorris-0.17 otrobopt-0.15 otsvm-0.15
 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}
-  sed -i'.bak' "s|Metadata-Version: 2.0|Metadata-Version: 1.2|g" python/src/METADATA.in
 #   pkgver=${pkgver}.post1
 #   ./utils/setVersionNumber.sh ${pkgver}
   cmake -LAH -DCMAKE_INSTALL_PREFIX=$PWD/build/install \
         -DCMAKE_UNITY_BUILD=ON \
         -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03090000" \
-        -DUSE_SPHINX=OFF -DBUILD_DOC=OFF \
         -DPython_EXECUTABLE=${BREWPREFIX}/bin/python${PYVER} \
         -DPython_LIBRARY=${PYLIB} \
         -DPython_INCLUDE_DIR=${PYINC} \
@@ -120,11 +116,11 @@ do
   # copy libs
   mkdir ${pkgname}/.dylibs
   cp -v ../../lib${pkgname}.0.dylib ${pkgname}/.dylibs
-  install_name_tool -change @rpath/libOT.0.24.dylib @loader_path/../../openturns/.dylibs/libOT.0.24.0.dylib ${pkgname}/.dylibs/lib${pkgname}.0.dylib
+  install_name_tool -change @rpath/libOT.0.25.dylib @loader_path/../../openturns/.dylibs/libOT.0.25.0.dylib ${pkgname}/.dylibs/lib${pkgname}.0.dylib
   install_name_tool -delete_rpath /tmp/openturns/build/install/lib ${pkgname}/.dylibs/lib${pkgname}.0.dylib
   install_name_tool -delete_rpath /tmp/${pkgname}/build/install/lib ${pkgname}/.dylibs/lib${pkgname}.0.dylib
   otool -l ${pkgname}/.dylibs/lib${pkgname}.0.dylib
-  install_name_tool -change @rpath/libOT.0.24.dylib @loader_path/../openturns/.dylibs/libOT.0.24.0.dylib ${pkgname}/_${pkgname}.so
+  install_name_tool -change @rpath/libOT.0.25.dylib @loader_path/../openturns/.dylibs/libOT.0.25.0.dylib ${pkgname}/_${pkgname}.so
   install_name_tool -change @rpath/lib${pkgname}.0.dylib @loader_path/.dylibs/lib${pkgname}.0.dylib ${pkgname}/_${pkgname}.so
   install_name_tool -delete_rpath /tmp/openturns/build/install/lib ${pkgname}/_${pkgname}.so
   install_name_tool -delete_rpath /tmp/${pkgname}/build/install/lib ${pkgname}/_${pkgname}.so

diff --git a/build-wheels-mingw.sh b/build-wheels-mingw.sh
@@ -2,16 +2,16 @@
 
 set -e -x
 
-test $# = 3 || exit 1
+test $# = 2 || exit 1
 
 REPO="$1"
 GIT_VERSION="$2"
-ABI="$3"
 
 ARCH=x86_64
 MINGW_PREFIX=/usr/${ARCH}-w64-mingw32
 PLATFORM=win_amd64
 
+ABI=cp39
 PYTAG=${ABI/m/}
 PYVER=${PYTAG:2}
 TAG=${PYTAG}-abi3-${PLATFORM}
@@ -20,17 +20,15 @@ cd /tmp
 git clone --depth 1 -b ${GIT_VERSION} https://github.com/${REPO}/openturns.git
 cd openturns
 VERSION=`cat VERSION`
-sed -i "s|Development.Module|Development.Module Development.SABIModule|g" CMakeLists.txt
 
 PREFIX=$PWD/install
 ${ARCH}-w64-mingw32-cmake \
   -DCMAKE_INSTALL_PREFIX=${PREFIX} \
   -DPython_INCLUDE_DIR=${MINGW_PREFIX}/include/python${PYVER} \
   -DPython_LIBRARY=${MINGW_PREFIX}/lib/libpython3.dll.a \
   -DPython_EXECUTABLE=/usr/bin/${ARCH}-w64-mingw32-python${PYVER}-bin \
-  -DUSE_SPHINX=OFF \
   -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
-  -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03080000" \
+  -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03090000" \
   .
 
 make install
@@ -58,25 +56,22 @@ grep -q dev <<< "${VERSION}" && exit 0
 aurman -S mingw-w64-fftw mingw-w64-agrum mingw-w64-libmixmod --noconfirm --noedit --pgp_fetch
 
 # modules
-for pkgnamever in otfftw-0.15 otmixmod-0.17 otmorris-0.16 otrobopt-0.14 otsvm-0.14
+for pkgnamever in otfftw-0.16 otmixmod-0.18 otmorris-0.17 otrobopt-0.15 otsvm-0.15
 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}
-  sed -i "s|Metadata-Version: 2.0|Metadata-Version: 1.2|g" python/src/METADATA.in
-  pkgver=${pkgver}.post1
-  ./utils/setVersionNumber.sh ${pkgver}
-  sed -i "s|Development.Module|Development.Module Development.SABIModule|g" CMakeLists.txt
+#   pkgver=${pkgver}.post1
+#   ./utils/setVersionNumber.sh ${pkgver}
   PREFIX=$PWD/install
   ${ARCH}-w64-mingw32-cmake \
     -DCMAKE_INSTALL_PREFIX=${PREFIX} \
     -DCMAKE_UNITY_BUILD=ON \
-    -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03080000" \
+    -DSWIG_COMPILE_FLAGS="-O1 -DPy_LIMITED_API=0x03090000" \
     -DPython_INCLUDE_DIR=${MINGW_PREFIX}/include/python${PYVER} \
     -DPython_LIBRARY=${MINGW_PREFIX}/lib/libpython3.dll.a \
     -DPython_EXECUTABLE=/usr/bin/${ARCH}-w64-mingw32-python${PYVER}-bin \
-    -DUSE_SPHINX=OFF -DBUILD_DOC=OFF \
     -DOpenTURNS_DIR=/tmp/openturns/install/lib/cmake/openturns \
     .
   make install