[med-svn] [python-mne] 07/08: python-nibabel to B-Depends, and Recommends, patches to mitigate failing and segfaulting tests

[Yaroslav Halchenko]

This is an automated email from the git hooks/post-receive script.

yoh pushed a commit to branch master
in repository python-mne.

commit 4f3f0d3f46104ac71bb66e5af86e6c54035f328f
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Mon Dec 4 18:32:49 2017 -0500

    python-nibabel to B-Depends, and Recommends, patches to mitigate failing and segfaulting tests
---
 debian/changelog                          |  6 ++++++
 debian/control                            |  2 ++
 debian/patches/deb_skip_segfaultingtests  | 10 ++++++++++
 debian/patches/series                     |  3 +++
 debian/patches/up_skip_test_requires_data | 10 ++++++++++
 debian/patches/up_tempita_unicode         | 15 +++++++++++++++
 6 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 57b584e..ddd4f6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ python-mne (0.15.2+dfsg-1) unstable; urgency=medium
   * debian/control
     - Added python-pytest{,-cov} to build-depends and switch to use
       py.test in debian/rules
+    - Added python-nibabel to B-Depends, and Recommends
+  * A number of patches added to mitigate failing and segfaulting
+    tests:
+    - deb_skip_segfaultingtests
+    - up_skip_test_requires_data
+    - up_tempita_unicode
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Mon, 04 Dec 2017 13:07:52 -0500
 
diff --git a/debian/control b/debian/control
index fc63e85..dbea84b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Section: python
 Priority: optional
 Build-Depends: debhelper (>= 10),
                python-all,
+               python-nibabel,
                python-numpy,
                python-scipy,
                python-sphinx,
@@ -50,6 +51,7 @@ Depends: ${misc:Depends},
          libjs-d3
 Recommends: python-nose,
             python-pytest,
+            python-nibabel,
             mayavi2
 Suggests: python-dap,
           python-pycuda,
diff --git a/debian/patches/deb_skip_segfaultingtests b/debian/patches/deb_skip_segfaultingtests
new file mode 100644
index 0000000..7af51e0
--- /dev/null
+++ b/debian/patches/deb_skip_segfaultingtests
@@ -0,0 +1,10 @@
+--- a/mne/gui/tests/test_kit2fiff_gui.py
++++ b/mne/gui/tests/test_kit2fiff_gui.py
+@@ -129,6 +129,7 @@ def test_kit2fiff_model():
+ @requires_mayavi
+ def test_kit2fiff_gui():
+     """Test Kit2Fiff GUI."""
++    raise SkipTest("known to segfault")
+     _check_ci()
+     home_dir = _TempDir()
+     os.environ['_MNE_GUI_TESTING_MODE'] = 'true'
diff --git a/debian/patches/series b/debian/patches/series
index de08e3d..8eefc1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
+up_tempita_unicode
+up_skip_test_requires_data
+deb_skip_segfaultingtests
 deb_paths
diff --git a/debian/patches/up_skip_test_requires_data b/debian/patches/up_skip_test_requires_data
new file mode 100644
index 0000000..76fe085
--- /dev/null
+++ b/debian/patches/up_skip_test_requires_data
@@ -0,0 +1,10 @@
+--- a/mne/viz/tests/test_3d.py
++++ b/mne/viz/tests/test_3d.py
+@@ -343,6 +343,7 @@ def test_plot_dipole_mri_orthoview():
+     plt.close('all')
+ 
+ 
++ at testing.requires_testing_data
+ @requires_mayavi
+ def test_snapshot_brain_montage():
+     """Test snapshot brain montage."""
diff --git a/debian/patches/up_tempita_unicode b/debian/patches/up_tempita_unicode
new file mode 100644
index 0000000..f7877ac
--- /dev/null
+++ b/debian/patches/up_tempita_unicode
@@ -0,0 +1,15 @@
+--- a/mne/externals/tempita/__init__.py
++++ b/mne/externals/tempita/__init__.py
+@@ -331,9 +331,10 @@ class Template(object):
+                 return ''
+             if self._unicode:
+                 try:
+-                    value = str(value)
+                     if not is_unicode(value):
+-                        value = value.decode('utf-8')
++                        value = str(value)
++                        if not is_unicode(value):
++                            value = value.decode('utf-8')
+                 except UnicodeDecodeError:
+                     value = bytes(value)
+             else:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git