Skip to content

feat: Adapt the plugins import to Paraview 6.0 #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2025
Merged

feat: Adapt the plugins import to Paraview 6.0 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9007583
Fix import of vtkMergeBlocks for newer paraview
paloma-martinez Oct 8, 2025
698eecf
Change condition strategy due to doc build issues
paloma-martinez Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,16 @@
ComponentNameEnum,
GeosMeshOutputsEnum,
)
from paraview.modules.vtkPVVTKExtensionsMisc import ( # type: ignore[import-not-found]
vtkMergeBlocks, )
from packaging.version import Version

# TODO: remove this condition when all codes are adapted for Paraview 6.0
import vtk
if Version( vtk.__version__ ) >= Version( "9.5" ):
from vtkmodules.vtkFiltersParallel import vtkMergeBlocks
else:
from paraview.modules.vtkPVVTKExtensionsMisc import ( # type: ignore[import-not-found]
vtkMergeBlocks, )

from paraview.simple import ( # type: ignore[import-not-found]
FindSource, GetActiveView, GetAnimationScene, GetDisplayProperties, GetSources, servermanager,
)
Expand Down
12 changes: 10 additions & 2 deletions geos-pv/src/geos/pv/utils/paraviewTreatments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,16 @@
import numpy as np
import numpy.typing as npt
import pandas as pd # type: ignore[import-untyped]
from paraview.modules.vtkPVVTKExtensionsMisc import ( # type: ignore[import-not-found]
vtkMergeBlocks, )

from packaging.version import Version

# TODO: remove this condition when all codes are adapted for Paraview 6.0
import vtk
if Version( vtk.__version__ ) >= Version( "9.5" ):
from vtkmodules.vtkFiltersParallel import vtkMergeBlocks
else:
from paraview.modules.vtkPVVTKExtensionsMisc import ( # type: ignore[import-not-found]
vtkMergeBlocks, )
from paraview.simple import ( # type: ignore[import-not-found]
FindSource, GetActiveView, GetAnimationScene, GetDisplayProperties, GetSources, servermanager,
)
Expand Down