Merge pull request #3 from enthought/master

Update
enthought · Jul 3, 2019 · 2870a45 · 2870a45
2 parents 43aef58 + e4a7529
commit 2870a45
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,13 @@
 language: generic
-sudo: false
+
+dist: xenial
+services:
+  - xvfb
+
+addons:
+  apt:
+    packages:
+      - libglu1-mesa
 
 env:
   global:
@@ -25,8 +33,6 @@ cache:
 
 before_install:
   - mkdir -p "${HOME}/.cache/download"
-  - export DISPLAY=:99.0
-  - if [[ ${TRAVIS_OS_NAME} == "linux" ]] ; then sh -e /etc/init.d/xvfb start; fi
   - if [[ ${TRAVIS_OS_NAME} == 'linux' ]]; then ./ci/install-edm-linux.sh; export PATH="${HOME}/edm/bin:${PATH}"; fi
   - if [[ ${TRAVIS_OS_NAME} == 'osx' ]]; then ./ci/install-edm-osx.sh; export PATH="${PATH}:/usr/local/bin"; fi
   - edm install --version ${RUNTIME} -y wheel numpy nose mock Sphinx coverage psutil
@@ -35,7 +41,11 @@ install:
   - if [[ ${ETS_TOOLKIT} == 'wx' ]]; then edm install -y wxpython; fi
   - if [[ ${ETS_TOOLKIT} == 'qt4' && ${RUNTIME} == '2.7' ]]; then edm install -y pyside; fi
   - if [[ ${ETS_TOOLKIT} == 'qt4' && ${RUNTIME} == '3.6' ]]; then edm run -- pip install "pyqt5==5.10.1"; fi
-  - edm run -- pip install -r ci/ci-requirements.txt
+  - if [[ ${TRAVIS_EVENT_TYPE} == "cron" ]] ; then
+        edm run -- pip install -r ci/ci-src-requirements.txt ;
+    else
+        edm run -- pip install -r ci/ci-requirements.txt ;
+    fi;
   - if [[ ${VTK} == '8' ]]; then edm run -- pip install vtk; fi
   - if [[ ${VTK} != '8' ]]; then edm install -y vtk==7.0.0-3; fi
   - edm run -- python -c "import vtk; print(vtk.vtkVersion.GetVTKSourceVersion())"

diff --git a/.travis_before_install b/.travis_before_install
diff --git a/ci/ci-src-requirements.txt b/ci/ci-src-requirements.txt
@@ -0,0 +1,10 @@
+pillow
+mock
+Sphinx
+coverage
+psutil
+git+http://github.com/enthought/traits.git#egg=traits
+git+http://github.com/enthought/traitsui.git#egg=traitsui
+git+http://github.com/enthought/apptools.git#egg=apptools
+git+http://github.com/enthought/pyface.git#egg=pyface
+git+http://github.com/enthought/envisage.git#egg=envisage
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
@@ -1,3 +1,111 @@
+Mayavi 4.7.0
+============
+
+Thanks to the following who contributed to this release (in alphabetical
+order): Eric Larson, Poruri Sai Rahul, Prabhu Ramachandran, Stefan Sandfeld,
+and Todd.
+
+Thanks to Enthought for funding the work that led to the significantly
+improved Jupyter notebook support.
+
+19 pull requests were merged.
+
+This release has one very powerful new feature -- jupyter notebook support
+with complete interactivity.
+
+Enhancements
+------------
+
+26 Nov 2018 `#739 <https://github.com/enthought/mayavi/pull/739>`_ (PR)
+
+   - New Jupyter notebook 'ipy' backend which is now the default and
+     requires that VTK's offscreen support work correctly. This backend
+     requires ipywidgets and ipyevents. It allows complete interactivity and
+     behaves almost exactly like a normal UI backend but inside a notebook.
+     Note that this will still require an xserver or windowing toolkit unless
+     VTK is compiled to be able to work without those.
+
+     Many thanks to Enthought for supporting this.
+
+09 Oct 2018 `#723 <https://github.com/enthought/mayavi/pull/723>`_ (PR)
+   - Improve offscreen window creation.
+     Creating a renderwindow in some configurations can actually make UI
+     calls.  So if EGL is available we try that.  Also, when we are using
+     offscreen rendering we only need a GenericRenderWindowInteractor.
+     Also add a convenient set method so one can set a different interactor if needed.
+
+08 Sep 2018 `#712 <https://github.com/enthought/mayavi/pull/712>`_ (prabhuramachandran)
+   - ENH: Feature to disable automatic updates.
+     This can be very handy at times when the automatic updates can trigger
+     several changes that are not desirable.  For example on certain VTK
+     calls, internal ModifiedEvents may be fired which will automatically
+     call the update_traits method which can be wired to other events
+     triggering problems.  In these cases one can use the
+     `global_disable_update` function to temporarily disable updates.
+
+
+Fixes
+-----
+
+30 Jun 2019 `#795 <https://github.com/enthought/mayavi/pull/795>`_ (rahulporuri)
+   - Test against ETS packages from source using travis cron jobs.
+
+23 Jun 2019 `#793 <https://github.com/enthought/mayavi/pull/793>`_ (rahulporuri)
+   - Use xenial linux instead of trusty
+
+19 Jun 2019 `#792 <https://github.com/enthought/mayavi/pull/792>`_ (ssandfeld)
+   - add fix for str conversion from bad bytes array
+     This fixes issue `#791 <https://github.com/enthought/mayavi/issues/791>`_.
+
+26 Apr 2019 `#771 <https://github.com/enthought/mayavi/pull/771>`_ (prabhuramachandran)
+   - Fix issue `#770 <https://github.com/enthought/mayavi/issues/770>`_
+     The issue arises in a few of the mlab sources where when we reset to a
+     polydata with a smaller number of points.
+
+26 Apr 2019 `#754 <https://github.com/enthought/mayavi/pull/754>`_ (larsoner)
+   - FIX: Fix nose leftovers in tests.
+
+26 Apr 2019 `#747 <https://github.com/enthought/mayavi/pull/747>`_ (larsoner)
+   - FIX: Escape chars in code.
+
+27 Nov 2018 `#740 <https://github.com/enthought/mayavi/pull/740>`_ (toddrme2178)
+   - Also catch exceptions in generating documentation
+
+15 Nov 2018 `#736 <https://github.com/enthought/mayavi/pull/736>`_ (PR)
+   - Some UI fixes for ivtk.
+     This fixes `#734 <https://github.com/enthought/mayavi/issues/734>`_.
+
+16 Nov 2018 `#735 <https://github.com/enthought/mayavi/pull/735>`_ (larsoner)
+   - FIX: Fix set_range causing lookup table errors.
+
+26 Oct 2018 `#731 <https://github.com/enthought/mayavi/pull/731>`_ (larsoner)
+   - FIX: Fix type check
+
+15 Nov 2018 `#729 <https://github.com/enthought/mayavi/pull/729>`_ (larsoner)
+   - FIX: Fix for VTKNoneArray
+
+11 Oct 2018 `#724 <https://github.com/enthought/mayavi/pull/724>`_ (PR)
+   - Try and fix `#477 <https://github.com/enthought/mayavi/issues/477>`_.
+     If OSMesa is available and user requests an offscreen window, use an
+     OSOpenGLRenderWindow, this will not require X and can be safely used on
+     a remote server.
+
+16 Nov 2018 `#722 <https://github.com/enthought/mayavi/pull/722>`_ (rahulporuri)
+   - Fix bug related to SurfaceSource.scalars This bug manifests when the
+     SurfaceSource object in question does not have a scalars attribute and
+     many of them do not have this.
+
+23 Sep 2018 `#716 <https://github.com/enthought/mayavi/pull/716>`_ (PR)
+   - Fix `#713 <https://github.com/enthought/mayavi/issues/713>`_ with pip
+     installs failing.
+
+23 Sep 2018 `#715 <https://github.com/enthought/mayavi/pull/715>`_ (prabhuramachandran)
+   - Fix detection of color transfer function.
+     The original code was written for very old VTK versions but ever since
+     5.x we have a get_node_value method that actually provides the values of
+     the nodes given an index.  We now use this instead of the earlier hack.
+
+
 Mayavi 4.6.2
 ============
 

diff --git a/docs/source/mayavi/auto/changes.rst b/docs/source/mayavi/auto/changes.rst
@@ -1,3 +1,111 @@
+Mayavi 4.7.0
+============
+
+Thanks to the following who contributed to this release (in alphabetical
+order): Eric Larson, Poruri Sai Rahul, Prabhu Ramachandran, Stefan Sandfeld,
+and Todd.
+
+Thanks to Enthought for funding the work that led to the significantly
+improved Jupyter notebook support.
+
+19 pull requests were merged.
+
+This release has one very powerful new feature -- jupyter notebook support
+with complete interactivity.
+
+Enhancements
+------------
+
+26 Nov 2018 `#739 <https://github.com/enthought/mayavi/pull/739>`_ (PR)
+
+   - New Jupyter notebook 'ipy' backend which is now the default and
+     requires that VTK's offscreen support work correctly. This backend
+     requires ipywidgets and ipyevents. It allows complete interactivity and
+     behaves almost exactly like a normal UI backend but inside a notebook.
+     Note that this will still require an xserver or windowing toolkit unless
+     VTK is compiled to be able to work without those.
+
+     Many thanks to Enthought for supporting this.
+
+09 Oct 2018 `#723 <https://github.com/enthought/mayavi/pull/723>`_ (PR)
+   - Improve offscreen window creation.
+     Creating a renderwindow in some configurations can actually make UI
+     calls.  So if EGL is available we try that.  Also, when we are using
+     offscreen rendering we only need a GenericRenderWindowInteractor.
+     Also add a convenient set method so one can set a different interactor if needed.
+
+08 Sep 2018 `#712 <https://github.com/enthought/mayavi/pull/712>`_ (prabhuramachandran)
+   - ENH: Feature to disable automatic updates.
+     This can be very handy at times when the automatic updates can trigger
+     several changes that are not desirable.  For example on certain VTK
+     calls, internal ModifiedEvents may be fired which will automatically
+     call the update_traits method which can be wired to other events
+     triggering problems.  In these cases one can use the
+     `global_disable_update` function to temporarily disable updates.
+
+
+Fixes
+-----
+
+30 Jun 2019 `#795 <https://github.com/enthought/mayavi/pull/795>`_ (rahulporuri)
+   - Test against ETS packages from source using travis cron jobs.
+
+23 Jun 2019 `#793 <https://github.com/enthought/mayavi/pull/793>`_ (rahulporuri)
+   - Use xenial linux instead of trusty
+
+19 Jun 2019 `#792 <https://github.com/enthought/mayavi/pull/792>`_ (ssandfeld)
+   - add fix for str conversion from bad bytes array
+     This fixes issue `#791 <https://github.com/enthought/mayavi/issues/791>`_.
+
+26 Apr 2019 `#771 <https://github.com/enthought/mayavi/pull/771>`_ (prabhuramachandran)
+   - Fix issue `#770 <https://github.com/enthought/mayavi/issues/770>`_
+     The issue arises in a few of the mlab sources where when we reset to a
+     polydata with a smaller number of points.
+
+26 Apr 2019 `#754 <https://github.com/enthought/mayavi/pull/754>`_ (larsoner)
+   - FIX: Fix nose leftovers in tests.
+
+26 Apr 2019 `#747 <https://github.com/enthought/mayavi/pull/747>`_ (larsoner)
+   - FIX: Escape chars in code.
+
+27 Nov 2018 `#740 <https://github.com/enthought/mayavi/pull/740>`_ (toddrme2178)
+   - Also catch exceptions in generating documentation
+
+15 Nov 2018 `#736 <https://github.com/enthought/mayavi/pull/736>`_ (PR)
+   - Some UI fixes for ivtk.
+     This fixes `#734 <https://github.com/enthought/mayavi/issues/734>`_.
+
+16 Nov 2018 `#735 <https://github.com/enthought/mayavi/pull/735>`_ (larsoner)
+   - FIX: Fix set_range causing lookup table errors.
+
+26 Oct 2018 `#731 <https://github.com/enthought/mayavi/pull/731>`_ (larsoner)
+   - FIX: Fix type check
+
+15 Nov 2018 `#729 <https://github.com/enthought/mayavi/pull/729>`_ (larsoner)
+   - FIX: Fix for VTKNoneArray
+
+11 Oct 2018 `#724 <https://github.com/enthought/mayavi/pull/724>`_ (PR)
+   - Try and fix `#477 <https://github.com/enthought/mayavi/issues/477>`_.
+     If OSMesa is available and user requests an offscreen window, use an
+     OSOpenGLRenderWindow, this will not require X and can be safely used on
+     a remote server.
+
+16 Nov 2018 `#722 <https://github.com/enthought/mayavi/pull/722>`_ (rahulporuri)
+   - Fix bug related to SurfaceSource.scalars This bug manifests when the
+     SurfaceSource object in question does not have a scalars attribute and
+     many of them do not have this.
+
+23 Sep 2018 `#716 <https://github.com/enthought/mayavi/pull/716>`_ (PR)
+   - Fix `#713 <https://github.com/enthought/mayavi/issues/713>`_ with pip
+     installs failing.
+
+23 Sep 2018 `#715 <https://github.com/enthought/mayavi/pull/715>`_ (prabhuramachandran)
+   - Fix detection of color transfer function.
+     The original code was written for very old VTK versions but ever since
+     5.x we have a get_node_value method that actually provides the values of
+     the nodes given an index.  We now use this instead of the earlier hack.
+
+
 Mayavi 4.6.2
 ============
 

diff --git a/docs/source/mayavi/auto/mlab_other_functions.rst b/docs/source/mayavi/auto/mlab_other_functions.rst
@@ -21,8 +21,7 @@ animate
 
 
     ::
-    A convenient decorator to animate a generator that performs an
-        animation.
+    A convenient decorator to animate a generator performing an animation.
 
         The `delay` parameter specifies the delay (in milliseconds) between calls
         to the decorated function. If `ui` is True, then a simple UI for the
@@ -151,13 +150,13 @@ get_engine
 init_notebook
 ~~~~~~~~~~~~~
 
-.. function:: init_notebook(backend='x3d', width=None, height=None, local=True)
+.. function:: init_notebook(backend='ipy', width=None, height=None, local=True)
 
     Initialize a suitable backend for Jupyter notebooks.
 
     **Parameters**
 
-    backend :str: one of ('png', 'x3d')
+    backend :str: one of ('png', 'x3d', 'ipy')
     width :int: suggested default width of the element
     height :int: suggested default height of the element
     local :bool: Use local copy of x3dom.js instead of online version.

diff --git a/docs/source/mayavi/auto/mlab_pipeline_sources.rst b/docs/source/mayavi/auto/mlab_pipeline_sources.rst
@@ -62,7 +62,7 @@ array2d_source
 builtin_image
 ~~~~~~~~~~~~~
 
-.. function:: builtin_image(metadata=<mayavi.core.metadata.SourceMetadata object at 0x12b7793b8>)
+.. function:: builtin_image(metadata=<mayavi.core.metadata.SourceMetadata object at 0x142387d00>)
 
     Create a vtk image data source
 
@@ -73,7 +73,7 @@ builtin_image
 builtin_surface
 ~~~~~~~~~~~~~~~
 
-.. function:: builtin_surface(metadata=<mayavi.core.metadata.SourceMetadata object at 0x12bb9b200>)
+.. function:: builtin_surface(metadata=<mayavi.core.metadata.SourceMetadata object at 0x142387c50>)
 
     Create a vtk poly data source
 
@@ -84,7 +84,7 @@ builtin_surface
 chaco_file
 ~~~~~~~~~~
 
-.. function:: chaco_file(metadata=<mayavi.core.metadata.SourceMetadata object at 0x12b6e1938>)
+.. function:: chaco_file(metadata=<mayavi.core.metadata.SourceMetadata object at 0x142387eb8>)
 
     Open a Chaco file
 
@@ -178,7 +178,7 @@ open
 parametric_surface
 ~~~~~~~~~~~~~~~~~~
 
-.. function:: parametric_surface(metadata=<mayavi.core.metadata.SourceMetadata object at 0x12bb9b048>)
+.. function:: parametric_surface(metadata=<mayavi.core.metadata.SourceMetadata object at 0x142387a98>)
 
     Create a parametric surface source
 
@@ -189,7 +189,7 @@ parametric_surface
 point_load
 ~~~~~~~~~~
 
-.. function:: point_load(metadata=<mayavi.core.metadata.SourceMetadata object at 0x12bb9b150>)
+.. function:: point_load(metadata=<mayavi.core.metadata.SourceMetadata object at 0x142387ba0>)
 
     Simulates a point load on a cube of data (for tensors)
 
@@ -429,7 +429,7 @@ vertical_vectors_source
 volume_file
 ~~~~~~~~~~~
 
-.. function:: volume_file(metadata=<mayavi.core.metadata.SourceMetadata object at 0x12b779048>)
+.. function:: volume_file(metadata=<mayavi.core.metadata.SourceMetadata object at 0x142387db0>)
 
     Open a Volume file
 

diff --git a/mayavi/__init__.py b/mayavi/__init__.py
@@ -1,17 +1,17 @@
 # Author: Prabhu Ramachandran, Gael Varoquaux
-# Copyright (c) 2004-2018, Enthought, Inc.
+# Copyright (c) 2004-2019, Enthought, Inc.
 # License: BSD Style.
 """ A tool for easy and interactive visualization of data.
     Part of the Mayavi project of the Enthought Tool Suite.
 """
 
-__version__ = '4.7.0.dev0'
+__version__ = '4.7.1.dev0'
 
 __requires__ = [
     'apptools',
     'envisage',
     'numpy',
-    'pyface>=6.0.0',
+    'pyface>=6.1.1',
     'pygments',  # This is only needed for the Qt backend but we add it anyway.
     'traits>=4.6.0',
     'traitsui>=6.0.0',

diff --git a/mayavi/tools/notebook.py b/mayavi/tools/notebook.py
@@ -82,7 +82,8 @@ def _fix_x3d_header(x3d):
     if _height is not None:
         rep += 'height="%dpx" ' % _height
     rep += '>'
-
+    if isinstance(x3d, bytes):
+        x3d = x3d.decode("utf-8", "ignore") 
     x3d = x3d.replace(
         '<X3D profile="Immersive" version="3.0">',
         rep