[med-svn] [python-mne] 04/04: debian/patches/fix_test - dropped, upstreamed

[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 4abda55871e98525a1f6fa016be5c5360ab55206
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Mon Jan 4 21:00:56 2016 -0500

    debian/patches/fix_test - dropped, upstreamed
---
 debian/changelog        |  1 +
 debian/patches/fix_test | 22 ----------------------
 debian/patches/series   |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 781fe66..9918735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 python-mne (0.11+dfsg-1) unstable; urgency=medium
 
   * Fresh upstream release
+  * debian/patches/fix_test - dropped, upstreamed
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Mon, 04 Jan 2016 20:51:51 -0500
 
diff --git a/debian/patches/fix_test b/debian/patches/fix_test
deleted file mode 100644
index ceb0fea..0000000
--- a/debian/patches/fix_test
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Changed test decorator to skip if mayavi not installed.
-
---- python-mne-0.10.1+dfsg.orig/mne/tests/test_surface.py
-+++ python-mne-0.10.1+dfsg/mne/tests/test_surface.py
-@@ -13,7 +13,7 @@ from mne import read_surface, write_surf
- from mne.surface import (read_morph_map, _compute_nearest,
-                          fast_cross_3d, get_head_surf, read_curvature,
-                          get_meg_helmet_surf)
--from mne.utils import _TempDir, requires_tvtk, run_tests_if_main, slow_test
-+from mne.utils import _TempDir, requires_mayavi, run_tests_if_main, slow_test
- from mne.io import read_info
- from mne.transforms import _get_mri_head_t
- 
-@@ -145,7 +145,7 @@ def test_read_curv():
-     assert_true(np.logical_or(bin_curv == 0, bin_curv == 1).all())
- 
- 
-- at requires_tvtk
-+ at requires_mayavi
- def test_decimate_surface():
-     """Test triangular surface decimation
-     """
diff --git a/debian/patches/series b/debian/patches/series
index cb46848..b4c3311 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff
 deb_paths
-fix_test

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