Merge branch 'master' into transpose_merge

scot-dev · Jan 29, 2016 · dcab99d · dcab99d
2 parents 06d2c3a + 7a53472
commit dcab99d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/examples/misc/connectivity.py b/examples/misc/connectivity.py
@@ -43,7 +43,7 @@
 #
 # We simply choose a VAR model order of 35, and reduction to 4 components
 # (that's not a lot).
-ws = scot.Workspace({'model_order': 35}, reducedim=4, fs=fs, locations=locs)
+ws = scot.Workspace({'model_order': 40}, reducedim=4, fs=fs, locations=locs)
 
 
 # Perform CSPVARICA and plot components

diff --git a/scot/__init__.py b/scot/__init__.py
@@ -20,6 +20,6 @@
 from . import datatools
 
 __all__ = ['Workspace', 'Connectivity', 'datatools']
-__version__ = "0.1.1"
+__version__ = "0.2.dev0"
 
 backends = ['backend_builtin', 'backend_sklearn']
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -2,6 +2,8 @@
 # http://opensource.org/licenses/MIT
 # Copyright (c) 2013 SCoT Development Team
 
+from __future__ import division
+
 import unittest
 
 from importlib import import_module