Skip to content

Commit

Permalink
adjust to new ndx releae v0.0.004 (#394)
Browse files Browse the repository at this point in the history
  • Loading branch information
WojciechMerynda authored May 27, 2020
1 parent 69e5884 commit f34c867
Show file tree
Hide file tree
Showing 18 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ requirements:
- zlib==1.2.11
- rec_to_binaries==0.4.2.dev0
- xmldiff==2.4
- ndx-fl-novela==0.0.003
- ndx-franklab-novela==0.0.004


about:
Expand Down
2 changes: 1 addition & 1 deletion rec_to_nwb/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies:
- pyyaml
- pytest
- testfixtures
- ndx-fl-novela==0.0.003
- ndx-franklab-novela==0.0.004
- pip:
- xmldiff
- rec-to-binaries==0.4.2.dev0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ndx_fl_novela.associated_files import AssociatedFiles
from ndx_franklab_novela.associated_files import AssociatedFiles


class AssociatedFilesCreator:
Expand Down
4 changes: 2 additions & 2 deletions rec_to_nwb/processing/nwb/components/device/device_factory.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from ndx_fl_novela.header_device import HeaderDevice
from ndx_fl_novela.probe import Probe
from ndx_franklab_novela.header_device import HeaderDevice
from ndx_franklab_novela.probe import Probe
from pynwb.device import Device

from rec_to_nwb.processing.tools.validate_parameters import validate_parameters_not_none
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ndx_fl_novela.probe import Shank
from ndx_franklab_novela.probe import Shank

from rec_to_nwb.processing.tools.validate_parameters import validate_parameters_not_none

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ndx_fl_novela.probe import ShanksElectrode
from ndx_franklab_novela.probe import ShanksElectrode

from rec_to_nwb.processing.tools.validate_parameters import validate_parameters_not_none

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ndx_fl_novela.nwb_electrode_group import NwbElectrodeGroup
from ndx_franklab_novela.nwb_electrode_group import NwbElectrodeGroup
from pynwb.ecephys import ElectrodeGroup

from rec_to_nwb.processing.nwb.components.electrode_group.fl_electrode_group import FlElectrodeGroup
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ndx_fl_novela.probe import Probe
from ndx_franklab_novela.probe import Probe

from rec_to_nwb.processing.nwb.components.electrode_group.fl_electrode_group_builder import FlElectrodeGroupBuilder
from rec_to_nwb.processing.tools.beartype.beartype import beartype
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ndx_fl_novela.probe import Probe
from ndx_franklab_novela.probe import Probe

from rec_to_nwb.processing.nwb.components.electrode_group.fl_electrode_group import FlElectrodeGroup
from rec_to_nwb.processing.nwb.components.electrode_group.fl_nwb_electrode_group_builder import FlNwbElectrodeGroupBuilder
Expand Down
6 changes: 3 additions & 3 deletions rec_to_nwb/scripts/nwb_eseries_timestamps_visualization.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import matplotlib.pyplot as plt
from pynwb import NWBHDF5IO

from ndx_fl_novela.apparatus import Apparatus, Edge, Node
from ndx_fl_novela.header_device import HeaderDevice
from ndx_fl_novela.ntrode import NTrode
from ndx_franklab_novela.apparatus import Apparatus, Edge, Node
from ndx_franklab_novela.header_device import HeaderDevice
from ndx_franklab_novela.ntrode import NTrode

nwb_file = NWBHDF5IO('rec_to_nwb/rec_to_nwb/test/beans20190718.nwb', 'r')
nwbfile_read = nwb_file.read()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import unittest

from ndx_fl_novela.associated_files import AssociatedFiles
from ndx_franklab_novela.associated_files import AssociatedFiles

from rec_to_nwb.processing.nwb.components.associated_files.associated_files_creator import AssociatedFilesCreator
from rec_to_nwb.processing.nwb.components.associated_files.fl_associated_file import FlAssociatedFile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest import TestCase
from unittest.mock import Mock

from ndx_fl_novela.probe import ShanksElectrode
from ndx_franklab_novela.probe import ShanksElectrode
from testfixtures import should_raise

from rec_to_nwb.processing.exceptions.none_param_exception import NoneParamException
Expand Down
4 changes: 2 additions & 2 deletions rec_to_nwb/test/processing/device/test_deviceFactory.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from unittest import TestCase
from unittest.mock import Mock

from ndx_fl_novela.header_device import HeaderDevice
from ndx_fl_novela.probe import Probe, Shank
from ndx_franklab_novela.header_device import HeaderDevice
from ndx_franklab_novela.probe import Probe, Shank
from pynwb.device import Device
from testfixtures import should_raise

Expand Down
4 changes: 2 additions & 2 deletions rec_to_nwb/test/processing/device/test_deviceInjector.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from unittest.mock import Mock

from dateutil.tz import tzlocal
from ndx_fl_novela.header_device import HeaderDevice
from ndx_fl_novela.probe import Probe
from ndx_franklab_novela.header_device import HeaderDevice
from ndx_franklab_novela.probe import Probe
from pynwb import NWBFile
from pynwb.device import Device
from testfixtures import should_raise
Expand Down
2 changes: 1 addition & 1 deletion rec_to_nwb/test/processing/device/test_flProbeManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from unittest import TestCase
from unittest.mock import Mock

from ndx_fl_novela.probe import Shank
from ndx_franklab_novela.probe import Shank
from testfixtures import should_raise

from rec_to_nwb.processing.nwb.components.device.fl_probe import FlProbe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from rec_to_nwb.processing.nwb.components.electrode_group.fl_electrode_group import FlElectrodeGroup
from rec_to_nwb.processing.nwb.components.electrode_group.fl_nwb_electrode_group import FlNwbElectrodeGroup

from ndx_fl_novela.probe import Probe
from ndx_franklab_novela.probe import Probe
from pynwb.device import Device
from testfixtures import should_raise

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from rec_to_nwb.processing.nwb.components.electrode_group.fl_electrode_group_manager import FlElectrodeGroupManager
from rec_to_nwb.processing.nwb.components.electrode_group.fl_electrode_group import FlElectrodeGroup

from ndx_fl_novela.probe import Probe
from ndx_franklab_novela.probe import Probe
from testfixtures import should_raise

path = os.path.dirname(os.path.abspath(__file__))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from rec_to_nwb.processing.nwb.components.electrode_group.fl_nwb_electrode_group import FlNwbElectrodeGroup
from rec_to_nwb.processing.nwb.components.electrode_group.fl_nwb_electrode_group_manager import FlNwbElectrodeGroupManager

from ndx_fl_novela.probe import Probe
from ndx_franklab_novela.probe import Probe
from testfixtures import should_raise

path = os.path.dirname(os.path.abspath(__file__))
Expand Down

0 comments on commit f34c867

Please sign in to comment.