From 1e997b2784c5c66a35956db1fae15688f53bd5cf Mon Sep 17 00:00:00 2001
From: nbara <10333715+nbara@users.noreply.github.com>
Date: Mon, 22 Feb 2021 16:46:16 +0100
Subject: [PATCH] Bump version + fix sklearn/pyriemann compat

---
 doc/conf.py         | 5 ++---
 meegkit/__init__.py | 2 ++
 requirements.txt    | 2 +-
 setup.py            | 2 +-
 tests/test_cca.py   | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index eb9bf3a0..88691a47 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -19,19 +19,18 @@
 import matplotlib
 matplotlib.use('agg')
 
-# import meegkit
-
 curdir = os.path.dirname(__file__)
 sys.path.append(os.path.abspath(os.path.join(curdir, '..')))
 sys.path.append(os.path.abspath(os.path.join(curdir, '..', 'meegkit')))
 
+import meegkit # noqa
 
 # -- Project information -----------------------------------------------------
 
 project = 'MEEGkit'
 copyright = '2020, Nicolas Barascud'
 author = 'Nicolas Barascud'
-version = '0.1'
+version = meegkit.__version__
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/meegkit/__init__.py b/meegkit/__init__.py
index cf38d652..795795bd 100644
--- a/meegkit/__init__.py
+++ b/meegkit/__init__.py
@@ -1,4 +1,6 @@
 """M/EEG denoising utilities in python."""
+__version__ = '0.1.1'
+
 from . import asr, cca, detrend, dss, sns, star, ress, tspca, utils
 
 __all__ = ['asr', 'cca', 'detrend', 'dss', 'ress', 'sns', 'star', 'tspca',
diff --git a/requirements.txt b/requirements.txt
index d8ed5fe8..f19d848e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,4 +15,4 @@ codespell
 pydocstyle
 tqdm
 statsmodels
-pyriemann
+pyriemann @ git+https://github.com/alexandrebarachant/pyRiemann.git@1ecaa372b7c432f13e82685b2541ee48424a11c9
diff --git a/setup.py b/setup.py
index 5f5bb43d..04271bb1 100644
--- a/setup.py
+++ b/setup.py
@@ -9,6 +9,6 @@
     author='N Barascud',
     author_email='nicolas.barascud@ens.fr',
     license='UNLICENSED',
-    version='0.1',
+    version='0.1.1',
     packages=find_packages(exclude=['doc', 'tests']),
     zip_safe=False)
diff --git a/tests/test_cca.py b/tests/test_cca.py
index 159eceea..78a7c5ec 100644
--- a/tests/test_cca.py
+++ b/tests/test_cca.py
@@ -26,7 +26,7 @@ def test_cca():
     C1 = tscov(np.hstack((X1, Y1)))[0]
 
     # Sklearn CCA
-    cca = CCA(n_components=9, scale=False, max_iter=1e6)
+    cca = CCA(n_components=9, scale=False, max_iter=int(1e6))
     X2, Y2 = cca.fit_transform(x, y)
     # C2 = tscov(np.hstack((X2, Y2)).T)[0]
     # import matplotlib.pyplot as plt