Skip to content
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.

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

Update references to master branch. #1330

Merged
merged 2 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions DEVELOPING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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


2 changes: 1 addition & 1 deletion docs/source/mayavi/data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/source/mayavi/misc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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`_.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/mayavi/tips.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tvtk/tests/test_tvtk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions tvtk/vtk_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading