Skip to content

Bump version + fix sklearn/pyriemann compat #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nbara merged 1 commit into from
Feb 22, 2021
Merged

Bump version + fix sklearn/pyriemann compat #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------

Expand Down
2 changes: 2 additions & 0 deletions meegkit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ codespell
pydocstyle
tqdm
statsmodels
pyriemann
pyriemann @ git+https://github.com/alexandrebarachant/pyRiemann.git@1ecaa372b7c432f13e82685b2541ee48424a11c9
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion tests/test_cca.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down