Skip to content

Commit

Permalink
try again...
Browse files Browse the repository at this point in the history
  • Loading branch information
CodyCBakerPhD committed Aug 20, 2022
1 parent 89908f9 commit b4bd6ff
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from pathlib import Path
from setuptools import setup, find_packages
from copy import copy
from shutil import copy as copy_file


Expand All @@ -11,9 +10,8 @@
install_requires = f.readlines()
with open(root / "requirements-full.txt") as f:
full_dependencies = f.readlines()
testing_dependencies = copy(full_dependencies)
with open(root / "requirements-testing.txt") as f:
testing_dependencies.extend(f.readlines())
testing_dependencies = f.readlines()
extras_require = dict(full=full_dependencies, test=testing_dependencies)

# Create a local copy for the gin test configuration file based on the master file `base_gin_test_config.json`
Expand Down
13 changes: 9 additions & 4 deletions src/roiextractors/extraction_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@
except ImportError:
HAVE_H5 = False
try:
from scipy import io as scipy_io
if hasattr(scipy.io.matlab, "mat_struct"):
from scipy.io.matlab import mat_struct
else:
from scipy.io.matlab.mio5_params import mat_struct

if hasattr(scipy_io.matlab, "mat_struct"):
from scipy_io.matlab import mat_struct
HAVE_Scipy = True
except AttributeError:
if hasattr(scipy, "io") and hasattr(scipy.io.matlab, "mat_struct"):
from scipy.io import mat_struct
else:
from scipy_io.matlab.mio5_params import mat_struct
from scipy.io.matlab.mio5_params import mat_struct

HAVE_Scipy = True
except ImportError:
Expand Down

0 comments on commit b4bd6ff

Please sign in to comment.