This is an automated email from the git hooks/post-receive script. yoh pushed a commit to tag 0.4 in repository python-mne.
commit 576f1acad466f29f6a14fca57914c8e5ad0e5294 Author: Alexandre Gramfort <[email protected]> Date: Fri Aug 3 22:09:43 2012 +0200 ENH : no relative imports in tests (check proper install) --- mne/artifacts/tests/test_ecg.py | 4 ++-- mne/artifacts/tests/test_eog.py | 4 ++-- mne/artifacts/tests/test_peak_finder.py | 3 ++- mne/artifacts/tests/test_stim.py | 10 +++++----- mne/fiff/tests/test_evoked.py | 2 +- mne/fiff/tests/test_pick.py | 2 +- mne/fiff/tests/test_raw.py | 4 ++-- mne/minimum_norm/tests/test_inverse.py | 14 +++++++------- mne/minimum_norm/tests/test_time_frequency.py | 12 ++++++------ mne/mixed_norm/tests/test_debiasing.py | 2 +- mne/mixed_norm/tests/test_inverse.py | 8 ++++---- mne/mixed_norm/tests/test_optim.py | 2 +- mne/simulation/tests/test_source.py | 8 +++----- mne/stats/tests/test_cluster_level.py | 2 +- mne/stats/tests/test_permutations.py | 2 +- mne/tests/test_cov.py | 6 +++--- mne/tests/test_epochs.py | 4 ++-- mne/tests/test_event.py | 3 +-- mne/tests/test_filter.py | 2 +- mne/tests/test_forward.py | 8 ++++---- mne/tests/test_label.py | 4 ++-- mne/tests/test_misc.py | 2 +- mne/tests/test_proj.py | 10 +++++----- mne/tests/test_selection.py | 2 +- mne/tests/test_source_estimate.py | 8 ++++---- mne/tests/test_source_space.py | 4 ++-- mne/tests/test_surface.py | 4 ++-- mne/tests/test_utils.py | 2 +- mne/tests/test_viz.py | 6 +++--- mne/time_frequency/tests/test_ar.py | 4 ++-- mne/time_frequency/tests/test_psd.py | 4 ++-- mne/time_frequency/tests/test_stft.py | 2 +- mne/time_frequency/tests/test_tfr.py | 18 +++++++++--------- 33 files changed, 85 insertions(+), 87 deletions(-) diff --git a/mne/artifacts/tests/test_ecg.py b/mne/artifacts/tests/test_ecg.py index 2eff274..5777136 100644 --- a/mne/artifacts/tests/test_ecg.py +++ b/mne/artifacts/tests/test_ecg.py @@ -3,8 +3,8 @@ import os.path as op from nose.tools import assert_true from numpy.testing import assert_array_almost_equal -from ...fiff import Raw -from ..ecg import find_ecg_events +from mne.fiff import Raw +from mne.artifacts.ecg import find_ecg_events data_path = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', 'data') raw_fname = op.join(data_path, 'test_raw.fif') diff --git a/mne/artifacts/tests/test_eog.py b/mne/artifacts/tests/test_eog.py index d93e541..087c692 100644 --- a/mne/artifacts/tests/test_eog.py +++ b/mne/artifacts/tests/test_eog.py @@ -1,8 +1,8 @@ import os.path as op from nose.tools import assert_true -from ...fiff import Raw -from ..eog import find_eog_events +from mne.fiff import Raw +from mne.artifacts.eog import find_eog_events data_path = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', 'data') raw_fname = op.join(data_path, 'test_raw.fif') diff --git a/mne/artifacts/tests/test_peak_finder.py b/mne/artifacts/tests/test_peak_finder.py index 5c9356d..276427a 100644 --- a/mne/artifacts/tests/test_peak_finder.py +++ b/mne/artifacts/tests/test_peak_finder.py @@ -1,7 +1,8 @@ import numpy as np -from ..peak_finder import peak_finder from numpy.testing import assert_array_equal +from mne.artifacts.peak_finder import peak_finder + def test_peak_finder(): """Test the peak detection method""" diff --git a/mne/artifacts/tests/test_stim.py b/mne/artifacts/tests/test_stim.py index 5831629..53bb1ea 100644 --- a/mne/artifacts/tests/test_stim.py +++ b/mne/artifacts/tests/test_stim.py @@ -3,14 +3,14 @@ # License: BSD (3-clause) import os.path as op -import numpy as np -from nose.tools import assert_true +import numpy as np from numpy.testing import assert_array_almost_equal +from nose.tools import assert_true -from ...fiff import Raw -from ...event import read_events -from ..stim import eliminate_stim_artifact +from mne.fiff import Raw +from mne.event import read_events +from mne.artifacts.stim import eliminate_stim_artifact data_path = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', 'data') raw_fname = op.join(data_path, 'test_raw.fif') diff --git a/mne/fiff/tests/test_evoked.py b/mne/fiff/tests/test_evoked.py index 386fe30..7feca2c 100644 --- a/mne/fiff/tests/test_evoked.py +++ b/mne/fiff/tests/test_evoked.py @@ -2,7 +2,7 @@ import os.path as op from numpy.testing import assert_array_almost_equal, assert_equal -from .. import read_evoked, write_evoked +from mne.fiff import read_evoked, write_evoked fname = op.join(op.dirname(__file__), 'data', 'test-ave.fif') diff --git a/mne/fiff/tests/test_pick.py b/mne/fiff/tests/test_pick.py index 6452941..ce4ef37 100644 --- a/mne/fiff/tests/test_pick.py +++ b/mne/fiff/tests/test_pick.py @@ -1,5 +1,5 @@ from numpy.testing import assert_array_equal -from ..pick import pick_channels_regexp +from mne.fiff.pick import pick_channels_regexp def test_pick_channels_regexp(): diff --git a/mne/fiff/tests/test_raw.py b/mne/fiff/tests/test_raw.py index 43e7908..73bcb06 100644 --- a/mne/fiff/tests/test_raw.py +++ b/mne/fiff/tests/test_raw.py @@ -1,11 +1,11 @@ import os.path as op from copy import deepcopy -import numpy as np from nose.tools import assert_true +import numpy as np from numpy.testing import assert_array_almost_equal, assert_array_equal -from .. import Raw, pick_types, pick_channels +from mne.fiff import Raw, pick_types, pick_channels fif_fname = op.join(op.dirname(__file__), 'data', 'test_raw.fif') ctf_fname = op.join(op.dirname(__file__), 'data', 'test_ctf_raw.fif') diff --git a/mne/minimum_norm/tests/test_inverse.py b/mne/minimum_norm/tests/test_inverse.py index b396ee0..b442159 100644 --- a/mne/minimum_norm/tests/test_inverse.py +++ b/mne/minimum_norm/tests/test_inverse.py @@ -6,13 +6,13 @@ from nose.tools import assert_true import nose import copy -from ...datasets import sample -from ...label import read_label, label_sign_flip -from ...event import read_events -from ...epochs import Epochs -from ...source_estimate import SourceEstimate -from ... import fiff, read_cov, read_forward_solution -from ..inverse import apply_inverse, read_inverse_operator, \ +from mne.datasets import sample +from mne.label import read_label, label_sign_flip +from mne.event import read_events +from mne.epochs import Epochs +from mne.source_estimate import SourceEstimate +from mne import fiff, read_cov, read_forward_solution +from mne.minimum_norm.inverse import apply_inverse, read_inverse_operator, \ apply_inverse_raw, apply_inverse_epochs, \ make_inverse_operator, write_inverse_operator diff --git a/mne/minimum_norm/tests/test_time_frequency.py b/mne/minimum_norm/tests/test_time_frequency.py index 8b5353b..d14554f 100644 --- a/mne/minimum_norm/tests/test_time_frequency.py +++ b/mne/minimum_norm/tests/test_time_frequency.py @@ -4,12 +4,12 @@ import numpy as np from numpy.testing import assert_array_almost_equal from nose.tools import assert_true -from ...datasets import sample -from ... import fiff, find_events, Epochs -from ...label import read_label -from ..inverse import read_inverse_operator -from ..time_frequency import source_band_induced_power, source_induced_power, \ - compute_source_psd +from mne.datasets import sample +from mne import fiff, find_events, Epochs +from mne.label import read_label +from mne.minimum_norm.inverse import read_inverse_operator +from mne.minimum_norm.time_frequency import source_band_induced_power, \ + source_induced_power, compute_source_psd examples_folder = op.join(op.dirname(__file__), '..', '..', '..', 'examples') diff --git a/mne/mixed_norm/tests/test_debiasing.py b/mne/mixed_norm/tests/test_debiasing.py index 6ecda6d..6948ee4 100755 --- a/mne/mixed_norm/tests/test_debiasing.py +++ b/mne/mixed_norm/tests/test_debiasing.py @@ -6,7 +6,7 @@ import numpy as np from numpy.testing import assert_almost_equal -from ..debiasing import compute_bias +from mne.mixed_norm.debiasing import compute_bias def test_compute_debiasing(): diff --git a/mne/mixed_norm/tests/test_inverse.py b/mne/mixed_norm/tests/test_inverse.py index d5d53e7..8fbc6e4 100644 --- a/mne/mixed_norm/tests/test_inverse.py +++ b/mne/mixed_norm/tests/test_inverse.py @@ -6,10 +6,10 @@ import os.path as op from numpy.testing import assert_array_almost_equal from nose.tools import assert_true -from ...datasets import sample -from ...label import read_label -from ... import fiff, read_cov, read_forward_solution -from ..inverse import mixed_norm +from mne.datasets import sample +from mne.label import read_label +from mne import fiff, read_cov, read_forward_solution +from mne.mixed_norm.inverse import mixed_norm examples_folder = op.join(op.dirname(__file__), '..', '..', '..', 'examples') diff --git a/mne/mixed_norm/tests/test_optim.py b/mne/mixed_norm/tests/test_optim.py index a07fabd..30160ca 100644 --- a/mne/mixed_norm/tests/test_optim.py +++ b/mne/mixed_norm/tests/test_optim.py @@ -5,7 +5,7 @@ import numpy as np from numpy.testing import assert_array_equal -from ..optim import mixed_norm_solver +from mne.mixed_norm.optim import mixed_norm_solver def test_l21_MxNE(): diff --git a/mne/simulation/tests/test_source.py b/mne/simulation/tests/test_source.py index f61dfa4..9a3439b 100644 --- a/mne/simulation/tests/test_source.py +++ b/mne/simulation/tests/test_source.py @@ -5,11 +5,10 @@ import numpy as np from numpy.testing import assert_array_almost_equal, assert_array_equal from nose.tools import assert_true -from ...datasets import sample -from ... import read_label -from ... import read_forward_solution +from mne.datasets import sample +from mne import read_label, read_forward_solution +from mne.simulation.source import generate_stc, generate_sparse_stc -from ..source import generate_stc, generate_sparse_stc examples_folder = op.join(op.dirname(__file__), '..', '..', '..' '/examples') data_path = sample.data_path(examples_folder) @@ -67,4 +66,3 @@ def test_generate_sparse_stc(): assert_array_equal(stc_1.lh_vertno, stc_2.lh_vertno) assert_array_equal(stc_1.rh_vertno, stc_2.rh_vertno) - diff --git a/mne/stats/tests/test_cluster_level.py b/mne/stats/tests/test_cluster_level.py index 8fb8693..08b77f7 100644 --- a/mne/stats/tests/test_cluster_level.py +++ b/mne/stats/tests/test_cluster_level.py @@ -2,7 +2,7 @@ import numpy as np from numpy.testing import assert_equal, assert_array_equal from nose.tools import assert_true -from ..cluster_level import permutation_cluster_test, \ +from mne.stats.cluster_level import permutation_cluster_test, \ permutation_cluster_1samp_test noiselevel = 20 diff --git a/mne/stats/tests/test_permutations.py b/mne/stats/tests/test_permutations.py index 805b9dd..1c40457 100644 --- a/mne/stats/tests/test_permutations.py +++ b/mne/stats/tests/test_permutations.py @@ -2,7 +2,7 @@ import numpy as np from numpy.testing import assert_array_equal, assert_almost_equal from scipy import stats -from ..permutations import permutation_t_test +from mne.stats.permutations import permutation_t_test def test_permutation_t_test(): diff --git a/mne/tests/test_cov.py b/mne/tests/test_cov.py index 353208b..7722f55 100644 --- a/mne/tests/test_cov.py +++ b/mne/tests/test_cov.py @@ -5,11 +5,11 @@ from numpy.testing import assert_array_almost_equal import numpy as np from scipy import linalg -from ..cov import regularize -from .. import read_cov, Epochs, merge_events, \ +from mne.cov import regularize +from mne import read_cov, Epochs, merge_events, \ find_events, compute_raw_data_covariance, \ compute_covariance -from ..fiff import Raw, pick_channels_cov, pick_channels +from mne.fiff import Raw, pick_channels_cov, pick_channels cov_fname = op.join(op.dirname(__file__), '..', 'fiff', 'tests', 'data', 'test-cov.fif') diff --git a/mne/tests/test_epochs.py b/mne/tests/test_epochs.py index 9bc4eaa..584b8ac 100644 --- a/mne/tests/test_epochs.py +++ b/mne/tests/test_epochs.py @@ -7,8 +7,8 @@ from nose.tools import assert_true from numpy.testing import assert_array_equal, assert_array_almost_equal import numpy as np -from .. import fiff, Epochs, read_events, pick_events -from ..epochs import bootstrap +from mne import fiff, Epochs, read_events, pick_events +from mne.epochs import bootstrap raw_fname = op.join(op.dirname(__file__), '..', 'fiff', 'tests', 'data', 'test_raw.fif') diff --git a/mne/tests/test_event.py b/mne/tests/test_event.py index ccb21bc..9fdf7b2 100644 --- a/mne/tests/test_event.py +++ b/mne/tests/test_event.py @@ -2,8 +2,7 @@ import os.path as op from numpy.testing import assert_array_almost_equal, assert_array_equal -from .. import read_events, write_events, find_events -from .. import fiff +from mne import read_events, write_events, find_events, fiff fname = op.join(op.dirname(__file__), '..', 'fiff', 'tests', 'data', diff --git a/mne/tests/test_filter.py b/mne/tests/test_filter.py index db278f3..c8cc62e 100644 --- a/mne/tests/test_filter.py +++ b/mne/tests/test_filter.py @@ -1,7 +1,7 @@ import numpy as np from numpy.testing import assert_array_almost_equal -from ..filter import band_pass_filter, high_pass_filter, low_pass_filter +from mne.filter import band_pass_filter, high_pass_filter, low_pass_filter def test_filters(): diff --git a/mne/tests/test_forward.py b/mne/tests/test_forward.py index 319e300..5270eed 100644 --- a/mne/tests/test_forward.py +++ b/mne/tests/test_forward.py @@ -4,10 +4,10 @@ from nose.tools import assert_true import numpy as np from numpy.testing import assert_array_almost_equal, assert_equal -from ..datasets import sample -from ..fiff import Raw, Evoked, pick_types_forward -from ..minimum_norm.inverse import _make_stc -from .. import read_forward_solution, apply_forward, apply_forward_raw +from mne.datasets import sample +from mne.fiff import Raw, Evoked, pick_types_forward +from mne.minimum_norm.inverse import _make_stc +from mne import read_forward_solution, apply_forward, apply_forward_raw examples_folder = op.join(op.dirname(__file__), '..', '..', 'examples') diff --git a/mne/tests/test_label.py b/mne/tests/test_label.py index 51df0fc..8f9715a 100644 --- a/mne/tests/test_label.py +++ b/mne/tests/test_label.py @@ -4,8 +4,8 @@ import numpy as np from numpy.testing import assert_array_almost_equal from nose.tools import assert_true -from ..datasets import sample -from .. import label_time_courses, read_label, write_label, stc_to_label, \ +from mne.datasets import sample +from mne import label_time_courses, read_label, write_label, stc_to_label, \ SourceEstimate, read_source_spaces, grow_labels diff --git a/mne/tests/test_misc.py b/mne/tests/test_misc.py index 1b94394..d639026 100644 --- a/mne/tests/test_misc.py +++ b/mne/tests/test_misc.py @@ -1,7 +1,7 @@ import os.path as op from nose.tools import assert_true -from ..misc import parse_config +from mne.misc import parse_config ave_fname = op.join(op.dirname(__file__), '..', 'fiff', 'tests', 'data', 'test.ave') diff --git a/mne/tests/test_proj.py b/mne/tests/test_proj.py index 6e89c71..e19b8fe 100644 --- a/mne/tests/test_proj.py +++ b/mne/tests/test_proj.py @@ -4,11 +4,11 @@ from nose.tools import assert_true import numpy as np from numpy.testing import assert_array_almost_equal -from ..fiff import Raw, pick_types -from .. import compute_proj_epochs, compute_proj_evoked -from ..fiff.proj import make_projector, activate_proj -from ..proj import read_proj -from .. import read_events, Epochs +from mne.fiff import Raw, pick_types +from mne import compute_proj_epochs, compute_proj_evoked +from mne.fiff.proj import make_projector, activate_proj +from mne.proj import read_proj +from mne import read_events, Epochs base_dir = op.join(op.dirname(__file__), '..', 'fiff', 'tests', 'data') raw_fname = op.join(base_dir, 'test_raw.fif') diff --git a/mne/tests/test_selection.py b/mne/tests/test_selection.py index 7b5c465..725f2a3 100644 --- a/mne/tests/test_selection.py +++ b/mne/tests/test_selection.py @@ -1,4 +1,4 @@ -from .. import read_selection +from mne import read_selection def test_read_selection(): diff --git a/mne/tests/test_source_estimate.py b/mne/tests/test_source_estimate.py index 5fbaf12..41572a4 100644 --- a/mne/tests/test_source_estimate.py +++ b/mne/tests/test_source_estimate.py @@ -4,10 +4,10 @@ from nose.tools import assert_true import numpy as np from numpy.testing import assert_array_almost_equal, assert_array_equal -from ..datasets import sample -from .. import stats -from .. import read_stc, write_stc, SourceEstimate, morph_data -from ..source_estimate import spatio_temporal_tris_connectivity, \ +from mne.datasets import sample +from mne import stats +from mne import read_stc, write_stc, SourceEstimate, morph_data +from mne.source_estimate import spatio_temporal_tris_connectivity, \ spatio_temporal_src_connectivity diff --git a/mne/tests/test_source_space.py b/mne/tests/test_source_space.py index 7f51e88..5b96bf0 100644 --- a/mne/tests/test_source_space.py +++ b/mne/tests/test_source_space.py @@ -1,8 +1,8 @@ import os.path as op from nose.tools import assert_true -from ..datasets import sample -from .. import read_source_spaces +from mne.datasets import sample +from mne import read_source_spaces examples_folder = op.join(op.dirname(__file__), '..', '..', 'examples') data_path = sample.data_path(examples_folder) diff --git a/mne/tests/test_surface.py b/mne/tests/test_surface.py index ee1a793..1ebee2d 100644 --- a/mne/tests/test_surface.py +++ b/mne/tests/test_surface.py @@ -2,8 +2,8 @@ import os.path as op from numpy.testing import assert_array_almost_equal -from ..datasets import sample -from .. import read_bem_surfaces, write_bem_surface +from mne.datasets import sample +from mne import read_bem_surfaces, write_bem_surface examples_folder = op.join(op.dirname(__file__), '..', '..', 'examples') data_path = sample.data_path(examples_folder) diff --git a/mne/tests/test_utils.py b/mne/tests/test_utils.py index d15c492..6a7cac6 100644 --- a/mne/tests/test_utils.py +++ b/mne/tests/test_utils.py @@ -1,7 +1,7 @@ +from scipy import signal from numpy.testing import assert_equal from mne.utils import _firwin2 as mne_firwin2 -from scipy import signal def test_firwin2(): """Test firwin2 backport diff --git a/mne/tests/test_viz.py b/mne/tests/test_viz.py index 2e6999a..1d3455c 100644 --- a/mne/tests/test_viz.py +++ b/mne/tests/test_viz.py @@ -1,8 +1,8 @@ import os.path as op -from .. import fiff -from ..layouts import Layout -from ..viz import plot_topo +from mne import fiff +from mne.layouts import Layout +from mne.viz import plot_topo fname = op.join(op.dirname(__file__), '..', 'fiff', 'tests', 'data', diff --git a/mne/time_frequency/tests/test_ar.py b/mne/time_frequency/tests/test_ar.py index dfd6819..881f992 100644 --- a/mne/time_frequency/tests/test_ar.py +++ b/mne/time_frequency/tests/test_ar.py @@ -4,8 +4,8 @@ from numpy.testing import assert_array_almost_equal from nose.tools import assert_true import nose -from ... import fiff -from .. import yule_walker, ar_raw +from mne import fiff +from mne.time_frequency import yule_walker, ar_raw raw_fname = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', 'data', 'test_raw.fif') diff --git a/mne/time_frequency/tests/test_psd.py b/mne/time_frequency/tests/test_psd.py index 38a7936..b9b8981 100644 --- a/mne/time_frequency/tests/test_psd.py +++ b/mne/time_frequency/tests/test_psd.py @@ -3,8 +3,8 @@ import os.path as op from numpy.testing import assert_array_almost_equal from nose.tools import assert_true -from ... import fiff, Epochs, read_events -from ...time_frequency import compute_raw_psd +from mne import fiff, Epochs, read_events +from mne.time_frequency import compute_raw_psd raw_fname = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', 'data', diff --git a/mne/time_frequency/tests/test_stft.py b/mne/time_frequency/tests/test_stft.py index 42b3c08..59b3789 100644 --- a/mne/time_frequency/tests/test_stft.py +++ b/mne/time_frequency/tests/test_stft.py @@ -3,7 +3,7 @@ from scipy import linalg from numpy.testing import assert_almost_equal, assert_array_almost_equal from nose.tools import assert_true -from ..stft import stft, istft, stftfreq, stft_norm2 +from mne.time_frequency.stft import stft, istft, stftfreq, stft_norm2 def test_stft(): diff --git a/mne/time_frequency/tests/test_tfr.py b/mne/time_frequency/tests/test_tfr.py index 24ceeb5..f935b43 100644 --- a/mne/time_frequency/tests/test_tfr.py +++ b/mne/time_frequency/tests/test_tfr.py @@ -3,14 +3,14 @@ import os.path as op from numpy.testing import assert_array_almost_equal from nose.tools import assert_true -from ... import fiff, Epochs, read_events -from ...time_frequency import induced_power, single_trial_power -from ...time_frequency.tfr import cwt_morlet, morlet +from mne import fiff, Epochs, read_events +from mne.time_frequency import induced_power, single_trial_power +from mne.time_frequency.tfr import cwt_morlet, morlet raw_fname = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', 'data', 'test_raw.fif') -event_fname = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', 'data', - 'test-eve.fif') +event_fname = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', + 'data', 'test-eve.fif') def test_morlet(): @@ -35,11 +35,11 @@ def test_time_frequency(): events = read_events(event_fname) include = [] - exclude = raw.info['bads'] + ['MEG 2443', 'EEG 053'] # bads + 2 more + exclude = raw.info['bads'] + ['MEG 2443', 'EEG 053'] # bads + 2 more # picks MEG gradiometers picks = fiff.pick_types(raw.info, meg='grad', eeg=False, - stim=False, include=include, exclude=exclude) + stim=False, include=include, exclude=exclude) picks = picks[:2] epochs = Epochs(raw, events, event_id, tmin, tmax, picks=picks, @@ -47,8 +47,8 @@ def test_time_frequency(): data = epochs.get_data() times = epochs.times - frequencies = np.arange(6, 20, 5) # define frequencies of interest - Fs = raw.info['sfreq'] # sampling in Hz + frequencies = np.arange(6, 20, 5) # define frequencies of interest + Fs = raw.info['sfreq'] # sampling in Hz n_cycles = frequencies / float(4) power, phase_lock = induced_power(data, Fs=Fs, frequencies=frequencies, n_cycles=n_cycles, use_fft=True) -- 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
