dclab 0.62.13__cp39-cp39-macosx_11_0_arm64.whl → 0.62.15__cp39-cp39-macosx_11_0_arm64.whl

dclab/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.62.13'
-__version_tuple__ = version_tuple = (0, 62, 13)
+__version__ = version = '0.62.15'
+__version_tuple__ = version_tuple = (0, 62, 15)

dclab/rtdc_dataset/fmt_dcor/tables.py

@@ -1,5 +1,7 @@
 import numpy as np
 
+from ..meta_table import MetaTable
+
 
 class DCORTables:
     def __init__(self, api):
@@ -35,7 +37,7 @@ class DCORTables:
         return self._tables_cache
 
 
-class DCORTable:
+class DCORTable(MetaTable):
     def __init__(self, table_content):
         self._columns, data = table_content
         self._tab_data = np.asarray(data)

dclab/rtdc_dataset/fmt_hdf5/tables.py

@@ -1,3 +1,6 @@
+from ..meta_table import MetaTable
+
+
 class H5Tables:
     def __init__(self, h5):
         self.h5file = h5
@@ -30,7 +33,7 @@ class H5Tables:
         return self._cache_keys
 
 
-class H5Table:
+class H5Table(MetaTable):
     def __init__(self, h5_ds):
         self._h5_ds = h5_ds
         self._keys = None

dclab/rtdc_dataset/load.py

@@ -61,6 +61,11 @@ def new_dataset(data, identifier=None, **kwargs):
         return fmt_hierarchy.RTDC_Hierarchy(data, identifier=identifier,
                                             **kwargs)
     elif isinstance(data, (pathlib.Path, str)):
+        # If we are given a `file:` specifier, remove it. We might be
+        # looking at a network share (not mounted as a drive) on Windows
+        # (e.g. "file:\\127.0.0.1\shared\data.rtdc").
+        if isinstance(data, str) and data.startswith("file:"):
+            data = data[5:]
         path = pathlib.Path(data).resolve()
         if not path.exists():
             raise FileNotFoundError(

dclab/rtdc_dataset/meta_table.py

@@ -0,0 +1,25 @@
+import abc
+
+
+class MetaTable(abc.ABC):
+    @abc.abstractmethod
+    def __array__(self, *args, **kwargs):
+        """Return array representation of the table"""
+
+    @property
+    @abc.abstractmethod
+    def meta(self):
+        """Return metadata of the table (e.g. graph colors)"""
+
+    @abc.abstractmethod
+    def has_graphs(self):
+        """Return True when the table has key-based graphs"""
+
+    @abc.abstractmethod
+    def keys(self):
+        """Return keys of the graphs, None if `not self.has_graphs()`"""
+
+    @abc.abstractmethod
+    def __getitem__(self, key):
+        """Return a graph or otherwise part of the data array"""
+        pass

dclab/rtdc_dataset/writer.py

@@ -17,6 +17,7 @@ from ..util import hashobj
 from .._version import version
 
 from .feat_anc_plugin import PlugInFeature
+from .meta_table import MetaTable
 
 #: DEPRECATED (use `CHUNK_SIZE_BYTES` instead)
 CHUNK_SIZE = 100
@@ -641,6 +642,12 @@ class RTDCWriter:
         if h5_attrs is None:
             h5_attrs = {}
 
+        # Convert MetaTable to numpy data
+        if isinstance(cmp_array, MetaTable):
+            h5_attrs.update(cmp_array.meta)
+            cmp_array = cmp_array.__array__()
+
+        # Handle individual cases
         if isinstance(cmp_array, np.recarray):
             # A table is a compound array (np.recarray). If we are here,
             # this means that the user passed an instance of np.recarray.

{dclab-0.62.13.dist-info → dclab-0.62.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dclab
-Version: 0.62.13
+Version: 0.62.15
 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.13.dist-info → dclab-0.62.15.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dclab/kde_methods.py,sha256=awlqkj819VRJzArG6Fx6myDa6qGpLoZ8S9IJ1J1YECA,9206
-dclab/_version.py,sha256=BStrLKf1_ahS_0f5AwaERVLxxQT0VoDKL1AD-6iDlyw,415
+dclab/_version.py,sha256=iL17I1mvKxwKGDb54cuTitpqpEsosMLPkBeojJpE4PE,515
 dclab/util.py,sha256=nLL5jwG14h1YFJ_d0L-5DwsWgyfst5hVndaiLbTkYH4,5253
 dclab/downsampling.pyx,sha256=OK7zbgGLl5gVyoU8ZBHo9EWwb8C9ChavmLNEvQvC9T0,7258
 dclab/__init__.py,sha256=1mskJAUo8HbvDhJRJFbcFB6HccFeqoRUCEHLuS64t_g,812
@@ -7,7 +7,7 @@ dclab/warn.py,sha256=MjJvyQeuvIXFQ2-fHDzbmXJ0scnHqqRJlIxfuLI_utE,523
 dclab/cached.py,sha256=eWTYBiI-HQM7JuPH-oxa5LLnhAX32GpRwlYg2kQ3sTA,2917
 dclab/http_utils.py,sha256=YtZHEwB-BBBo2fCvwhlJvlnWvfWFMHclqol3OIJ7atM,10910
 dclab/polygon_filter.py,sha256=qexmo-rXe06CUPZhN6EMJy4y4B5gXZeqejdvIB2arOE,13480
-dclab/downsampling.cpython-39-darwin.so,sha256=LTkt5LPedBGKrxk1v8c-Qa46Qn5J6aoluAkmeKWSHPk,258416
+dclab/downsampling.cpython-39-darwin.so,sha256=GqZ3UwpWP_36saQk9TIZbTafxUNAfoVELQU1dxbsTCc,258416
 dclab/statistics.py,sha256=tJDqPlY_Jw2Hhl-s7ugMBSZAxcRuPu4LQuBAZBXz7t8,6355
 dclab/kde_contours.py,sha256=5K7PzZz-FtSGvW4IR2tLpbEKKqCSsSTQPsupu7zIsPg,6745
 dclab/isoelastics/iso_LE-2D-FEM-19-volume-deform.txt,sha256=vTcazOlOXo3BQ0NQtGB_IdHKA0neOLXZ_d3JuMU--RE,83358
@@ -61,17 +61,17 @@ dclab/external/statsmodels/nonparametric/kernel_density.py,sha256=3UyzLuZS68TkNT
 dclab/external/statsmodels/nonparametric/__init__.py,sha256=-GEWgwsF27ems5WTBvR1zo4SWJ0pRTWyHVagnIYer3g,43
 dclab/external/statsmodels/nonparametric/kernels.py,sha256=fuy4kStFz2ZA9pqgfUb4cly-YBpXLu4TJ9-ZujayuIw,1075
 dclab/external/skimage/measure.py,sha256=y1idCqD9TUxp3-QnOiWR_d674OKaeqBJ4MN2-gVP6ro,247
-dclab/external/skimage/_find_contours_cy.cpython-39-darwin.so,sha256=mbOmCRBSfpcHXrN5Lh39sB_hrTz5h_Q3_OQnvsYByQw,204152
+dclab/external/skimage/_find_contours_cy.cpython-39-darwin.so,sha256=qNRisiOSIs4jecnqR6WgF6p3CuAPJNM0c7m-8RECIWM,204152
 dclab/external/skimage/LICENSE,sha256=ivsSBvn3c0R9mOctWRRdza7C7wdZSRYgCVxlVqUdlB8,1452
 dclab/external/skimage/pnpoly.py,sha256=r8hFNiTz5XlUoNZjosqA0iyv1FPn0l7ewbplgFgkdaw,1347
 dclab/external/skimage/_find_contours.py,sha256=16v5eeTZBmevG8SSuXtJ6yUpVPhwfSmtc8pDD0nuuOU,9340
 dclab/external/skimage/__init__.py,sha256=-B2QUKHAFzQuBWuuKvPDC5JIl0Zb-x3OGmbwPaE9VwQ,72
 dclab/external/skimage/_pnpoly.pyx,sha256=Qdn6xPazDschBqbr46DzB75MB2MnqvdnoTSBMK7kUGE,2504
 dclab/external/skimage/_find_contours_cy.pyx,sha256=pZJOBhMHzYEMkcz4WQVyjn7jDNrdjCfet47FU1hRAxk,7161
-dclab/external/skimage/_pnpoly.cpython-39-darwin.so,sha256=qEQsmcX7Nrm-NlGAhsv2u4_h5PJsV1amqx00sN7r3HE,221872
+dclab/external/skimage/_pnpoly.cpython-39-darwin.so,sha256=rS0AsrWgVm5-x-20Noxr_w5dgozMBSt5skqWzkDdTAA,221872
 dclab/external/skimage/_shared/geometry.pxd,sha256=kRsu9ifv_rL3kbRIgSLf86p0hn2oTMp6s013lZ9bBZM,346
 dclab/external/skimage/_shared/__init__.py,sha256=2sHZwTtJSlMTa3Q2YSvQW7jrPLMUSqDJQa-ROe5zfcw,37
-dclab/external/skimage/_shared/geometry.cpython-39-darwin.so,sha256=6lWNURQvzQ5Q-0aJiUycA7slfNK9T6H2pW-bcU-4A0U,55872
+dclab/external/skimage/_shared/geometry.cpython-39-darwin.so,sha256=jQvyJI9zKUhFJSWpnAheN_1i8YPzsk-iiLegp9bswIc,55872
 dclab/external/skimage/_shared/geometry.pyx,sha256=miCHUh6mBDbRRIoaF_0xAER1MRzsCAzFdlYQZhV7RmE,1667
 dclab/definitions/feat_logic.py,sha256=SXsSlAusgtE3uXcPu84dQwYZ07zxmV37DmPednA3_dM,5823
 dclab/definitions/meta_parse.py,sha256=YdaTdM8DAMsIFn5ITH9OHYGTXeAOBGWtx22oVjxXcWk,2393
@@ -81,6 +81,7 @@ dclab/definitions/feat_const.py,sha256=3zii5bXN0d0lMtkiI8dR9ivNlNQYosZASAlOg1UKK
 dclab/definitions/meta_logic.py,sha256=wCgb7DPRHaR8DCWw_VbwNkpslUnazzWfgX0iS8oEe90,4194
 dclab/rtdc_dataset/config.py,sha256=MvBteFya3R6Ch3U6UgTakCsJoBgVykTxS_Z25STWPHU,17432
 dclab/rtdc_dataset/check.py,sha256=lJNaz4QTe2WNlxik6zSohRHTiAYuP_bKOzSDjPGTUS0,35006
+dclab/rtdc_dataset/meta_table.py,sha256=ucqBNrgI6rDAuQFuMRckY8lp1LpnYAoRgEsLObWTJCE,648
 dclab/rtdc_dataset/feat_basin.py,sha256=ViKdvJcwFM8joysnrBYdZbA5t_wZix-6xn_FsvzpYsQ,21072
 dclab/rtdc_dataset/fmt_s3.py,sha256=OavOOGa2oOyG-VSfehFf6JVNs2k5iZalRm6ZTBu6sY4,10642
 dclab/rtdc_dataset/feat_temp.py,sha256=XbDIS1iUUkRH0Zp9uVlwvK_untJ7hkOnKshK1Drsnt8,3694
@@ -88,10 +89,10 @@ dclab/rtdc_dataset/__init__.py,sha256=MUHSGVQJ4Zc0IyU2lf01dpDWyOyNveHip-UjSkmPNv
 dclab/rtdc_dataset/core.py,sha256=hho2XD4-s-mag8xtaukf7NC-_XyE8W0dql2wAoGuS3A,37998
 dclab/rtdc_dataset/export.py,sha256=F_HgQUlK9ywINFgYrigPXLxcG-8qgSR5aalHjxNNeMs,29614
 dclab/rtdc_dataset/fmt_dict.py,sha256=gumVQOiVVDFUKow_483PY7cxInqo-NiBBnBhIU8s4lg,3009
-dclab/rtdc_dataset/writer.py,sha256=KVane_1X2fHJCJjLJ6kAWWHxnKOabO2Akb_54ANu1aU,41172
+dclab/rtdc_dataset/writer.py,sha256=jc6ADyxGoujXpoXu1vF2nfZjGFMaO5LbRmoYJZ83JVo,41418
 dclab/rtdc_dataset/filter.py,sha256=AFPUBzOIi3pqXgUdMQ5CIi9ZeGOKC71rfSZKLMLgtog,10023
 dclab/rtdc_dataset/fmt_http.py,sha256=vXVxRLXZp2_V1v3xk4lu4VUHYXfNHJdsRkVt3trC1RU,3374
-dclab/rtdc_dataset/load.py,sha256=wGJuIv7pH1zpBhg6Cj_H0wxHZb-KwHR8TWnyDosCBBA,2473
+dclab/rtdc_dataset/load.py,sha256=5_xGw2P8Mjs0gW-vGr2Kn28j6Qv3BvvMvguMibC_mM4,2761
 dclab/rtdc_dataset/copier.py,sha256=-2ISiOs4ytxN_ttXQGhaepuD2Ppy80G9UlDSZVyEoOU,14175
 dclab/rtdc_dataset/feat_anc_plugin/__init__.py,sha256=Em8nKxzex6M46Q86pRoSdrzb02XBiTY9u-npODvwrwk,119
 dclab/rtdc_dataset/feat_anc_plugin/plugin_feature.py,sha256=ED7vAtHgMXoanbeoUdklDAocj0Pq_cpckmCJ-YWqwr8,12381
@@ -105,7 +106,7 @@ dclab/rtdc_dataset/fmt_hdf5/basin.py,sha256=mJZR92Qoa71EwDVDYAP9KtOcjvRyjtA2wO1D
 dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=JUuPviS4lEXMjfNgJE-jkeArAwUVkdA1bmAszJGjPvc,8231
 dclab/rtdc_dataset/fmt_hdf5/__init__.py,sha256=yWLYK-Fq0EYnp2eYfl1Ze02RBMOWg-iALJWs4dFSxxY,270
 dclab/rtdc_dataset/fmt_hdf5/logs.py,sha256=-mDewfv_aOeHaJykuJIWsqr9a7-moKhoGhqw9cR4ebg,1004
-dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=DFIYoeNiGO0dut-wK1gBX-kuPD603mw_2VbFDtPkDNg,1505
+dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=9Q-9N52BTtOT_9avGObpe71t6MpLAKQDhbJrcETJ4a8,1553
 dclab/rtdc_dataset/fmt_hdf5/base.py,sha256=_PgmDq2K7RGCuhV9J4YZwg9noW1hi2w14ZP8ooRR8Lw,6391
 dclab/rtdc_dataset/feat_anc_core/af_fl_max_ctc.py,sha256=gV3FqM0AoOHzWwhU45e3fvBb2MwGVadLL6piVW0YF1s,3687
 dclab/rtdc_dataset/feat_anc_core/af_image_contour.py,sha256=39jvhzz2GmfXDYXu1d3kie7tpBzUkUL_JTxfau-2mt8,3531
@@ -120,7 +121,7 @@ dclab/rtdc_dataset/fmt_dcor/basin.py,sha256=tQZ4GumqURjS3eppRrSyUq1zBPD0y_8rwznM
 dclab/rtdc_dataset/fmt_dcor/__init__.py,sha256=WjO1uM_Vlof15Y7HkhkV5Xv75q9TDIdOBIuS_I38qps,210
 dclab/rtdc_dataset/fmt_dcor/api.py,sha256=COPRnPfPBcxbQGxHFEbGxp2CjK-Mgnt3cIu20-Zz04M,4245
 dclab/rtdc_dataset/fmt_dcor/logs.py,sha256=1JsMr_4r5j8rkfrrUsiN42_l92GcvDjapYxopZKimnw,583
-dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=FY7AuJ9DEN55nQsCCyAp8ZlqO4hrwP5EDkQOov2OOfk,1635
+dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=NaVEwLKmOg7Mz5iAMe2S8C4xRVC_YO3zeT7g5EbQE1M,1682
 dclab/rtdc_dataset/fmt_dcor/base.py,sha256=wD127W5LvvhkUy8SvFVVwAR6EEYtzgoWJ4booh45rfA,6588
 dclab/rtdc_dataset/fmt_tdms/event_mask.py,sha256=eZiDHAGG3MCVckEMHsV-YBbL-pETVLomGk1gmpjc8-k,2175
 dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=biI9l1EO6BuSYgwZG0deacj4i1fMHQcW78AKXEcm5Wc,5373
@@ -129,9 +130,9 @@ dclab/rtdc_dataset/fmt_tdms/event_image.py,sha256=-jp7Z-N91e4ieumYQ1huMicj7PMJqw
 dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=Vkym0QKSw2mq1XZl5n8wDkgHXmaZwQGiMAV5AuRSJkE,5215
 dclab/rtdc_dataset/fmt_tdms/exc.py,sha256=WzrMqnyrzp8gsT8Pf7JKqGGv43ewx7d_qgtirURppRI,813
 dclab/rtdc_dataset/fmt_tdms/event_contour.py,sha256=kjo0wJx9F0gmmOOyR0NoLw6VEtSl3h63WXXkcbfnoS8,9627
-dclab-0.62.13.dist-info/RECORD,,
-dclab-0.62.13.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
-dclab-0.62.13.dist-info/WHEEL,sha256=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
-dclab-0.62.13.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.13.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.13.dist-info/METADATA,sha256=WtnYmez3PYa8IxgLQu5z2n8IZMbzCLxIctZujrctsaQ,4755
+dclab-0.62.15.dist-info/RECORD,,
+dclab-0.62.15.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
+dclab-0.62.15.dist-info/WHEEL,sha256=jP__Xq8Zheop8oqtsve4LAEkvZvYEAZJ-SbmcizN3MY,107
+dclab-0.62.15.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-0.62.15.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-0.62.15.dist-info/METADATA,sha256=ihsKoitFFbwH2kq8PzX6XULZnGPW6i8OAFqglmyWGh0,4755

{dclab-0.62.13.dist-info → dclab-0.62.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: false
 Tag: cp39-cp39-macosx_11_0_arm64