[med-svn] [python-mne] 01/01: Imported Upstream version 0.8.6+dfsg Conflicts: mne/__init__.py

[Alexandre Gramfort]

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

agramfort-guest pushed a commit to branch upstream
in repository python-mne.

commit 94fc3629b5107949b2d4b412bd0274b47858561a
Author: Alexandre Gramfort <alexandre.gramfort at m4x.org>
Date:   Mon Sep 22 16:05:35 2014 -0400

    Imported Upstream version 0.8.6+dfsg
    Conflicts:
    	mne/__init__.py
---
 MANIFEST.in              | 5 +++++
 doc/source/whats_new.rst | 2 +-
 mne/__init__.py          | 2 +-
 mne/coreg.py             | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index e2b071e..6e868f4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,7 +9,12 @@ recursive-include mne/data *.sel
 recursive-include mne/data *.fif.gz
 recursive-include mne/layouts *.lout
 recursive-include mne/layouts *.lay
+recursive-include mne/html *.js
+recursive-include mne/html *.css
 recursive-exclude examples/MNE-sample-data *
+recursive-exclude examples/MNE-testing-data *
+recursive-exclude examples/MNE-spm-face *
+recursive-exclude examples/MNE-somato-data *
 # recursive-include mne/fiff/tests/data *
 recursive-exclude mne/fiff/tests/data *
 recursive-exclude mne/fiff/bti/tests/data *
diff --git a/doc/source/whats_new.rst b/doc/source/whats_new.rst
index 0f31d17..23919c5 100644
--- a/doc/source/whats_new.rst
+++ b/doc/source/whats_new.rst
@@ -143,7 +143,7 @@ API
 
    - Deprecate Epochs.drop_picks in favor of a new method called drop_channels
 
-   - Deprecate `labels_from_parc` and `parc_from_labels` in favor of `read_annot` and `write_annot`
+   - Deprecate `labels_from_parc` and `parc_from_labels` in favor of `read_labels_from_annot` and `write_labels_to_annot`
 
    - The default of the new add_dist option of `setup_source_space` to add patch information will change from False to True in MNE-Python 0.9
 
diff --git a/mne/__init__.py b/mne/__init__.py
index 0b90048..2ae0043 100644
--- a/mne/__init__.py
+++ b/mne/__init__.py
@@ -1,7 +1,7 @@
 """MNE for MEG and EEG data analysis
 """
 
-__version__ = '0.8.4'
+__version__ = '0.8.6'
 
 # have to import verbose first since it's needed by many things
 from .utils import (set_log_level, set_log_file, verbose, set_config,
diff --git a/mne/coreg.py b/mne/coreg.py
index ce634e1..2461380 100644
--- a/mne/coreg.py
+++ b/mne/coreg.py
@@ -1150,6 +1150,7 @@ def scale_source_space(subject_to, src_name, subject_from=None, scale=None,
 
     if add_dist:
         logger.info("Recomputing distances, this might take a while")
-        add_source_space_distances(sss, sss[0]['dist_limit'], n_jobs)
+        dist_limit = np.asscalar(sss[0]['dist_limit'])
+        add_source_space_distances(sss, dist_limit, n_jobs)
 
     write_source_spaces(dst, sss)

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