This is an automated email from the git hooks/post-receive script. yoh pushed a commit to branch master in repository python-mne.
commit 4ee6de74517ac4afd9434fda66a5eaaa7cbff684 Author: Yaroslav Halchenko <[email protected]> Date: Wed Sep 28 20:38:49 2016 -0400 changelog and patches update --- debian/changelog | 8 +++ ...t_154d7e5da710f08341eba50867da90525f52059c.diff | 25 --------- ...t_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff | 59 ---------------------- debian/patches/deb_paths | 2 +- debian/patches/series | 2 - 5 files changed, 9 insertions(+), 87 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3f96c49..24936c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-mne (0.13+dfsg-1) unstable; urgency=medium + + * Fresh upstream release + * debian/patches + - dropped changeset_* + + -- Yaroslav Halchenko <[email protected]> Wed, 28 Sep 2016 20:38:09 -0400 + python-mne (0.12+dfsg-2) unstable; urgency=medium * debian/control diff --git a/debian/patches/changeset_154d7e5da710f08341eba50867da90525f52059c.diff b/debian/patches/changeset_154d7e5da710f08341eba50867da90525f52059c.diff deleted file mode 100644 index 3eeb636..0000000 --- a/debian/patches/changeset_154d7e5da710f08341eba50867da90525f52059c.diff +++ /dev/null @@ -1,25 +0,0 @@ -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/changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff b/debian/patches/changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff deleted file mode 100644 index fb14c71..0000000 --- a/debian/patches/changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff +++ /dev/null @@ -1,59 +0,0 @@ -From: Yaroslav Halchenko <[email protected]> -Subject: BF: do not force "str" if already unicode - then, if actually was needed, it would need to be encoded, not just str"ed - -Lead in 0.8.3 debian package to the failure while running unittests: - -====================================================================== ERROR: -Test rendering -*.fif files for mne report. ----------------------------------------------------------------------- Traceback -(most recent call last): - File "/usr/lib/python2.7/dist-packages/nose/case.py", line 197, in runTest - self.test(*self.arg) - File "/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/tests/test_report.py", line -88, in test_render_report - report.save(fname=op.join(tempdir, 'report.html'), open_browser=False) - File "/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/report.py", line 825, in -save - self._render_toc(verbose=self.verbose) - File "<string>", line 2, in _render_toc - File "/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/utils.py", line 551, in -verbose - ret = function(*args, **kwargs) - File "/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/report.py", line 932, in -_render_toc - sectionvars=self._sectionvars) - File -"/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/externals/tempita/__init__.py", -line 178, in substitute - result, defs, inherit = self._interpret(ns) - File -"/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/externals/tempita/__init__.py", -line 189, in _interpret - self._interpret_codes(self._parsed, ns, out=parts, defs=defs) - File -"/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/externals/tempita/__init__.py", -line 217, in _interpret_codes - self._interpret_code(item, ns, out, defs) - File -"/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/externals/tempita/__init__.py", -line 241, in _interpret_code - out.append(self._repr(base, pos)) - File -"/home/yoh/deb/gits/pkg-exppsy/mne-python/mne/externals/tempita/__init__.py", -line 349, in _repr - raise(e) UnicodeEncodeError: 'ascii' codec can't encode character u'\xa0' in -position 14245: ordinal not in range(128) - ---- a/mne/externals/tempita/__init__.py -+++ b/mne/externals/tempita/__init__.py -@@ -331,8 +331,8 @@ class Template(object): - return '' - if self._unicode: - try: -- value = str(value) - if not is_unicode(value): -+ value = str(value) - value = value.decode('utf-8') - except UnicodeDecodeError: - value = bytes(value) diff --git a/debian/patches/deb_paths b/debian/patches/deb_paths index c8eae34..fa36ab0 100644 --- a/debian/patches/deb_paths +++ b/debian/patches/deb_paths @@ -15,7 +15,7 @@ Reviewed-By: Yaroslav O. Halchenko <[email protected]> VALID_EXTENSIONS = ['raw.fif', 'raw.fif.gz', 'sss.fif', 'sss.fif.gz', '-eve.fif', '-eve.fif.gz', '-cov.fif', '-cov.fif.gz', -@@ -1159,21 +1159,27 @@ class Report(object): +@@ -1187,21 +1187,27 @@ class Report(object): """Initialize the renderer. """ diff --git a/debian/patches/series b/debian/patches/series index 3c988ee..de08e3d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -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
