Merge pull request #1120 from julien-tierny/dev

[ttk-paraview] updated patch set (pv6)

Author: julien-tierny

ChangeLog.md

@@ -4,6 +4,7 @@
 - Distributed computation of persistent homology!
 - New backend for TrackingFromFields (critical point based)
 - Fast planar Rips filtration persistence computation
+- Migration to ParaView 6
 - CI updates
 
 ### 1.3.0

paraview/patch/headless.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
     steps:
     - uses: actions/checkout@v4
       name: Checkout TTK-ParaView source code
@@ -41,6 +41,7 @@ jobs:
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=lib/python3/dist-packages \
           -DPARAVIEW_USE_MPI=ON \
+          -DPARAVIEW_USE_PYTHON=ON \
           -DPARAVIEW_USE_QT=OFF \
           -DVTK_USE_X=OFF \
           -DVTK_OPENGL_HAS_OSMESA=ON \
@@ -82,20 +83,13 @@ jobs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.12'
+        python-version: '3.13'
 
     - name: Install macOS dependencies
       run: |
         # ParaView dependencies
         brew install --cask xquartz
-        brew install llvm lld ninja open-mpi
-
-    - name: Set compilers as environment variables
-      run: |
-        echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
-        echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
-        echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
-        echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV
+        brew install ninja open-mpi
 
     - name: Create & configure ParaView build directory
       run: |
@@ -122,14 +116,14 @@ jobs:
         cd build
         sudo cmake --build . --target install
         # pvpython does not embed the correct PYTHONPATH
-        echo "PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH" >> $GITHUB_ENV
+        echo "PYTHONPATH=/usr/local/lib/python3.13/site-packages:$PYTHONPATH" >> $GITHUB_ENV
 
     - name: Test Python imports
       run: |
-        python3 -m vtk
-        python3 -m paraview.simple
-        pvpython -m vtk
-        pvpython -m paraview.simple
+        echo "import vtk" | python3
+        echo "from paraview.simple import *" | python3
+        echo "import vtk" | pvpython
+        echo "from paraview.simple import *" | pvpython
       env:
         DYLD_LIBRARY_PATH: /usr/local/lib
 
@@ -237,14 +231,6 @@ jobs:
     - name: Fetch all uploaded artifacts
       uses: actions/download-artifact@v4
 
-    - name: Upload Ubuntu Focal .deb as Release Asset
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        tag: ${{ github.ref }}
-        file: ttk-paraview-headless-ubuntu-20.04/ttk-paraview.deb
-        asset_name: ttk-paraview-headless-ubuntu-20.04.deb
-
     - name: Upload Ubuntu Jammy .deb as Release Asset
       uses: svenstaro/upload-release-action@v2
       with:

paraview/patch/package.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
     steps:
     - uses: actions/checkout@v4
       name: Checkout TTK-ParaView source code
@@ -85,20 +85,13 @@ jobs:
 
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.12'
+        python-version: '3.13'
 
     - name: Install macOS dependencies
       run: |
         # ParaView dependencies
         brew install --cask xquartz
-        brew install llvm lld mesa glew qt@5 ninja 
-
-    - name: Set compilers as environment variables
-      run: |
-        echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
-        echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
-        echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
-        echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV
+        brew install mesa glew qt@5 ninja 
 
     - name: Create & configure ParaView build directory
       run: |
@@ -124,14 +117,14 @@ jobs:
         cd build
         sudo cmake --build . --target install
         # pvpython does not embed the correct PYTHONPATH
-        echo "PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH" >> $GITHUB_ENV
+        echo "PYTHONPATH=/usr/local/lib/python3.13/site-packages:$PYTHONPATH" >> $GITHUB_ENV
 
     - name: Test Python imports
       run: |
-        python3 -m vtk
-        python3 -m paraview.simple
-        pvpython -m vtk
-        pvpython -m paraview.simple
+        echo "import vtk" | python3
+        echo "from paraview.simple import *" | python3
+        echo "import vtk" | pvpython
+        echo "from paraview.simple import *" | pvpython
       env:
         DYLD_LIBRARY_PATH: /usr/local/lib
 
@@ -238,14 +231,6 @@ jobs:
     - name: Fetch all uploaded artifacts
       uses: actions/download-artifact@v4
 
-    - name: Upload Ubuntu Focal .deb as Release Asset
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        tag: ${{ github.ref }}
-        file: ttk-paraview-ubuntu-20.04/ttk-paraview.deb
-        asset_name: ttk-paraview-$tag-ubuntu-20.04.deb
-
     - name: Upload Ubuntu Jammy .deb as Release Asset
       uses: svenstaro/upload-release-action@v2
       with: