Merge branch 'v.1.8.14.0' into 'master'

Merge v1.8.14.0 into 'master'

Closes QPR-13622, QPR-13650, QPR-13598, QPR-13645, QPR-12983, QPR-13593, QPR-13632, QPR-13533, QPR-13630, QPR-13046, QPR-13619, QPR-12585, QPR-13605, QPR-13578, QPR-13127, QPR-13592, QPR-13375, QPR-13576, QPR-13473, QPR-13596, QPR-13415, QPR-9432, QPR-13185, QPR-13500, QPR-13585, QPR-12601, QPR-13579, QPR-13577, QPR-13570, QPR-13569, QPR-12106, QPR-13567, QPR-13526, QPR-12228, QPR-13557, QPR-13571, QPR-13498, QPR-13548, QPR-13478, QPR-13562, QPR-13564, QPR-12948, QPR-13529, QPR-12059, QPR-13545, QPR-13550, QPR-13547, QPR-13440, QPR-13353, QPR-13409, QPR-13525, QPR-13481, QPR-13502, QPR-13429, QPR-13517, QPR-12753, QPR-13400, QPR-13518, QPR-13510, QPR-13515, QPR-13093, QPR-13520, QPR-13476, QPR-13516, QPR-13486, QPR-13501, QPR-13487, QPR-13220, QPR-13399, QPR-13470, QPR-13484, QPR-12537, QPR-13485, QPR-12984, QPR-13456, QPR-13436, QPR-13219, QPR-13462, QPR-13395, QPR-13459, QPR-13091, QPR-13442, QPR-13113, QPR-13297, QPR-13416, QPR-12143, QPR-13428, QPR-13452, QPR-13435, QPR-13389, QPR-13404, QPR-13406, QPR-13418, QPR-13393, QPR-13354, QPR-13408, QPR-13410, QPR-13304, QPR-13402, QPR-13255, QPR-13254, QPR-13319, QPR-13370, QPR-13390, QPR-13307, QPR-13387, and QPR-13384

See merge request qs/ore-github!68

Author: pcaspers

.github/workflows/build_macosx86.yml

@@ -17,10 +17,49 @@ jobs:
           - arch: AMD64
             platform: x64
             boost-lib: 64
+            python-wheel: "cp38"
+            python-version: "3.8"
+          - arch: AMD64
+            platform: x64
+            boost-lib: 64
+            python-wheel: "cp39"
+            python-version: "3.9"
+          - arch: AMD64
+            platform: x64
+            boost-lib: 64
+            python-wheel: "cp310"
+            python-version: "3.10"
+          - arch: AMD64
+            platform: x64
+            boost-lib: 64
+            python-wheel: "cp311"
+            python-version: "3.11"
+          - arch: AMD64
+            platform: x64
+            boost-lib: 64
+            python-wheel: "cp312"
+            python-version: "3.12"
+          - arch: AMD64
+            platform: x64
+            boost-lib: 64
+            python-wheel: "cp313"
+            python-version: "3.13"
+
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
+    - name: Set up Python ${{ matrix.python-version }}
+      if: ${{ matrix.python-version }} != "3.13"
+      uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Display Python version
+      run: python -c "import sys; print(sys.version)"
+    - name: Install setuptools for Python 3.12
+      if: ${{ matrix.python-version }} == "3.12"
+      run: |
+        pip install setuptools
     - name: uninstall SWIG 4.1.1
       run: |
         choco uninstall swig
@@ -72,7 +111,7 @@ jobs:
         SET Eigen3_DIR=C:\local\eigen-3.4.0
         mkdir build
         cd build
-        cmake -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_SWIG=false -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DCMAKE_BUILD_TYPE=Release -DMSVC_LINK_DYNAMIC_RUNTIME=OFF -DORE_USE_ZLIB=ON -DQL_ENABLE_SESSIONS=ON -DZLIB_LIBRARY=C:\local\zlib-1.3.1\build\Release\zlibstatic.lib -DZLIB_INCLUDE_DIR=C:\local\zlib-1.3.1 -G "Visual Studio 17 2022" -A ${{ matrix.platform }} ..
+        cmake -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_SWIG=false -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DORE_PYTHON_INTEGRATION=ON -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DCMAKE_BUILD_TYPE=Release -DMSVC_LINK_DYNAMIC_RUNTIME=OFF -DORE_USE_ZLIB=ON -DQL_ENABLE_SESSIONS=ON -DZLIB_LIBRARY=C:\local\zlib-1.3.1\build\Release\zlibstatic.lib -DZLIB_INCLUDE_DIR=C:\local\zlib-1.3.1 -G "Visual Studio 17 2022" -A ${{ matrix.platform }} ..
         cmake --build . --config Release --verbose
     - name: Wrap ORE-SWIG for Python Wheels
       run: |
@@ -94,7 +133,7 @@ jobs:
         ORE_DIR: ${{ github.workspace }}
         ORE_STATIC_RUNTIME: 1
         ORE_USE_ZLIB: 1
-        CIBW_SKIP: cp36-*
+        CIBW_BUILD: ${{matrix.python-wheel}}-*
         #CIBW_BUILD: cp37-win_amd64
         #CIBW_BUILD: cp38-win32
         #CIBW_BUILD: cp37-*
@@ -106,5 +145,5 @@ jobs:
       #if: startsWith(github.ref, 'refs/tags/v')
       uses: actions/upload-artifact@v4
       with:
-        name: wheels-windows-${{ matrix.arch }}
+        name: wheels-windows-${{ matrix.arch }}-${{ matrix.python-version }}
         path: ./wheelhouse/*.whl

.github/workflows/build_windows.yaml

@@ -0,0 +1,110 @@
+name: C/C++ CI Windows Pypy
+
+on:
+  push:
+    tags:
+       - 'v*'
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: building
+    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: AMD64
+            platform: x64
+            boost-lib: 64
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: uninstall SWIG 4.1.1
+      run: |
+        choco uninstall swig
+    - name: install SWIG (4.3.0)
+      run: |
+        curl -L -o swigwin-4.3.0.zip https://sourceforge.net/projects/swig/files/swigwin/swigwin-4.3.0/swigwin-4.3.0.zip
+        Expand-Archive -Path swigwin-4.3.0.zip -DestinationPath $env:GITHUB_WORKSPACE
+        echo "$env:GITHUB_WORKSPACE\swigwin-4.3.0" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        cd swigwin-4.3.0
+        .\swig.exe -version
+    - name: check
+      run: |
+        swig -version
+        swig -help
+    - name: zlib
+      run: |
+        $Url = "https://www.zlib.net/zlib131.zip"
+        (New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\zlib.zip")
+        Expand-Archive -Path "$env:TEMP\zlib.zip" -DestinationPath C:\local
+        cd C:\local\zlib-1.3.1
+        mkdir build
+        cd build
+        cmake ..
+        cmake --build . --config Release
+    - name: eigen
+      run: |
+        $Url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.zip"
+        (New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\eigen.zip")
+        Expand-Archive -Path "$env:TEMP\eigen.zip" -DestinationPath C:\local
+        cd C:\local\eigen-3.4.0
+        mkdir build
+        cd build
+        cmake ..
+    - name: Set up Boost
+      run: |
+        $Url = "https://archives.boost.io/release/1.80.0/binaries/boost_1_80_0-msvc-14.3-${{ matrix.boost-lib }}.exe"
+        (New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
+        Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost"
+        choco install -y ninja
+    - name: cmake configure and build
+      env:
+        BOOST_ROOT: C:\local\boost
+      shell: cmd
+      run: |
+        SET ORE_DIR=%cd%
+        SET ORE=%cd%
+        SET ZLIB_ROOT=C:\local\zlib-1.3.1
+        SET ZLIB_INCLUDE_DIR=C:\local\zlib-1.3.1
+        SET Eigen3_DIR=C:\local\eigen-3.4.0
+        mkdir build
+        cd build
+        cmake -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_SWIG=false -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=OFF -DORE_PYTHON_INTEGRATION=OFF -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DCMAKE_BUILD_TYPE=Release -DMSVC_LINK_DYNAMIC_RUNTIME=OFF -DORE_USE_ZLIB=ON -DQL_ENABLE_SESSIONS=ON -DZLIB_LIBRARY=C:\local\zlib-1.3.1\build\Release\zlibstatic.lib -DZLIB_INCLUDE_DIR=C:\local\zlib-1.3.1 -G "Visual Studio 17 2022" -A ${{ matrix.platform }} ..
+        cmake --build . --config Release --verbose
+    - name: Wrap ORE-SWIG for Python Wheels
+      run: |
+        SET BOOST=C:\local\boost
+        SET Boost_ROOT=C:\local\boost
+        SET BOOST_INCLUDEDIR=C:\local\boost
+        SET BOOST_LIBRARYDIR=C:\local\boost\lib${{ matrix.boost-lib }}-msvc-14.3
+        SET BOOST_LIB64=C:\local\boost\lib${{ matrix.boost-lib }}-msvc-14.3
+        SET BOOST_LIB32=C:\local\boost\lib${{ matrix.boost-lib }}-msvc-14.3
+        cd ${{ github.workspace }}\ORE-SWIG
+        python setup.py wrap
+    - name: Build ORE Wheels
+      uses: pypa/cibuildwheel@v2.22.0
+      env:
+        BOOST: C:\local\boost
+        BOOST_LIB64: C:\local\boost\lib${{ matrix.boost-lib }}-msvc-14.3
+        BOOST_LIB32: C:\local\boost\lib${{ matrix.boost-lib }}-msvc-14.3
+        ORE: ${{ github.workspace }}
+        ORE_DIR: ${{ github.workspace }}
+        ORE_STATIC_RUNTIME: 1
+        ORE_USE_ZLIB: 1
+        CIBW_SKIP: cp*
+        #CIBW_BUILD: cp37-win_amd64
+        #CIBW_BUILD: cp38-win32
+        #CIBW_BUILD: cp37-*
+        CIBW_ARCHS_WINDOWS: ${{ matrix.arch }}
+        CIBW_BUILD_VERBOSITY: 2
+      with:
+        package-dir: ${{ github.workspace }}\ORE-SWIG
+    - name: Save wheels as artifacts
+      #if: startsWith(github.ref, 'refs/tags/v')
+      uses: actions/upload-artifact@v4
+      with:
+        name: wheels-windows-${{ matrix.arch }}-pypy
+        path: ./wheelhouse/*.whl

.github/workflows/build_windows_pypy.yml

@@ -23,6 +23,6 @@ jobs:
         sudo apt update
         sudo apt install -y libboost-all-dev libboost-test-dev ninja-build
     - name: cmake configure
-      run : mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=false -DQL_BUILD_EXAMPLES=false -DQL_BUILD_TEST_SUITE=false -DQL_BUILD_BENCHMARK=false -DQL_ENABLE_SESSIONS=true -DORE_BUILD_DOC=false -DORE_BUILD_SWIG=false -G "Ninja" ..
+      run : mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=false -DQL_BUILD_EXAMPLES=false -DORE_PYTHON_INTEGRATION=ON -DQL_BUILD_TEST_SUITE=false -DQL_BUILD_BENCHMARK=false -DQL_ENABLE_SESSIONS=true -DORE_BUILD_DOC=false -DORE_BUILD_SWIG=false -G "Ninja" ..
     - name: cmake build
       run: cd build/; pwd; cmake --build . -j $(nproc)