Update for 1.23

openturns · Jun 5, 2024 · e4e3df1 · e4e3df1
1 parent 220071f
commit e4e3df1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 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.23rc1 ${ABI}
+    ./build-wheels-macos.sh v1.23 ${ABI}
   upload_script:
     - ls -l wheelhouse/*.whl
     - if test -n "${CIRRUS_TAG}"; then python${PYVER} -m pip install twine --break-system-packages && 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.23rc1 ${{ matrix.abi }}
+          docker run --rm -e MAKEFLAGS='-j2' -v `pwd`:/io openturns/manylinux2014_x86_64 /io/build-wheels-linux.sh v1.23 ${{ matrix.abi }}
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -35,7 +35,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.23rc1 ${{ matrix.abi }}
+          docker run --rm -e MAKEFLAGS='-j2' -v `pwd`:/io openturns/archlinux-mingw /io/build-wheels-mingw.sh v1.23 ${{ matrix.abi }}
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
@@ -59,7 +59,7 @@ jobs:
       - name: Build
         env:
           MAKEFLAGS: -j3
-        run: ./build-wheels-macos.sh v1.23rc1 ${{ matrix.abi }}
+        run: ./build-wheels-macos.sh v1.23 ${{ 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
@@ -19,7 +19,6 @@ export PATH=/opt/python/${PYTAG}-${ABI}/bin/:$PATH
 cd /tmp
 git clone --depth 1 -b ${GIT_VERSION} https://github.com/openturns/openturns.git
 cd openturns
-sed -i "s|Metadata-Version: 2.0|Metadata-Version: 1.2|g" python/src/METADATA.in
 VERSION=`cat VERSION`
 
 #mv openturns-${VERSION} openturns-${VERSION}.post2
@@ -76,8 +75,8 @@ do
   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}
   mkdir build && cd build
   cmake -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_UNITY_BUILD=ON \

diff --git a/build-wheels-macos.sh b/build-wheels-macos.sh
@@ -29,7 +29,6 @@ SCRIPTPATH=`dirname "$SCRIPT"`
 cd /tmp
 git clone --depth 1 -b ${GIT_VERSION} https://github.com/openturns/openturns.git
 cd openturns
-sed -i'.bak' "s|Metadata-Version: 2.0|Metadata-Version: 1.2|g" python/src/METADATA.in
 git diff
 VERSION=`cat VERSION`
 

diff --git a/build-wheels-mingw.sh b/build-wheels-mingw.sh
@@ -18,7 +18,6 @@ TAG=${PYTAG}-${ABI}-${PLATFORM}
 cd /tmp
 git clone --depth 1 -b ${GIT_VERSION} https://github.com/openturns/openturns.git
 cd openturns
-sed -i "s|Metadata-Version: 2.0|Metadata-Version: 1.2|g" python/src/METADATA.in
 VERSION=`cat VERSION`
 
 PREFIX=$PWD/install
@@ -64,8 +63,8 @@ do
   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}
   PREFIX=$PWD/install
   ${ARCH}-w64-mingw32-cmake \
     -DCMAKE_INSTALL_PREFIX=${PREFIX} \