Merge branch 'master' of github.com:mwaskom/lyman

mwaskom · Jun 23, 2017 · fc31fbe · fc31fbe
2 parents e50fd2a + d33beea
commit fc31fbe
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 1,730 deletions.
diff --git a/doc/release/v0.0.11.txt b/doc/release/v0.0.11.txt
@@ -8,7 +8,7 @@ v0.0.11 (Unreleased)
 
 - Made it possible to turn off the FSL highpass filter by setting the ``hpf_cutoff` variable in the experiment file to ``None``.
 
-- The ``lyman.mvpa`` module has been removed.
+- The ``lyman.mvpa`` and ``lyman.evoked`` modules have been removed.
 
 - Added the ``view_ffx_results.py`` script, which is a wrapper around ``Freeview`` to boot up a useful visualization of fixed effects statistics on the high-resolution anatomical image and surface mesh.
 

diff --git a/lyman/evoked.py b/lyman/evoked.py
diff --git a/lyman/tools/__init__.py b/lyman/tools/__init__.py
@@ -1,5 +1,4 @@
 from .fileutils import *
 from .graphutils import *
 from .submission import *
-from .main import *
 from .commandline import parser
diff --git a/lyman/tools/main.py b/lyman/tools/main.py
diff --git a/lyman/workflows/archive/__init__.py b/lyman/workflows/archive/__init__.py