diff --git a/ecogvis/functions/htk_to_nwb/chang2nwb.py b/ecogvis/functions/htk_to_nwb/chang2nwb.py index eb966ad..b9d2f18 100644 --- a/ecogvis/functions/htk_to_nwb/chang2nwb.py +++ b/ecogvis/functions/htk_to_nwb/chang2nwb.py @@ -14,7 +14,7 @@ import numpy as np import pandas as pd from hdmf.backends.hdf5 import H5DataIO -from nwbext_ecog import ECoGSubject +from ndx_ecog import ECoGSubject from ndx_bipolar_scheme import BipolarSchemeTable, EcephysExt from pynwb.file import DynamicTableRegion from pynwb import NWBFile, TimeSeries, get_manager, NWBHDF5IO diff --git a/ecogvis/functions/nwb_copy_file.py b/ecogvis/functions/nwb_copy_file.py index 013cd60..2fed64e 100644 --- a/ecogvis/functions/nwb_copy_file.py +++ b/ecogvis/functions/nwb_copy_file.py @@ -4,7 +4,7 @@ from ndx_spectrum import Spectrum from ndx_survey_data.survey_definitions import nrs_survey_table, mpq_survey_table, vas_survey_table from ndx_bipolar_scheme import BipolarSchemeTable, EcephysExt -from nwbext_ecog import CorticalSurfaces, ECoGSubject +from ndx_ecog import CorticalSurfaces, ECoGSubject from pynwb import NWBFile, NWBHDF5IO, get_manager, ProcessingModule from pynwb.base import TimeSeries from pynwb.device import Device diff --git a/ecogvis/functions/subFunctions.py b/ecogvis/functions/subFunctions.py index a754cb3..8bb2f7c 100755 --- a/ecogvis/functions/subFunctions.py +++ b/ecogvis/functions/subFunctions.py @@ -8,7 +8,7 @@ import pyqtgraph as pg import datetime import pynwb -import nwbext_ecog +import ndx_ecog from ecogvis.functions.htk_to_nwb.chang2nwb import chang2nwb diff --git a/make_env.yml b/make_env.yml index dcd2fc8..2380641 100644 --- a/make_env.yml +++ b/make_env.yml @@ -20,6 +20,6 @@ dependencies: - hdmf - pip: - PyQt5 - - nwbext_ecog==0.7.2 + - ndx-ecog - ndx-spectrum - - -e . \ No newline at end of file + - -e . diff --git a/requirements.txt b/requirements.txt index 8889b29..4eb5999 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ h5py pyqtgraph pandas pynwb -nwbext_ecog +ndx-ecog ndx-spectrum ndx-survey-data ndx-bipolar-scheme>=0.3.1 diff --git a/setup.py b/setup.py index 07a049f..6090d79 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ include_package_data=True, install_requires=['PyQt5', 'matplotlib', 'cycler', 'scipy', 'numpy', 'h5py', 'pyqtgraph', 'pandas', 'pynwb>=1.1.2', 'PyYAML', - 'nwbext_ecog==0.7.2', 'ndx-spectrum', 'ndx-survey-data', + 'ndx-ecog', 'ndx-spectrum', 'ndx-survey-data', 'ndx-bipolar-scheme', 'tqdm', 'pyopengl', 'process_nwb', 'tdt', 'PyQtWebEngine'], entry_points={