From acfa6f3bba095167a8c99509d5174b32c72b71ae Mon Sep 17 00:00:00 2001 From: Jan Sosulski Date: Thu, 1 Apr 2021 11:10:59 +0200 Subject: [PATCH] Restore basic logging --- moabb/analysis/__init__.py | 2 +- moabb/analysis/meta_analysis.py | 2 +- moabb/analysis/plotting.py | 2 +- moabb/datasets/Weibo2014.py | 2 +- moabb/datasets/base.py | 2 +- moabb/datasets/gigadb.py | 2 +- moabb/datasets/ssvep_mamem.py | 2 +- moabb/datasets/ssvep_nakanishi.py | 2 +- moabb/datasets/ssvep_wang.py | 2 +- moabb/evaluations/base.py | 2 +- moabb/evaluations/evaluations.py | 2 +- moabb/paradigms/base.py | 2 +- moabb/paradigms/motor_imagery.py | 2 +- moabb/paradigms/p300.py | 2 +- moabb/paradigms/ssvep.py | 2 +- moabb/run.py | 2 +- moabb/tests/paradigms.py | 2 +- moabb/utils.py | 16 ++++++++++++++-- 18 files changed, 31 insertions(+), 19 deletions(-) diff --git a/moabb/analysis/__init__.py b/moabb/analysis/__init__.py index f50001757..3fba31ce0 100644 --- a/moabb/analysis/__init__.py +++ b/moabb/analysis/__init__.py @@ -11,7 +11,7 @@ from moabb.analysis.results import Results # noqa: F401 -log = logging.getLogger() +log = logging.getLogger(__name__) def analyze(results, out_path, name="analysis", plot=False): diff --git a/moabb/analysis/meta_analysis.py b/moabb/analysis/meta_analysis.py index f33687a22..b76db2b79 100644 --- a/moabb/analysis/meta_analysis.py +++ b/moabb/analysis/meta_analysis.py @@ -6,7 +6,7 @@ import scipy.stats as stats -log = logging.getLogger() +log = logging.getLogger(__name__) def collapse_session_scores(df): diff --git a/moabb/analysis/plotting.py b/moabb/analysis/plotting.py index aa772576e..7742ca5ed 100644 --- a/moabb/analysis/plotting.py +++ b/moabb/analysis/plotting.py @@ -17,7 +17,7 @@ PIPELINE_PALETTE = sea.color_palette("husl", 6) sea.set(font="serif", style="whitegrid", palette=PIPELINE_PALETTE, color_codes=False) -log = logging.getLogger() +log = logging.getLogger(__name__) def _simplify_names(x): diff --git a/moabb/datasets/Weibo2014.py b/moabb/datasets/Weibo2014.py index c2545c674..aae31eaca 100644 --- a/moabb/datasets/Weibo2014.py +++ b/moabb/datasets/Weibo2014.py @@ -17,7 +17,7 @@ from .base import BaseDataset -log = logging.getLogger() +log = logging.getLogger(__name__) FILES = [] FILES.append("https://dataverse.harvard.edu/api/access/datafile/2499178") diff --git a/moabb/datasets/base.py b/moabb/datasets/base.py index 73148b251..a59668dfa 100644 --- a/moabb/datasets/base.py +++ b/moabb/datasets/base.py @@ -5,7 +5,7 @@ import logging -log = logging.getLogger() +log = logging.getLogger(__name__) class BaseDataset(metaclass=abc.ABCMeta): diff --git a/moabb/datasets/gigadb.py b/moabb/datasets/gigadb.py index b9ba81a1a..59c99f555 100644 --- a/moabb/datasets/gigadb.py +++ b/moabb/datasets/gigadb.py @@ -14,7 +14,7 @@ from .base import BaseDataset -log = logging.getLogger() +log = logging.getLogger(__name__) GIGA_URL = "ftp://parrot.genomics.cn/gigadb/pub/10.5524/100001_101000/100295/mat_data/" diff --git a/moabb/datasets/ssvep_mamem.py b/moabb/datasets/ssvep_mamem.py index 7edf29d31..79d9268a2 100644 --- a/moabb/datasets/ssvep_mamem.py +++ b/moabb/datasets/ssvep_mamem.py @@ -23,7 +23,7 @@ # and continues to have the problem, (Issue #254 on wfdb-python) # better to do pip install git+https://github.com/MIT-LCP/wfdb-python.git -log = logging.getLogger() +log = logging.getLogger(__name__) # Alternate Download Location # MAMEM1_URL = 'https://ndownloader.figshare.com/articles/2068677/versions/5' diff --git a/moabb/datasets/ssvep_nakanishi.py b/moabb/datasets/ssvep_nakanishi.py index 4b017a9de..1c10eed72 100644 --- a/moabb/datasets/ssvep_nakanishi.py +++ b/moabb/datasets/ssvep_nakanishi.py @@ -14,7 +14,7 @@ from .base import BaseDataset -log = logging.getLogger() +log = logging.getLogger(__name__) NAKAHISHI_URL = "https://github.com/mnakanishi/12JFPM_SSVEP/raw/master/data/" diff --git a/moabb/datasets/ssvep_wang.py b/moabb/datasets/ssvep_wang.py index 8fe8f682d..37a399554 100644 --- a/moabb/datasets/ssvep_wang.py +++ b/moabb/datasets/ssvep_wang.py @@ -16,7 +16,7 @@ from .base import BaseDataset -log = logging.getLogger() +log = logging.getLogger(__name__) # WANG_URL = 'http://bci.med.tsinghua.edu.cn/upload/yijun/' # 403 error # WANG_URL = 'ftp://anonymous@sccn.ucsd.edu/pub/ssvep_benchmark_dataset/' diff --git a/moabb/evaluations/base.py b/moabb/evaluations/base.py index d607e80c5..6e052231a 100644 --- a/moabb/evaluations/base.py +++ b/moabb/evaluations/base.py @@ -8,7 +8,7 @@ from moabb.paradigms.base import BaseParadigm -log = logging.getLogger() +log = logging.getLogger(__name__) class BaseEvaluation(ABC): diff --git a/moabb/evaluations/evaluations.py b/moabb/evaluations/evaluations.py index eb274c612..bf7e50b75 100644 --- a/moabb/evaluations/evaluations.py +++ b/moabb/evaluations/evaluations.py @@ -12,7 +12,7 @@ from moabb.evaluations.base import BaseEvaluation -log = logging.getLogger() +log = logging.getLogger(__name__) class WithinSessionEvaluation(BaseEvaluation): diff --git a/moabb/paradigms/base.py b/moabb/paradigms/base.py index 96256a775..460c2fe96 100644 --- a/moabb/paradigms/base.py +++ b/moabb/paradigms/base.py @@ -6,7 +6,7 @@ import pandas as pd -log = logging.getLogger() +log = logging.getLogger(__name__) class BaseParadigm(metaclass=ABCMeta): diff --git a/moabb/paradigms/motor_imagery.py b/moabb/paradigms/motor_imagery.py index 95ba3bf89..6c774286e 100644 --- a/moabb/paradigms/motor_imagery.py +++ b/moabb/paradigms/motor_imagery.py @@ -8,7 +8,7 @@ from moabb.paradigms.base import BaseParadigm -log = logging.getLogger() +log = logging.getLogger(__name__) class BaseMotorImagery(BaseParadigm): diff --git a/moabb/paradigms/p300.py b/moabb/paradigms/p300.py index 384d2979d..808f80f3a 100644 --- a/moabb/paradigms/p300.py +++ b/moabb/paradigms/p300.py @@ -12,7 +12,7 @@ from moabb.paradigms.base import BaseParadigm -log = logging.getLogger() +log = logging.getLogger(__name__) class BaseP300(BaseParadigm): diff --git a/moabb/paradigms/ssvep.py b/moabb/paradigms/ssvep.py index d3c6783dc..0ad7f61ae 100644 --- a/moabb/paradigms/ssvep.py +++ b/moabb/paradigms/ssvep.py @@ -7,7 +7,7 @@ from moabb.paradigms.base import BaseParadigm -log = logging.getLogger() +log = logging.getLogger(__name__) class BaseSSVEP(BaseParadigm): diff --git a/moabb/run.py b/moabb/run.py index a9c24e8a8..f35431941 100755 --- a/moabb/run.py +++ b/moabb/run.py @@ -20,7 +20,7 @@ from moabb.pipelines.utils import create_pipeline_from_config -log = logging.getLogger() +log = logging.getLogger(__name__) def parser_init(): diff --git a/moabb/tests/paradigms.py b/moabb/tests/paradigms.py index 7ecc3b230..f14b21b33 100644 --- a/moabb/tests/paradigms.py +++ b/moabb/tests/paradigms.py @@ -17,7 +17,7 @@ ) -log = logging.getLogger() +log = logging.getLogger(__name__) log.setLevel(logging.ERROR) diff --git a/moabb/utils.py b/moabb/utils.py index 593d7721c..d80ac5f84 100644 --- a/moabb/utils.py +++ b/moabb/utils.py @@ -1,9 +1,21 @@ +import logging + import mne -def set_log_level(verbose="info"): +def set_log_level(level="INFO"): """Set lot level. - Set the general log level. level can be 'info', 'debug' or 'warning' + Set the general log level. + Use one of the levels supported by python logging, i.e.: + DEBUG, INFO, WARNING, ERROR, CRITICAL """ + VALID_LEVELS = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] + level = level.upper() + if level not in VALID_LEVELS: + raise ValueError(f"Invalid level {level}. Choose one of {VALID_LEVELS}.") mne.set_log_level(False) + logging.basicConfig( + level=level, + format="%(asctime)s %(levelname)s %(threadName)s %(name)s %(message)s", + )