From 3dcf347d7bd5b7d2a5df9bbef71fa5b406341b84 Mon Sep 17 00:00:00 2001 From: Prabhu Ramachandran Date: Wed, 1 Jan 2025 16:44:22 +0530 Subject: [PATCH 1/2] Update references to master branch. --- DEVELOPING.rst | 4 ++-- docs/source/mayavi/data.rst | 2 +- docs/source/mayavi/misc.rst | 6 +++--- docs/source/mayavi/tips.rst | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DEVELOPING.rst b/DEVELOPING.rst index 19d9482b7..51c54ffb0 100644 --- a/DEVELOPING.rst +++ b/DEVELOPING.rst @@ -24,7 +24,7 @@ from the root of the project here is what you do:: # Commit and push new docs git commit -a -m "Updated docs" git push - # Return to master branch - git checkout master + # Return to main branch + git checkout main diff --git a/docs/source/mayavi/data.rst b/docs/source/mayavi/data.rst index c5ea3867e..8d09e7988 100644 --- a/docs/source/mayavi/data.rst +++ b/docs/source/mayavi/data.rst @@ -515,7 +515,7 @@ objects or data files for Mayavi and TVTK. * Presentation on TVTK and Mayavi2 for course at IIT Bombay - https://github.com/enthought/mayavi/raw/master/docs/pdf/tvtk_mayavi2.pdf + https://github.com/enthought/mayavi/raw/main/docs/pdf/tvtk_mayavi2.pdf This presentation provides information on graphics in general, 3D data representation, creating VTK data files, creating datasets diff --git a/docs/source/mayavi/misc.rst b/docs/source/mayavi/misc.rst index d325f6a85..1733988ab 100644 --- a/docs/source/mayavi/misc.rst +++ b/docs/source/mayavi/misc.rst @@ -111,9 +111,9 @@ workflow: 1. Fork the Repo on github. 2. If you are adding functionality or fixing a bug, please add a test! -3. Push to your fork and submit a **pull request to the master branch**. +3. Push to your fork and submit a **pull request to the main branch**. -The **master** branch is a 100% stable (should be). The pull request is merged +The **main** branch is a 100% stable (should be). The pull request is merged only after it is certain that things are working out, which means that `Travis`_ and `Appveyor`_ tests pass. @@ -156,7 +156,7 @@ Translating the documentation The recommended way for new contributors to translate mayavi reference is to join the translation team on Transifex. -There is a `mayavi translation page`_ for mayavi (master) documentation. +There is a `mayavi translation page`_ for mayavi (main) documentation. 1. Login to transifex_ service. 2. Go to `mayavi translation page`_. diff --git a/docs/source/mayavi/tips.rst b/docs/source/mayavi/tips.rst index 837dc2d0f..8c963b0d1 100644 --- a/docs/source/mayavi/tips.rst +++ b/docs/source/mayavi/tips.rst @@ -33,7 +33,7 @@ This feature was first introduced in Mayavi-4.8.0. .. _itkwidgets: https://github.com/InsightSoftwareConsortium/itkwidgets A simple example notebook demonstrating the notebook interface is -available here: https://github.com/enthought/mayavi/blob/master/examples/mayavi/mayavi_jupyter.ipynb +available here: https://github.com/enthought/mayavi/blob/main/examples/mayavi/mayavi_jupyter.ipynb There are two other backends, the simplest one is the ``'png'`` backend which produces images that can be embedded in the notebook. From e2f97b8b274820d6cc9320fb224109d13873d74e Mon Sep 17 00:00:00 2001 From: Prabhu Ramachandran Date: Wed, 1 Jan 2025 17:18:20 +0530 Subject: [PATCH 2/2] Fix issues with VTK-9.4.1. --- tvtk/tests/test_tvtk.py | 2 +- tvtk/vtk_module.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tvtk/tests/test_tvtk.py b/tvtk/tests/test_tvtk.py index 8fe7f5b60..e2a320139 100644 --- a/tvtk/tests/test_tvtk.py +++ b/tvtk/tests/test_tvtk.py @@ -870,7 +870,7 @@ def get_min_max_value(vtk_klass, vtk_attr_name): for name in self.names: vtk_klass = getattr(vtk, name) tvtk_klass_name = get_tvtk_name(name) - if vtk.vtk_version == '9.4.0': + if vtk.vtk_version in ['9.4.0', '9.4.1']: if tvtk_klass_name.endswith('View'): continue if tvtk_klass_name in ['ImageViewer', 'ImageViewer2', diff --git a/tvtk/vtk_module.py b/tvtk/vtk_module.py index 36aaa5249..a9b13194c 100644 --- a/tvtk/vtk_module.py +++ b/tvtk/vtk_module.py @@ -54,8 +54,8 @@ except NameError: pass -if vtk_version == '9.4.0': - # Instantiating these using TVTK causes a crash on VTK 9.4.0 so skipping. +if vtk_version in ['9.4.0', '9.4.1']: + # Instantiating these using TVTK causes a crash on VTK 9.4.x so skipping. SKIP = ['vtkIOSSReader', 'vtkIOSSCellGridReader'] try: del vtkIOSSReader, vtkIOSSCellGridReader