dclab 0.62.7__tar.gz → 0.62.8__tar.gz

{dclab-0.62.7 → dclab-0.62.8}/CHANGELOG

@@ -1,3 +1,6 @@
+0.62.8
+ - fix: metadata of tables not copied by `copier.py`
+ - docs: formatting typo (#270)
 0.62.7
  - fix: IntegrityChecker must not load basins
  - fix: KeyError in IntegrityChecker when "basin_events" group missing (#268)

{dclab-0.62.7 → dclab-0.62.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dclab
-Version: 0.62.7
+Version: 0.62.8
 Summary: Library for real-time deformability cytometry (RT-DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maik Herbig, Maximilian Schlögel, Nadia Sbaa, Paul Müller, Philipp Rosendahl, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>

{dclab-0.62.7 → dclab-0.62.8}/dclab/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.62.7'
-__version_tuple__ = version_tuple = (0, 62, 7)
+__version__ = version = '0.62.8'
+__version_tuple__ = version_tuple = (0, 62, 8)

{dclab-0.62.7 → dclab-0.62.8}/dclab/rtdc_dataset/copier.py

@@ -47,8 +47,7 @@ def rtdc_copy(src_h5file: h5py.Group,
         Add this prefix to the name of the logs and tables in `dst_h5file`.
     """
     # metadata
-    for akey in src_h5file.attrs:
-        dst_h5file.attrs[akey] = src_h5file.attrs[akey]
+    dst_h5file.attrs.update(src_h5file.attrs)
 
     # events in source file
     if "events" in src_h5file:
@@ -84,11 +83,12 @@ def rtdc_copy(src_h5file: h5py.Group,
             #           dst_loc=dst_h5file["tables"],
             #           dst_name=meta_prefix + tkey,
             #           recursive=False)
-            dst_h5file["tables"].create_dataset(
+            copy_table = dst_h5file["tables"].create_dataset(
                 name=tkey,
                 data=src_h5file["tables"][tkey][:],
                 fletcher32=True,
                 **hdf5plugin.Zstd(clevel=5))
+            copy_table.attrs.update(src_h5file["tables"][tkey].attrs)
 
     # events
     if isinstance(features, list):
@@ -303,8 +303,7 @@ def h5ds_copy(src_loc, src_name, dst_loc, dst_name=None,
                 for chunk in src.iter_chunks():
                     dst[chunk] = src[chunk]
             # Also write all the attributes
-            for key in src.attrs:
-                dst.attrs[key] = src.attrs[key]
+            dst.attrs.update(src.attrs)
         else:
             # Copy the Dataset to the destination as-is.
             h5py.h5o.copy(src_loc=src_loc.id,

{dclab-0.62.7 → dclab-0.62.8}/dclab/rtdc_dataset/export.py

@@ -224,6 +224,7 @@ class Export(object):
         skip_checks: bool
             Disable checking whether all features have the same length.
 
+
         .. versionchanged:: 0.58.0
 
            The ``basins`` keyword argument was added, and it is now possible

{dclab-0.62.7 → dclab-0.62.8}/dclab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dclab
-Version: 0.62.7
+Version: 0.62.8
 Summary: Library for real-time deformability cytometry (RT-DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maik Herbig, Maximilian Schlögel, Nadia Sbaa, Paul Müller, Philipp Rosendahl, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>

{dclab-0.62.7 → dclab-0.62.8}/tests/test_rtdc_copier.py

@@ -433,6 +433,11 @@ def test_copy_tables_hdf5_issue_3214():
         rtdc_copy(src_h5file=h5,
                   dst_h5file=hc)
 
+    # Also make sure metadata are copied
+    with h5py.File(path_copy) as hc:
+        assert hc["tables"]["cytoshot_monitor"].attrs["COLOR_shift"]\
+               == "#0e8f69"
+
 
 def test_copy_with_compression():
     path = retrieve_data("fmt-hdf5_image-bg_2020.zip")