From e30091ec43a1aea30a5e2dc8413dbee682a2fe03 Mon Sep 17 00:00:00 2001 From: Heberto Mayorquin Date: Tue, 23 Apr 2024 10:30:49 -0600 Subject: [PATCH] remove try-except block --- requirements-minimal.txt | 2 +- src/roiextractors/extraction_tools.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/requirements-minimal.txt b/requirements-minimal.txt index 59234aae..8a208244 100644 --- a/requirements-minimal.txt +++ b/requirements-minimal.txt @@ -3,6 +3,6 @@ pynwb>=2.0.1 tqdm>=4.48.2 lazy_ops>=0.2.0 dill>=0.3.2 -scipy>=1.5.2 +scipy>=1.8.0 psutil>=5.8.0 PyYAML diff --git a/src/roiextractors/extraction_tools.py b/src/roiextractors/extraction_tools.py index 6f8a5874..705110a4 100644 --- a/src/roiextractors/extraction_tools.py +++ b/src/roiextractors/extraction_tools.py @@ -21,6 +21,7 @@ from numpy.typing import ArrayLike, DTypeLike from tqdm import tqdm from packaging import version +from scipy.io.matlab.mio5_params import mat_struct try: @@ -29,11 +30,7 @@ HAVE_H5 = True except ImportError: HAVE_H5 = False -try: - if hasattr(scipy.io.matlab, "mat_struct"): - from scipy.io.matlab import mat_struct - else: - from scipy.io.matlab.mio5_params import mat_struct + HAVE_Scipy = True except AttributeError: