use vtkmodules import instead of vtk (#918)

CadQuery · Nov 8, 2021 · 3581904 · 3581904
1 parent 90d11ea
commit 3581904
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/cadquery/occ_impl/assembly.py b/cadquery/occ_impl/assembly.py
@@ -10,7 +10,11 @@
 from OCP.TopLoc import TopLoc_Location
 from OCP.Quantity import Quantity_ColorRGBA
 
-from vtk import vtkActor, vtkPolyDataMapper as vtkMapper, vtkRenderer
+from vtkmodules.vtkRenderingCore import (
+    vtkActor,
+    vtkPolyDataMapper as vtkMapper,
+    vtkRenderer,
+)
 
 from .geom import Location
 from .shapes import Shape, Compound

diff --git a/cadquery/occ_impl/exporters/assembly.py b/cadquery/occ_impl/exporters/assembly.py
@@ -3,7 +3,8 @@
 from tempfile import TemporaryDirectory
 from shutil import make_archive
 
-from vtk import vtkJSONSceneExporter, vtkRenderer, vtkRenderWindow, vtkVRMLExporter
+from vtkmodules.vtkIOExport import vtkJSONSceneExporter, vtkVRMLExporter
+from vtkmodules.vtkRenderingCore import vtkRenderer, vtkRenderWindow
 
 from OCP.XSControl import XSControl_WorkSession
 from OCP.STEPCAFControl import STEPCAFControl_Writer

diff --git a/cadquery/occ_impl/exporters/vtk.py b/cadquery/occ_impl/exporters/vtk.py
@@ -1,4 +1,4 @@
-from vtk import vtkXMLPolyDataWriter
+from vtkmodules.vtkIOXML import vtkXMLPolyDataWriter
 from ..shapes import Shape
 
 

diff --git a/cadquery/occ_impl/shapes.py b/cadquery/occ_impl/shapes.py
@@ -17,11 +17,8 @@
 
 from io import BytesIO
 
-from vtk import (
-    vtkPolyData,
-    vtkTriangleFilter,
-    vtkPolyDataNormals,
-)
+from vtkmodules.vtkCommonDataModel import vtkPolyData
+from vtkmodules.vtkFiltersCore import vtkTriangleFilter, vtkPolyDataNormals
 
 from .geom import Vector, BoundBox, Plane, Location, Matrix
 

diff --git a/mypy.ini b/mypy.ini
@@ -22,7 +22,7 @@ ignore_missing_imports = True
 [mypy-nlopt.*]
 ignore_missing_imports = True
 
-[mypy-vtk.*]
+[mypy-vtkmodules.*]
 ignore_missing_imports = True
 
 [mypy-docutils.*]