Merge pull request #98 from OpenSourceBrain/development

Fix for pathlib

Author: pgleeson

omv/analyzers/utils/timeseries.py

@@ -1,6 +1,6 @@
-
 from omv.common.inout import inform
 
+
 def detect_spikes(v, method='threshold', threshold=0.):
     from numpy import flatnonzero, bitwise_and, roll, diff, array
 
@@ -45,8 +45,13 @@ def load_spike_file(fname, format='ID_TIME', ids=0, scaling=1.0):
 
 def compare_arrays(arrays, tolerance):
     from numpy import allclose, array, max, abs, atleast_1d
-    
-    a1, a2 = array(arrays)
+
+    # if array conversion fails, also fail test
+    try:
+        a1, a2 = array(arrays)
+    except ValueError as e:
+        print(e)
+        return (False, 0)
 
     if (hasattr(a1, '__len__') or hasattr(a2, '__len__')) and len(a1)!=len(a2):  # Different lengths!!
         return (False, 0)

omv/engines/pynn.py

@@ -32,7 +32,7 @@ def is_installed():
     def install(version=None):
         from omv.engines.getpynn import install_pynn
         home = os.environ['HOME']
-        inform('Will fetch and install pyNN', indent=2)
+        inform('Will fetch and install pyNN (version info: %s)'%version, indent=2)
         install_pynn(version)
         inform('Done, PyNN is correctly installed...', indent=2)
 

setup.py

@@ -25,6 +25,6 @@
         'PyYAML',
         'numpy',
         'pyrx',
-        'pathlib',
+        'pathlib; python_version<"3.4"',
         'docopt'],
 )