This is an automated email from the git hooks/post-receive script. yoh pushed a commit to branch master in repository python-mne.
commit 1a32c0ca1d96af7f223430d7fa7029c2aeeb82f4 Author: Yaroslav Halchenko <[email protected]> Date: Tue Oct 11 08:17:46 2016 -0400 added patch changeset_b9958973c5e331aa488df1c514c8476d7f4c2830.diff to "cherry-pick" b9958973c5e331aa488df1c514c8476d7f4c2830 (ENH+BF+RF: skip two tests requiring mayavi, and include into SkipTest msg caught exception) --- ...t_b9958973c5e331aa488df1c514c8476d7f4c2830.diff | 61 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 62 insertions(+) diff --git a/debian/patches/changeset_b9958973c5e331aa488df1c514c8476d7f4c2830.diff b/debian/patches/changeset_b9958973c5e331aa488df1c514c8476d7f4c2830.diff new file mode 100644 index 0000000..0f2f911 --- /dev/null +++ b/debian/patches/changeset_b9958973c5e331aa488df1c514c8476d7f4c2830.diff @@ -0,0 +1,61 @@ +From: Yaroslav Halchenko <[email protected]> +Subject: ENH+BF+RF: skip two tests requiring mayavi, and include into SkipTest msg caught exception + RF: no need for helper bool variable -- all handling could be done in +try/except + +--- a/mne/gui/tests/test_kit2fiff_gui.py ++++ b/mne/gui/tests/test_kit2fiff_gui.py +@@ -13,6 +13,7 @@ import mne + from mne.io.kit.tests import data_dir as kit_data_dir + from mne.io import read_raw_fif + from mne.utils import _TempDir, requires_traits, run_tests_if_main ++from mne.utils import requires_mayavi + + mrk_pre_path = os.path.join(kit_data_dir, 'test_mrk_pre.sqd') + mrk_post_path = os.path.join(kit_data_dir, 'test_mrk_post.sqd') +@@ -25,6 +26,7 @@ warnings.simplefilter('always') + + + @requires_traits ++@requires_mayavi + def test_kit2fiff_model(): + """Test CombineMarkersModel Traits Model.""" + from mne.gui._kit2fiff_gui import Kit2FiffModel, Kit2FiffPanel +--- a/mne/gui/tests/test_marker_gui.py ++++ b/mne/gui/tests/test_marker_gui.py +@@ -12,6 +12,7 @@ from nose.tools import assert_true, asse + from mne.io.kit.tests import data_dir as kit_data_dir + from mne.io.kit import read_mrk + from mne.utils import _TempDir, requires_traits, run_tests_if_main ++from mne.utils import requires_mayavi + + mrk_pre_path = os.path.join(kit_data_dir, 'test_mrk_pre.sqd') + mrk_post_path = os.path.join(kit_data_dir, 'test_mrk_post.sqd') +@@ -21,6 +22,7 @@ warnings.simplefilter('always') + + + @requires_traits ++@requires_mayavi + def test_combine_markers_model(): + """Test CombineMarkersModel Traits Model""" + from mne.gui._marker_gui import CombineMarkersModel, CombineMarkersPanel +--- a/mne/utils.py ++++ b/mne/utils.py +@@ -816,14 +816,11 @@ def requires_module(function, name, call + + @wraps(function) + def dec(*args, **kwargs): +- skip = False + try: + exec(call) in globals(), locals() +- except Exception: +- skip = True +- if skip is True: +- raise SkipTest('Test %s skipped, requires %s' +- % (function.__name__, name)) ++ except Exception as exc: ++ raise SkipTest('Test %s skipped, requires %s. Got exception (%s)' ++ % (function.__name__, name, exc)) + return function(*args, **kwargs) + return dec + diff --git a/debian/patches/series b/debian/patches/series index de08e3d..955c7ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +changeset_b9958973c5e331aa488df1c514c8476d7f4c2830.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
