This is an automated email from the git hooks/post-receive script. yoh pushed a commit to branch master in repository python-mne.
commit f6b77c06be1d5b7ee93e9db24673b187636b388a Author: Yaroslav Halchenko <[email protected]> Date: Sun May 15 17:09:53 2016 -0400 added patch changeset_154d7e5da710f08341eba50867da90525f52059c.diff to "cherry-pick" 154d7e5da710f08341eba50867da90525f52059c (BF: use tvtk.configure_input instead of direct input=src) --- ...t_154d7e5da710f08341eba50867da90525f52059c.diff | 25 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 26 insertions(+) diff --git a/debian/patches/changeset_154d7e5da710f08341eba50867da90525f52059c.diff b/debian/patches/changeset_154d7e5da710f08341eba50867da90525f52059c.diff new file mode 100644 index 0000000..3eeb636 --- /dev/null +++ b/debian/patches/changeset_154d7e5da710f08341eba50867da90525f52059c.diff @@ -0,0 +1,25 @@ +From: Yaroslav Halchenko <[email protected]> +Subject: BF: use tvtk.configure_input instead of direct input=src + Trying to resolve error during testing on Debian sid, see +http://stackoverflow.com/a/35131392 for origin for the "fix". Closes #2648 + +--- a/mne/surface.py ++++ b/mne/surface.py +@@ -717,6 +717,7 @@ def _decimate_surface(points, triangles, + os.environ['ETS_TOOLKIT'] = 'null' + try: + from tvtk.api import tvtk ++ from tvtk.common import configure_input + except ImportError: + raise ValueError('This function requires the TVTK package to be ' + 'installed') +@@ -724,7 +725,8 @@ def _decimate_surface(points, triangles, + raise ValueError('The triangles refer to undefined points. ' + 'Please check your mesh.') + src = tvtk.PolyData(points=points, polys=triangles) +- decimate = tvtk.QuadricDecimation(input=src, target_reduction=reduction) ++ decimate = tvtk.QuadricDecimation(target_reduction=reduction) ++ configure_input(decimate, src) + decimate.update() + out = decimate.output + tris = out.polys.to_array() diff --git a/debian/patches/series b/debian/patches/series index b4c3311..3c988ee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +changeset_154d7e5da710f08341eba50867da90525f52059c.diff changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff deb_paths -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
