trame-vtk maintenance (pyvista#4183)

* Bump trame-vtk 2.4 * Move trame axis button * Fix logging suppression * Remove unneeded log suppression * Remove enable_vtk_warnings
Onandon11 · Mar 26, 2023 · 1fa12fd · 1fa12fd
1 parent 1736481
commit 1fa12fd
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 35 deletions.
diff --git a/docker/requirements.txt b/docker/requirements.txt
@@ -11,5 +11,5 @@ pythreejs
 trame
 trame-client>=2.4.2
 trame-server>=2.7.1
-trame-vtk>=2.0.17
+trame-vtk>=2.4.0
 trimesh
diff --git a/environment.yml b/environment.yml
@@ -28,9 +28,9 @@ dependencies:
   - ipyvtklink
   - pythreejs
   - pooch
+  - trame>=2.2.6
+  - trame-client>=2.4.2
+  - trame-server>=2.8.0
+  - trame-vtk>=2.4.0
   - pip:
       - pytest-memprof
-      - trame>=2.2.6
-      - trame-client>=2.4.2
-      - trame-server>=2.8.0
-      - trame-vtk>=2.0.17
diff --git a/examples_trame/requirements.txt b/examples_trame/requirements.txt
@@ -2,4 +2,4 @@ pyvista
 trame>=2.2.6
 trame-client>=2.4.2
 trame-server>=2.7.1
-trame-vtk>=2.0.17
+trame-vtk>=2.4.0
diff --git a/pyproject.toml b/pyproject.toml
@@ -60,13 +60,13 @@ jupyter = [
     'trame>=2.2.6',
     'trame-client>=2.4.2',
     'trame-server>=2.8.0',
-    'trame-vtk>=2.0.17',
+    'trame-vtk>=2.4.0',
 ]
 trame = [
     'trame>=2.2.6',
     'trame-client>=2.4.2',
     'trame-server>=2.8.0',
-    'trame-vtk>=2.0.17',
+    'trame-vtk>=2.4.0',
 ]
 
 [project.urls]

diff --git a/pyvista/themes.py b/pyvista/themes.py
@@ -1271,7 +1271,6 @@ class _TrameConfig(_ThemeConfig):
         '_server_proxy_enabled',
         '_server_proxy_prefix',
         '_default_mode',
-        '_enable_vtk_warnings',
     ]
 
     def __init__(self):
@@ -1288,9 +1287,6 @@ def __init__(self):
         else:
             self._server_proxy_prefix = prefix
         self._default_mode = 'trame'
-        self._enable_vtk_warnings = (
-            os.environ.get('VTK_ENABLE_SERIALIZER_WARNINGS', 'false').lower() == 'true'
-        )
 
     @property
     def interactive_ratio(self) -> Number:
@@ -1386,15 +1382,6 @@ def default_mode(self):
     def default_mode(self, mode: str):
         self._default_mode = mode
 
-    @property
-    def enable_vtk_warnings(self) -> bool:
-        """Return or set if VTK web serializer warnings are enabled."""
-        return self._enable_vtk_warnings
-
-    @enable_vtk_warnings.setter
-    def enable_vtk_warnings(self, enabled: bool):
-        self._enable_vtk_warnings = bool(enabled)
-
 
 class DefaultTheme(_ThemeConfig):
     """PyVista default theme.

diff --git a/pyvista/trame/jupyter.py b/pyvista/trame/jupyter.py
@@ -124,13 +124,6 @@ def launch_server(server=None, port=None, host=None):
         # Default to `127.0.0.1` unless user sets TRAME_DEFAULT_HOST
         host = os.environ.get('TRAME_DEFAULT_HOST', '127.0.0.1')
 
-    # Disable serializer errors/warnings for a cleaner output in Jupyter
-    # Do this on server launch and not at top level so that it only happens
-    # in Jupyter
-    if not pyvista.global_theme.trame.enable_vtk_warnings:
-        vtk_logger = logging.getLogger("vtkmodules.web.render_window_serializer")
-        vtk_logger.disabled = True
-
     # Must enable all used modules
     html_widgets.initialize(server)
     vtk_widgets.initialize(server)

diff --git a/pyvista/trame/ui.py b/pyvista/trame/ui.py
@@ -332,6 +332,11 @@ def ui_controls(self, mode=None, default_server_rendering=True, v_show=None):
                 icons=('mdi-ruler-square', 'mdi-ruler-square'),
                 tooltip=f"Toggle ruler ({{{{ {self.GRID} ? 'on' : 'off' }}}})",
             )
+            checkbox(
+                model=(self.AXIS, False),
+                icons=('mdi-axis-arrow-info', 'mdi-axis-arrow-info'),
+                tooltip=f"Toggle axis ({{{{ {self.AXIS} ? 'on' : 'off' }}}})",
+            )
             # Server rendering options
             if mode == 'trame':
                 vuetify.VDivider(vertical=True, classes='mx-1')
@@ -344,11 +349,6 @@ def ui_controls(self, mode=None, default_server_rendering=True, v_show=None):
                 v_show=(self.SERVER_RENDERING, default_server_rendering),
                 classes='pa-0 ma-0 align-center',
             ):
-                checkbox(
-                    model=(self.AXIS, False),
-                    icons=('mdi-axis-arrow-info', 'mdi-axis-arrow-info'),
-                    tooltip=f"Toggle axis ({{{{ {self.AXIS} ? 'on' : 'off' }}}})",
-                )
 
                 def attach_screenshot():
                     return server.protocol.addAttachment(self.screenshot())

diff --git a/requirements_docs.txt b/requirements_docs.txt
@@ -33,6 +33,6 @@ sympy==1.11.1
 trame==2.3.2
 trame-client==2.7.4
 trame-server==2.9.1
-trame-vtk==2.3.5
+trame-vtk==2.4.0
 trimesh==3.21.0
 typed-ast==1.5.4
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -28,5 +28,5 @@ tqdm<4.66.0
 trame>=2.2.6,<2.4
 trame-client>=2.5.1,<2.8
 trame-server>=2.8.0,<2.10
-trame-vtk>=2.0.17,<2.4
+trame-vtk>=2.4.0,<2.5
 trimesh<3.22.0