From d5195b6f1f3af516d8b9d95892c086d5e57aacb5 Mon Sep 17 00:00:00 2001 From: Wojciech Merynda Date: Wed, 27 May 2020 11:25:27 +0200 Subject: [PATCH 1/2] release 0.0.004 name ndx_franklab-novela --- setup.py | 4 ++-- src/pynwb/ndx_fl_novela/__init__.py | 8 ++++---- src/pynwb/tests/test_associated_files.py | 2 +- src/pynwb/tests/test_header_device.py | 2 +- src/pynwb/tests/test_nwbElectrodeGroup.py | 2 +- src/pynwb/tests/test_probe.py | 2 +- src/pynwb/tests/test_read_nwb.py | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index 5edc7a4..4653639 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ ], 'packages': find_packages('src/pynwb'), 'package_dir': {'': 'src/pynwb'}, - 'package_data': {'ndx_fl_novela': [ + 'package_data': {'ndx_franklab_novela': [ 'spec/ndx-franklab-novela.namespace.yaml', 'spec/ndx-franklab-novela.extensions.yaml', ]}, @@ -53,7 +53,7 @@ def _copy_spec_files(project_dir): ns_path = os.path.join(project_dir, 'spec', 'ndx-franklab-novela.namespace.yaml') ext_path = os.path.join(project_dir, 'spec', 'ndx-franklab-novela.extensions.yaml') - dst_dir = os.path.join(project_dir, 'src', 'pynwb', 'ndx_fl_novela', 'spec') + dst_dir = os.path.join(project_dir, 'src', 'pynwb', 'ndx_franklab_novela', 'spec') if not os.path.exists(dst_dir): os.mkdir(dst_dir) diff --git a/src/pynwb/ndx_fl_novela/__init__.py b/src/pynwb/ndx_fl_novela/__init__.py index 5c51c56..c5e2062 100644 --- a/src/pynwb/ndx_fl_novela/__init__.py +++ b/src/pynwb/ndx_fl_novela/__init__.py @@ -3,7 +3,7 @@ from pynwb import load_namespaces # Set path of the namespace.yaml file to the expected install location -ndx_fl_novela_specpath = os.path.join( +ndx_franklab_novela_specpath = os.path.join( os.path.dirname(__file__), 'spec', 'ndx-franklab-novela.namespace.yaml' @@ -11,8 +11,8 @@ # If the extension has not been installed yet but we are running directly from # the git repo -if not os.path.exists(ndx_fl_novela_specpath): - ndx_fl_novela_specpath = os.path.abspath(os.path.join( +if not os.path.exists(ndx_franklab_novela_specpath): + ndx_franklab_novela_specpath = os.path.abspath(os.path.join( os.path.dirname(__file__), '..', '..', '..', 'spec', @@ -20,4 +20,4 @@ )) # Load the namespace -load_namespaces(ndx_fl_novela_specpath) +load_namespaces(ndx_franklab_novela_specpath) diff --git a/src/pynwb/tests/test_associated_files.py b/src/pynwb/tests/test_associated_files.py index 634c656..b300f13 100644 --- a/src/pynwb/tests/test_associated_files.py +++ b/src/pynwb/tests/test_associated_files.py @@ -1,6 +1,6 @@ from unittest import TestCase -from src.pynwb.ndx_fl_novela.associated_files import AssociatedFiles +from src.pynwb.ndx_franklab_novela.associated_files import AssociatedFiles class TestApparatus(TestCase): diff --git a/src/pynwb/tests/test_header_device.py b/src/pynwb/tests/test_header_device.py index 3800f2b..beedd79 100644 --- a/src/pynwb/tests/test_header_device.py +++ b/src/pynwb/tests/test_header_device.py @@ -1,6 +1,6 @@ from unittest import TestCase -from src.pynwb.ndx_fl_novela.header_device import HeaderDevice +from src.pynwb.ndx_franklab_novela.header_device import HeaderDevice class TestHeaderDevice(TestCase): diff --git a/src/pynwb/tests/test_nwbElectrodeGroup.py b/src/pynwb/tests/test_nwbElectrodeGroup.py index 9ba9169..c10ec55 100644 --- a/src/pynwb/tests/test_nwbElectrodeGroup.py +++ b/src/pynwb/tests/test_nwbElectrodeGroup.py @@ -3,7 +3,7 @@ from pynwb.device import Device -from src.pynwb.ndx_fl_novela.nwb_electrode_group import NwbElectrodeGroup +from src.pynwb.ndx_franklab_novela.nwb_electrode_group import NwbElectrodeGroup class TestNwbElectrodeGroup(unittest.TestCase): diff --git a/src/pynwb/tests/test_probe.py b/src/pynwb/tests/test_probe.py index 29265c8..4dcf181 100644 --- a/src/pynwb/tests/test_probe.py +++ b/src/pynwb/tests/test_probe.py @@ -1,7 +1,7 @@ import unittest from unittest.mock import Mock -from src.pynwb.ndx_fl_novela.probe import Probe, ShanksElectrode, Shank +from src.pynwb.ndx_franklab_novela.probe import Probe, ShanksElectrode, Shank class TestShanksElectrode(unittest.TestCase): diff --git a/src/pynwb/tests/test_read_nwb.py b/src/pynwb/tests/test_read_nwb.py index bb073a7..b234b23 100644 --- a/src/pynwb/tests/test_read_nwb.py +++ b/src/pynwb/tests/test_read_nwb.py @@ -9,9 +9,9 @@ from pynwb.device import Device from pynwb.testing import TestCase -from src.pynwb.ndx_fl_novela.header_device import HeaderDevice -from src.pynwb.ndx_fl_novela.nwb_electrode_group import NwbElectrodeGroup -from src.pynwb.ndx_fl_novela.probe import Probe, Shank, ShanksElectrode +from src.pynwb.ndx_franklab_novela.header_device import HeaderDevice +from src.pynwb.ndx_franklab_novela.nwb_electrode_group import NwbElectrodeGroup +from src.pynwb.ndx_franklab_novela.probe import Probe, Shank, ShanksElectrode class TestNWBFileReading(TestCase): From 03eaca623f66e64442745f93cb603ebea9e0e62e Mon Sep 17 00:00:00 2001 From: Wojciech Merynda Date: Wed, 27 May 2020 11:36:18 +0200 Subject: [PATCH 2/2] release 0.0.004 name ndx_franklab_novela --- src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/__init__.py | 0 .../{ndx_fl_novela => ndx_franklab_novela}/associated_files.py | 0 src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/header_device.py | 0 .../{ndx_fl_novela => ndx_franklab_novela}/nwb_electrode_group.py | 0 src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/probe.py | 0 .../spec/ndx-franklab-novela.extensions.yaml | 0 .../spec/ndx-franklab-novela.namespace.yaml | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/__init__.py (100%) rename src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/associated_files.py (100%) rename src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/header_device.py (100%) rename src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/nwb_electrode_group.py (100%) rename src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/probe.py (100%) rename src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/spec/ndx-franklab-novela.extensions.yaml (100%) rename src/pynwb/{ndx_fl_novela => ndx_franklab_novela}/spec/ndx-franklab-novela.namespace.yaml (100%) diff --git a/src/pynwb/ndx_fl_novela/__init__.py b/src/pynwb/ndx_franklab_novela/__init__.py similarity index 100% rename from src/pynwb/ndx_fl_novela/__init__.py rename to src/pynwb/ndx_franklab_novela/__init__.py diff --git a/src/pynwb/ndx_fl_novela/associated_files.py b/src/pynwb/ndx_franklab_novela/associated_files.py similarity index 100% rename from src/pynwb/ndx_fl_novela/associated_files.py rename to src/pynwb/ndx_franklab_novela/associated_files.py diff --git a/src/pynwb/ndx_fl_novela/header_device.py b/src/pynwb/ndx_franklab_novela/header_device.py similarity index 100% rename from src/pynwb/ndx_fl_novela/header_device.py rename to src/pynwb/ndx_franklab_novela/header_device.py diff --git a/src/pynwb/ndx_fl_novela/nwb_electrode_group.py b/src/pynwb/ndx_franklab_novela/nwb_electrode_group.py similarity index 100% rename from src/pynwb/ndx_fl_novela/nwb_electrode_group.py rename to src/pynwb/ndx_franklab_novela/nwb_electrode_group.py diff --git a/src/pynwb/ndx_fl_novela/probe.py b/src/pynwb/ndx_franklab_novela/probe.py similarity index 100% rename from src/pynwb/ndx_fl_novela/probe.py rename to src/pynwb/ndx_franklab_novela/probe.py diff --git a/src/pynwb/ndx_fl_novela/spec/ndx-franklab-novela.extensions.yaml b/src/pynwb/ndx_franklab_novela/spec/ndx-franklab-novela.extensions.yaml similarity index 100% rename from src/pynwb/ndx_fl_novela/spec/ndx-franklab-novela.extensions.yaml rename to src/pynwb/ndx_franklab_novela/spec/ndx-franklab-novela.extensions.yaml diff --git a/src/pynwb/ndx_fl_novela/spec/ndx-franklab-novela.namespace.yaml b/src/pynwb/ndx_franklab_novela/spec/ndx-franklab-novela.namespace.yaml similarity index 100% rename from src/pynwb/ndx_fl_novela/spec/ndx-franklab-novela.namespace.yaml rename to src/pynwb/ndx_franklab_novela/spec/ndx-franklab-novela.namespace.yaml