Merge pull request #532 from jgrewe/bitsandpieces

addresses a few issues

Author: mpsonntag

nixio/entity.py

@@ -21,11 +21,12 @@ def __init__(self, nixfile, nixparent, h5group):
     @classmethod
     def create_new(cls, nixfile, nixparent, h5parent, name=None, type_=None):
         if name and type_:
-            util.check_entity_name_and_type(name, type_)
             id_ = util.create_id()
-        else:
+        if not name:
             name = util.create_id()
             id_ = name
+        util.check_entity_name_and_type(name, type_)
+
         h5group = h5parent.open_group(name)
         h5group.set_attr("name", name)
         h5group.set_attr("type", type_)

nixio/file.py

@@ -419,7 +419,7 @@ def create_block(self, name="", type_="", compression=Compression.Auto,
             return self.blocks[entity_id]
 
         if name in self._data:
-            raise ValueError("Block with the given name already exists!")
+            raise DuplicateName("Block with the given name already exists!")
         if compression == Compression.Auto:
             compression = self._compr
         block = Block.create_new(self, self._data, name, type_, compression)

nixio/info.json

@@ -1,9 +1,9 @@
 {
-    "VERSION": "1.5.1",
+    "VERSION": "1.5.2",
     "STATUS": "Release",
-    "RELEASE": "1.5.1 Release",
+    "RELEASE": "1.5.2 Release",
     "AUTHOR": "Christian Kellner, Adrian Stoewer, Andrey Sobolev, Jan Grewe, Balint Morvai, Achilleas Koutsou",
-    "COPYRIGHT": "2014-2020, German Neuroinformatics Node, Christian Kellner, Adrian Stoewer, Andrey Sobolev, Jan Grewe, Balint Morvai, Achilleas Koutsou",
+    "COPYRIGHT": "2014-2021, German Neuroinformatics Node, Christian Kellner, Adrian Stoewer, Andrey Sobolev, Jan Grewe, Balint Morvai, Achilleas Koutsou",
     "CONTACT": "[email protected]",
     "BRIEF": "Python reimplementation of NIXIO (http://g-node.github.io/nix/)",
     "HOMEPAGE": "https://github.com/G-Node/nixpy"

nixio/test/test_file.py

@@ -7,14 +7,15 @@
 # modification, are permitted under the terms of the BSD License. See
 # LICENSE file in the root of the Project.
 import os
-import unittest
+import time
 import h5py
+import unittest
 import numpy as np
-import time
 
 import nixio as nix
 import nixio.file as filepy
-from nixio.exceptions import InvalidFile
+from nixio.exceptions import InvalidFile, DuplicateName
+
 from .tmp import TempDir
 
 
@@ -47,7 +48,8 @@ def test_file_blocks(self):
         assert len(self.file.blocks) == 0
 
         block = self.file.create_block("test block", "recordingsession")
-
+        with self.assertRaises(DuplicateName):
+            self.file.create_block("test block", "recordingsession")
         assert len(self.file.blocks) == 1
 
         assert block in self.file.blocks
@@ -61,6 +63,13 @@ def test_file_blocks(self):
 
         assert len(self.file.blocks) == 0
 
+        with self.assertRaises(ValueError):
+            self.file.create_block()
+            self.file.create_block(name="a name")
+
+        b = self.file.create_block(type_="type_a")
+        assert b.id == b.name
+
     def test_file_sections(self):
         assert len(self.file.sections) == 0
 

setup.py

@@ -6,6 +6,8 @@
 
 __author__ = 'Christian Kellner, Achilleas Koutsou'
 
+if sys.version_info.major < 3 or (sys.version_info.major > 2 and sys.version_info.minor < 6):
+    sys.exit('Sorry, nixio requires python >= 3.6!')
 
 with open('README.rst') as f:
     description_text = f.read()
@@ -72,6 +74,7 @@ def get_wheel_data():
     license='BSD',
     packages=packages,
     scripts=[],
+    python_requires=">=3.6",
     tests_require=['pytest', 'scipy', 'pillow', 'matplotlib'],
     test_suite='pytest',
     setup_requires=['pytest-runner'],