[numpy] fix

G-Node · Jul 25, 2024 · 19adadf · 19adadf
1 parent a991dd3
commit 19adadf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nixio/block.py b/nixio/block.py
@@ -347,7 +347,7 @@ def create_data_frame(self, name="", type_="", col_dict=None,
         if col_dict is not None:
             for nam, dt in col_dict.items():
                 if isclass(dt):
-                    if issubclass(dt, str) or issubclass(dt, np.string_):
+                    if issubclass(dt, (str, np.bytes_)):
                         col_dict[nam] = util.vlen_str_dtype
                 if 'U' in str(dt) or dt == np.bytes_:
                     col_dict[nam] = util.vlen_str_dtype

diff --git a/setup.py b/setup.py
@@ -78,7 +78,7 @@ def get_wheel_data():
     tests_require=['pytest', 'scipy', 'pillow', 'matplotlib'],
     test_suite='pytest',
     setup_requires=['pytest-runner'],
-    install_requires=['numpy<2.0', 'h5py', 'six', 'enum34;python_version<"3.4"'],
+    install_requires=['numpy', 'h5py', 'six', 'enum34;python_version<"3.4"'],
     package_data={'nixio': [license_text, description_text]},
     include_package_data=True,
     zip_safe=False,