[med-svn] [python-mne] 02/04: Merge tag 'upstream/0.11+dfsg'

Yaroslav Halchenko debian at onerussian.com
Tue Jan 5 02:16:12 UTC 2016


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

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

commit c92a60cf2e56c2c48a7b75c37f58dc9924949c35
Merge: ed85992 88d4b22
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Mon Jan 4 20:51:39 2016 -0500

    Merge tag 'upstream/0.11+dfsg'
    
    Upstream version 0.11+dfsg
    
    * tag 'upstream/0.11+dfsg':
      Imported Upstream version 0.11+dfsg

 .travis.yml                                        |    3 +-
 Makefile                                           |    4 +
 README.rst                                         |   10 +-
 doc/advanced_setup.rst                             |   43 +-
 doc/conf.py                                        |   11 +-
 doc/contributing.rst                               |   22 +-
 doc/getting_started.rst                            |    6 +-
 doc/manual/datasets_index.rst                      |  125 ++
 doc/manual/decoding.rst                            |  168 ++
 doc/manual/index.rst                               |   32 +-
 doc/manual/io.rst                                  |   31 +-
 doc/manual/memory.rst                              |   45 +
 doc/manual/pitfalls.rst                            |   27 +
 doc/manual/preprocessing/overview.rst              |    8 +-
 doc/manual/preprocessing/ssp.rst                   |  144 +-
 doc/manual/{datasets.rst => sample_dataset.rst}    |    0
 doc/python_reference.rst                           |   21 +-
 doc/this_project.inc                               |    2 +-
 doc/tutorials/mne-report.png                       |  Bin 0 -> 172544 bytes
 doc/tutorials/report.rst                           |    5 +
 doc/whats_new.rst                                  |  113 +-
 examples/datasets/plot_brainstorm_data.py          |    3 +-
 .../decoding/plot_decoding_time_generalization.py  |    2 +-
 examples/preprocessing/plot_maxwell_filter.py      |   45 +
 examples/visualization/plot_evoked_erf_erp.py      |    6 +-
 mne/__init__.py                                    |   16 +-
 mne/bem.py                                         |  103 +-
 mne/channels/channels.py                           |  108 +-
 mne/channels/interpolation.py                      |    8 +-
 mne/channels/layout.py                             |   18 +-
 mne/channels/montage.py                            |  116 +-
 mne/channels/tests/test_channels.py                |    6 +-
 mne/channels/tests/test_layout.py                  |    7 +-
 mne/channels/tests/test_montage.py                 |   17 +-
 mne/chpi.py                                        |   55 +-
 mne/commands/mne_flash_bem_model.py                |  145 --
 mne/commands/mne_show_fiff.py                      |   27 +
 mne/commands/tests/test_commands.py                |   17 +-
 mne/connectivity/tests/test_utils.py               |    3 +-
 mne/coreg.py                                       |    4 +-
 mne/cov.py                                         |   27 +-
 mne/data/coil_def_Elekta.dat                       |   10 +-
 mne/datasets/utils.py                              |   19 +-
 mne/decoding/__init__.py                           |    2 +-
 mne/decoding/base.py                               |   20 +-
 mne/decoding/csp.py                                |  132 +-
 mne/decoding/mixin.py                              |   37 +
 mne/decoding/tests/test_csp.py                     |   23 +
 mne/decoding/tests/test_time_gen.py                |    8 +-
 mne/decoding/time_gen.py                           |  153 +-
 mne/decoding/transformer.py                        |    8 +-
 mne/dipole.py                                      |    8 +-
 mne/epochs.py                                      |  428 +++--
 mne/evoked.py                                      |   56 +-
 mne/forward/_compute_forward.py                    |   59 +-
 mne/forward/_field_interpolation.py                |   99 +-
 mne/forward/_lead_dots.py                          |  129 +-
 mne/forward/_make_forward.py                       |  178 ++-
 mne/forward/forward.py                             |   43 +-
 mne/forward/tests/test_field_interpolation.py      |   14 +-
 mne/forward/tests/test_make_forward.py             |    2 +-
 mne/gui/__init__.py                                |    7 +-
 mne/gui/_coreg_gui.py                              |    2 +-
 mne/gui/_fiducials_gui.py                          |    2 +-
 mne/gui/_file_traits.py                            |    2 +-
 mne/gui/_help.py                                   |   16 +
 mne/gui/_kit2fiff_gui.py                           |  151 +-
 mne/gui/_marker_gui.py                             |    2 +-
 mne/gui/_viewer.py                                 |    2 +-
 mne/gui/help/kit2fiff.json                         |    7 +
 mne/gui/tests/test_kit2fiff_gui.py                 |   22 +-
 mne/io/__init__.py                                 |   55 +-
 mne/io/array/array.py                              |    4 +-
 mne/io/array/tests/test_array.py                   |   20 +-
 mne/io/base.py                                     |  183 ++-
 mne/io/brainvision/brainvision.py                  |  218 +--
 mne/io/brainvision/tests/data/test.vmrk            |    1 +
 mne/io/brainvision/tests/data/testv2.vhdr          |  107 ++
 .../tests/data/{test.vmrk => testv2.vmrk}          |   12 +-
 mne/io/brainvision/tests/test_brainvision.py       |   78 +-
 mne/io/bti/bti.py                                  |  165 +-
 mne/io/bti/tests/test_bti.py                       |   66 +-
 mne/io/constants.py                                |   32 +-
 mne/io/ctf.py                                      |  256 ---
 mne/io/ctf/__init__.py                             |    7 +
 mne/io/ctf/constants.py                            |   38 +
 mne/io/ctf/ctf.py                                  |  218 +++
 mne/io/ctf/eeg.py                                  |   51 +
 mne/io/ctf/hc.py                                   |   85 +
 mne/io/ctf/info.py                                 |  401 +++++
 mne/io/ctf/res4.py                                 |  212 +++
 mne/{ => io/ctf}/tests/__init__.py                 |    0
 mne/io/ctf/tests/test_ctf.py                       |  171 ++
 mne/io/ctf/trans.py                                |  170 ++
 mne/io/ctf_comp.py                                 |  159 ++
 mne/io/edf/edf.py                                  |  231 +--
 mne/io/edf/tests/test_edf.py                       |  139 +-
 mne/io/eeglab/__init__.py                          |    5 +
 mne/io/eeglab/eeglab.py                            |  447 ++++++
 mne/{ => io/eeglab}/tests/__init__.py              |    0
 mne/io/eeglab/tests/test_eeglab.py                 |   85 +
 mne/io/egi/egi.py                                  |  227 ++-
 mne/io/egi/tests/data/test_egi.txt                 |  257 +++
 mne/io/egi/tests/test_egi.py                       |   58 +-
 mne/io/fiff/raw.py                                 |   23 +-
 .../fiff/tests/{test_raw.py => test_raw_fiff.py}   |   14 +-
 mne/io/kit/constants.py                            |   30 +-
 mne/io/kit/kit.py                                  |  108 +-
 mne/io/kit/tests/test_kit.py                       |  113 +-
 mne/io/meas_info.py                                |   77 +-
 mne/io/nicolet/__init__.py                         |    7 +
 mne/io/nicolet/nicolet.py                          |  206 +++
 mne/{ => io/nicolet}/tests/__init__.py             |    0
 mne/io/nicolet/tests/data/test_nicolet_raw.data    |  Bin 0 -> 29696 bytes
 mne/io/nicolet/tests/data/test_nicolet_raw.head    |   11 +
 mne/io/nicolet/tests/test_nicolet.py               |   20 +
 mne/io/open.py                                     |   10 +-
 mne/io/pick.py                                     |   71 +-
 mne/io/proc_history.py                             |   48 +-
 mne/io/proj.py                                     |   30 +-
 mne/io/reference.py                                |    8 +-
 mne/io/tag.py                                      |    2 -
 mne/io/tests/test_apply_function.py                |   18 +-
 mne/io/tests/test_pick.py                          |   77 +-
 mne/io/tests/test_raw.py                           |   82 +-
 mne/io/tests/test_reference.py                     |   31 +-
 mne/io/utils.py                                    |  165 ++
 mne/io/write.py                                    |   28 +-
 mne/minimum_norm/inverse.py                        |    6 +-
 mne/preprocessing/__init__.py                      |    2 +-
 mne/preprocessing/ecg.py                           |   55 +-
 mne/preprocessing/ica.py                           |  100 +-
 mne/preprocessing/maxwell.py                       | 1631 ++++++++++++++++----
 mne/preprocessing/stim.py                          |    4 +-
 mne/preprocessing/tests/test_ecg.py                |   32 +-
 mne/preprocessing/tests/test_ica.py                |   44 +-
 mne/preprocessing/tests/test_maxwell.py            |  734 +++++++--
 mne/preprocessing/tests/test_ssp.py                |   22 +
 mne/proj.py                                        |   12 +-
 mne/realtime/fieldtrip_client.py                   |  693 +++++----
 mne/simulation/__init__.py                         |    6 +-
 mne/simulation/evoked.py                           |   70 +-
 mne/simulation/raw.py                              |    4 +-
 mne/simulation/source.py                           |  111 +-
 mne/source_estimate.py                             |   47 +-
 mne/source_space.py                                |   55 +-
 mne/stats/__init__.py                              |    3 +-
 mne/stats/parametric.py                            |   22 -
 mne/stats/regression.py                            |   22 +-
 mne/stats/tests/test_cluster_level.py              |   27 +-
 mne/stats/tests/test_parametric.py                 |    7 +-
 mne/stats/tests/test_regression.py                 |   15 +
 mne/tests/__init__.py                              |    1 +
 mne/tests/common.py                                |   74 +
 mne/tests/test_bem.py                              |   41 +-
 mne/tests/test_chpi.py                             |   33 +-
 mne/tests/test_coreg.py                            |    2 +-
 mne/tests/test_dipole.py                           |   10 +-
 mne/tests/test_docstring_parameters.py             |    1 -
 mne/tests/test_epochs.py                           |  223 ++-
 mne/tests/test_evoked.py                           |   24 +-
 mne/tests/test_filter.py                           |   83 +-
 mne/tests/test_fixes.py                            |    6 +-
 mne/tests/test_label.py                            |    2 +-
 mne/tests/test_line_endings.py                     |   68 +
 mne/tests/test_proj.py                             |    3 +
 mne/tests/test_source_estimate.py                  |   60 +-
 mne/tests/test_source_space.py                     |    9 +-
 mne/tests/test_surface.py                          |   17 +-
 mne/tests/test_transforms.py                       |   49 +-
 mne/tests/test_utils.py                            |   12 +-
 mne/time_frequency/psd.py                          |    2 +-
 mne/time_frequency/tests/test_tfr.py               |   31 +-
 mne/time_frequency/tfr.py                          |   72 +-
 mne/transforms.py                                  |  153 +-
 mne/utils.py                                       |  321 ++--
 mne/viz/_3d.py                                     |   13 +-
 mne/viz/__init__.py                                |    9 +-
 mne/viz/circle.py                                  |    4 +-
 mne/viz/decoding.py                                |    8 +-
 mne/viz/epochs.py                                  |  178 +--
 mne/viz/evoked.py                                  |  163 +-
 mne/viz/ica.py                                     |  155 +-
 mne/viz/misc.py                                    |   20 +-
 mne/viz/montage.py                                 |    6 +-
 mne/viz/raw.py                                     |  124 +-
 mne/viz/tests/test_3d.py                           |    4 +-
 mne/viz/tests/test_circle.py                       |    2 +-
 mne/viz/tests/test_epochs.py                       |    5 +-
 mne/viz/tests/test_evoked.py                       |    9 +-
 mne/viz/tests/test_ica.py                          |   14 +
 mne/viz/tests/test_raw.py                          |    6 +-
 mne/viz/tests/test_topo.py                         |   10 +-
 mne/viz/tests/test_topomap.py                      |    6 +-
 mne/viz/tests/test_utils.py                        |    7 +-
 mne/viz/topo.py                                    |   86 +-
 mne/viz/topomap.py                                 |   76 +-
 mne/viz/utils.py                                   |   26 +-
 setup.py                                           |    4 +
 tutorials/plot_ica_from_raw.py                     |    4 +-
 tutorials/plot_introduction.py                     |   23 +-
 .../plot_spatio_temporal_cluster_stats_sensor.py   |    4 +-
 202 files changed, 10116 insertions(+), 4402 deletions(-)

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



More information about the debian-med-commit mailing list