Merge branch 'release/v0.3.5'

Author: t-sommer

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.3.5 (2020-10-16)
+
+Don't use library depricated functions (#3)
+
 ## v0.3.4 (2019-02-14)
 
 Apply sign when reading time series from Dymola result files (.mat)

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, Dassault Systemes.
+Copyright (c) 2020, Dassault Systemes.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.rst

@@ -72,7 +72,7 @@ Get the scale for the first dimension:
 
 -----------------------------
 
-|copyright| 2019 |Dassault Systemes|
+|copyright| 2020 |Dassault Systemes|
 
 .. _SDF specification: https://github.com/ScientificDataFormat/SDF
 .. _HDF5: https://www.hdfgroup.org/hdf5/

sdf/__init__.py

@@ -7,7 +7,7 @@
 
 from . import hdf5
 
-__version__ = '0.3.4'
+__version__ = '0.3.5'
 
 _object_name_pattern = re.compile('[a-zA-Z][a-zA-Z0-9_]*')
 
@@ -157,10 +157,11 @@ def _validate_group(group, is_root=False):
 
 
 def _validate_dataset(ds):
+
     if not type(ds.data) is np.ndarray:
         return ['Dataset.data must be a numpy.ndarray']
 
-    elif np.alen(ds.data) < 1:
+    elif ds.data.size < 1:
         return ['Dataset.data must not be empty']
 
     elif not np.issubdtype(ds.data.dtype, np.float64):

sdf/hdf5.py

@@ -62,7 +62,7 @@ def save(filename, group):
                     dimname = s._display_name
                     if dimname is None:
                         dimname = ''
-                    h5ds.dims.create_scale(h5s, _str(dimname))
+                    h5s.make_scale(_str(dimname))
                     h5ds.dims[i].attach_scale(h5s)
                 else:
                     print("Cannot attach scale for '" + h5ds.name +
@@ -101,7 +101,7 @@ def _create_dataset(dsobj, datasets):
     """ Create a dataset from an h5py dataset """
 
     _, name = os.path.split(dsobj.name)
-    ds = sdf.Dataset(name, data=dsobj.value)
+    ds = sdf.Dataset(name, data=dsobj[()])
 
     for attr in dsobj.attrs:
         if attr == 'COMMENT':

setup.py

@@ -11,7 +11,7 @@ def readme():
 
 
 setup(name='SDF',
-      version='0.3.4',
+      version='0.3.5',
       description="Work with Scientific Data Format files in Python",
       long_description=readme(),
       url="https://github.com/ScientificDataFormat/SDF-Python",