Merge pull request #61 from NovelaNeuro/user/wmerynda/ndx_new_release

new release requirements changes
NovelaNeuro · Jul 30, 2020 · 88be391 · 88be391
2 parents 0ad6a3f + 818215e
commit 88be391
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -23,7 +23,7 @@
 
 # The short X.Y version
 
-version = '0.0.010.36'
+version = '0.0.011.36'
 
 
 # The full version, including alpha/beta/rc tags

diff --git a/environment.yml b/environment.yml
@@ -7,8 +7,8 @@ dependencies:
   - python=3.6
   - python-dateutil
   - setuptools
-  - hdmf==1.6.1
-  - pynwb==1.3.0
+  - hdmf==1.6.4
+  - pynwb==1.3.3
   - pytest
 
 

diff --git a/meta.yaml b/meta.yaml
@@ -14,13 +14,13 @@ requirements:
   build:
     - python==3.6
     - setuptools
-    - hdmf==1.6.1
+    - hdmf==1.6.4
     - python-dateutil
-    - pynwb==1.3.0
+    - pynwb==1.3.3
   run:
     - python>=3.6,<3.7
     - python-dateutil
-    - hdmf==1.6.1
-    - pynwb==1.3.0
+    - hdmf==1.6.4
+    - pynwb==1.3.3
     - pytest
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 hdmf_docutils
-hdmf==1.6.1
+hdmf==1.6.4
 pynwb
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-version = "0.0.010.36"
+version = "0.0.011.36"
 print(version)
 
 import os
@@ -33,8 +33,8 @@
     'url': '',
     'license': 'BSD 3-Clause',
     'install_requires': [
-        'hdmf==1.6.1',
-        'pynwb==1.3.0'
+        'hdmf==1.6.4',
+        'pynwb==1.3.3'
     ],
     'packages': find_packages('src/pynwb'),
     'package_dir': {'': 'src/pynwb'},

diff --git a/spec/ndx-franklab-novela.namespace.yaml b/spec/ndx-franklab-novela.namespace.yaml
@@ -14,5 +14,5 @@ namespaces:
     - ImageSeries
   - source: ndx-franklab-novela.extensions.yaml
 
-  version: 0.0.010.36
+  version: 0.0.011.36
 
diff --git a/src/pynwb/ndx_franklab_novela/camera_device.py b/src/pynwb/ndx_franklab_novela/camera_device.py
@@ -7,7 +7,7 @@
 class CameraDevice(Device):
     """Represented as CameraDevice in NWB"""
 
-    __nwbfields__ = ('meters_per_pixel', 'camera_name', 'model', 'lens', 'manufacturer')
+    __nwbfields__ = ('meters_per_pixel', 'camera_name', 'model', 'lens')
 
     @docval(*get_docval(Device.__init__) + (
             {'name': 'meters_per_pixel', 'type': float, 'doc': 'meters per pixel'},
@@ -18,12 +18,12 @@ class CameraDevice(Device):
     def __init__(self, **kwargs):
         super().__init__(**{kwargs_item: kwargs[kwargs_item]
                             for kwargs_item in kwargs.copy()
-                            if kwargs_item not in ['meters_per_pixel', 'camera_name', 'model', 'lens', 'manufacturer']
+                            if kwargs_item not in ['meters_per_pixel', 'camera_name', 'model', 'lens']
                             })
         call_docval_func(super(CameraDevice, self).__init__, kwargs)
         self.meters_per_pixel = kwargs['meters_per_pixel']
         self.camera_name = kwargs['camera_name']
         self.model = kwargs['model']
         self.lens = kwargs['lens']
-        self.manufacturer = kwargs['manufacturer']
+
 
diff --git a/src/pynwb/ndx_franklab_novela/spec/ndx-franklab-novela.namespace.yaml b/src/pynwb/ndx_franklab_novela/spec/ndx-franklab-novela.namespace.yaml
@@ -14,5 +14,5 @@ namespaces:
     - ImageSeries
   - source: ndx-franklab-novela.extensions.yaml
 
-  version: 0.0.010.36
+  version: 0.0.011.36
 
diff --git a/src/spec/create_extension_spec.py b/src/spec/create_extension_spec.py
@@ -11,7 +11,7 @@ def main():
         doc="""NovelaNeurotechnologies Namespaces""",
         name="""ndx-franklab-novela""",
 
-        version="""0.0.010.36""",
+        version="""0.0.011.36""",
 
         author=list(map(str.strip, """NovelaDevops""".split(','))),
         contact=list(map(str.strip, """[email protected]""".split(',')))