Merge pull request #66 from pycroscopy/gerd-sidpy.11.1

Gerd sidpy.11.1
pycroscopy · Dec 17, 2022 · a239944 · a239944
2 parents f23aaac + 24d867c
commit a239944
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/pyNSID/__version__.py b/pyNSID/__version__.py
@@ -1,2 +1,2 @@
-version = '0.0.5'
-time = '2022-12-02 16:55:25'
+version = '0.0.6'
+time = '2022-12-16 16:55:25'
diff --git a/pyNSID/io/hdf_utils.py b/pyNSID/io/hdf_utils.py
@@ -73,7 +73,9 @@ def read_h5py_dataset(dset):
         raise TypeError('can only read NSID datasets, not general one, try to import with from_array')
 
     # create vanilla dask array
-    dataset = Dataset.from_array(np.array(dset))
+    data_array = np.empty(dset.shape)
+    dset.read_direct(data_array)
+    dataset = Dataset.from_array(data_array)
 
     if 'title' in dset.attrs:
         dataset.title = dset.attrs['title']

diff --git a/setup.py b/setup.py
@@ -35,10 +35,10 @@
         'Operating System :: OS Independent',
         'Programming Language :: Cython',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Scientific/Engineering :: Information Analysis'],
     keywords=['imaging', 'spectra', 'multidimensional', 'data format',