From 70e60b3565cca970851866bb568e9270cd7c6fe5 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sat, 22 Apr 2017 12:29:08 +0200
Subject: [PATCH 1/2] Ignore .cache directory

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index af6bd73..79e6952 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ develop-eggs
 lib
 lib64
 __pycache__
+.cache
 
 # Installer logs
 pip-log.txt

From 22878be0c52bd323dc8cf370297c7bc2fbc39c02 Mon Sep 17 00:00:00 2001
From: Chris Kerr <chris.kerr@mykolab.ch>
Date: Sat, 22 Apr 2017 12:34:02 +0200
Subject: [PATCH 2/2] Explicitly coerce size-1 array to scalar

Fixes #4
---
 galvani/BioLogic.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py
index 3b3afb4..4143fb2 100644
--- a/galvani/BioLogic.py
+++ b/galvani/BioLogic.py
@@ -287,6 +287,7 @@ class MPRfile:
 
         n_data_points = np.fromstring(data_module['data'][:4], dtype='<u4')
         n_columns = np.fromstring(data_module['data'][4:5], dtype='u1')
+        n_columns = np.asscalar(n_columns)  # Compatibility with recent numpy
 
         if data_module['version'] == 0:
             column_types = np.fromstring(data_module['data'][5:], dtype='u1',