dclab 0.62.13__cp312-cp312-win_amd64.whl → 0.62.15__cp312-cp312-win_amd64.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,7 +1,7 @@
 dclab/__init__.py,sha256=7_y6YtYcoL_a5M6Q9PiwZPzHSxS66yCTgs_uuK5C1dg,835
-dclab/_version.py,sha256=gpxuOmFXpEzKpKMUV-POrx0oECeyfYkEMyMPr4WO0mg,431
+dclab/_version.py,sha256=UqENklpXq1tqMo3QqqPtfbsZo35OhFGTh9sBGMVTA38,536
 dclab/cached.py,sha256=t01BYTf43VEsBYa0c-bMxgceF5vKoGV73b42UlLH6Lo,3014
-dclab/downsampling.cp312-win_amd64.pyd,sha256=TAMOaxiUZqFRaGGRduKiasfu8ce1ZLriiwqqh-fPoa4,186368
+dclab/downsampling.cp312-win_amd64.pyd,sha256=l5n2CJlLJebvQUex0xwtxNu_NBXTbyJvH-WK2XC_-pI,186368
 dclab/downsampling.pyx,sha256=Ez6MbNbzCUzs2IXXKtAYsjtYqP22kI8hdA1IE-3mqvY,7488
 dclab/http_utils.py,sha256=nneq9Cx8dw8ChQx5oIg2pN0xGkvNWCMSY5VYmttqyXA,11232
 dclab/kde_contours.py,sha256=k0Y1UsJNtuYY8iqYmfQ-Nml-dFpJAcigd3vmt9U6zsY,6967
@@ -35,14 +35,14 @@ dclab/external/packaging/version.py,sha256=NgEgv7me4UCvFMyiNYD-nc_28b9UHUvBVh8RD
 dclab/external/skimage/LICENSE,sha256=Tdv08zzxYV32WRdYnco9P3nVyS5w17OTxIAFeRSd1wc,1480
 dclab/external/skimage/__init__.py,sha256=icOIlThkyn_hxmnM_i7OpbU7fhvqYWNpGdNGD38qthU,74
 dclab/external/skimage/_find_contours.py,sha256=auRMNfZg7B73DX7kPXxgD8gMXXB3Lk9QDWt4wlQnUWg,9556
-dclab/external/skimage/_find_contours_cy.cp312-win_amd64.pyd,sha256=2qa46znIgw4-jyvWAmVOK_MSQVnBLDa2NpZdaoQu3Tw,146432
+dclab/external/skimage/_find_contours_cy.cp312-win_amd64.pyd,sha256=K7XU-RXWvD2bypQuWnWk1VJsJVdYyFoubAjpzev2hJo,146432
 dclab/external/skimage/_find_contours_cy.pyx,sha256=c-EobLhKjZNCpuqWxmvrcH35uAY_Bu-_hZiUHbXODms,7349
-dclab/external/skimage/_pnpoly.cp312-win_amd64.pyd,sha256=y1_Wu_crcaN7Cc-cZ2SSFBALs-FU3jIay_3Mk2buDKg,160768
+dclab/external/skimage/_pnpoly.cp312-win_amd64.pyd,sha256=nPE2kb9pvtO39VDk67TMS0_vxYJ2rtZl6Oz7FPVSBF0,160768
 dclab/external/skimage/_pnpoly.pyx,sha256=eHV3DlIGcBhAQ12-Y58EYq8xcq0Sibyc4xTxzX9NJsk,2603
 dclab/external/skimage/measure.py,sha256=rzyI0HCr9O9GJNieVW8pcqDjTGRAdSehDUawD8QkIAE,254
 dclab/external/skimage/pnpoly.py,sha256=zB4rSxjHJyY1OsGZ7QfFQqxIEDLGK8CWPehwutoFqm4,1400
 dclab/external/skimage/_shared/__init__.py,sha256=q29esTsNh0HfQxcd2EuwdYNbEBJwo_qY4dfv7RihzoA,38
-dclab/external/skimage/_shared/geometry.cp312-win_amd64.pyd,sha256=_OpOWe-Xk28bCGk6iZIlDYPXznHyRGLBawhmV2jhnmg,21504
+dclab/external/skimage/_shared/geometry.cp312-win_amd64.pyd,sha256=CwIAvQntog3rQ4MkIrUhxDOK1vQLGjnoXlZQpTlp-SY,21504
 dclab/external/skimage/_shared/geometry.pxd,sha256=3gJ7fbXXsxJunSN4biE0dzEbZpX9ZqzR4cUDDN0JnAU,352
 dclab/external/skimage/_shared/geometry.pyx,sha256=b6hADE8chse63haO1Kdt13_oQ54J9tkBf7dVA22-s-M,1722
 dclab/external/statsmodels/LICENSE,sha256=8D7nwukc6YgsZCdN9mG0psM3I9j-z8fuUgFyVhnMXpU,1672
@@ -91,8 +91,9 @@ dclab/rtdc_dataset/filter.py,sha256=IRaEUt0tWtZGLKYvtqzfYO2kN5yhqx9eLoHd3VOLCTE,
 dclab/rtdc_dataset/fmt_dict.py,sha256=-tlzOwsOCh4Vt3rSiBUvMKW7vBgrRNubU7ZHdGMB3gE,3112
 dclab/rtdc_dataset/fmt_http.py,sha256=XzcgvJ4lm-eWbveBraBc5PPJeGWeUGC35p8ptnxBycc,3476
 dclab/rtdc_dataset/fmt_s3.py,sha256=35ZNCSbfpn75QHqrciMur2MUAiViddCAZsXkzql6uv0,10962
-dclab/rtdc_dataset/load.py,sha256=IKRtlZbHGAHNCNaZQPRXFxJjnnMH5HXnhNuIwqYmHzo,2545
-dclab/rtdc_dataset/writer.py,sha256=IWD4hepdcF-x0fTe_90WQuOu0XEZ4UQ2kcPhWg05xI4,42157
+dclab/rtdc_dataset/load.py,sha256=odD0ZfIHBkBLgHIKv6z5PJ6yvTEfSawC3OKeRSjk_YU,2838
+dclab/rtdc_dataset/meta_table.py,sha256=srz1mq-oS3OoL-qRScvWX98smNNVXLF99zpTO3GlvwI,673
+dclab/rtdc_dataset/writer.py,sha256=OluhJGoAk-oRc5Z4BzvMvQI1NGlgCTVLwvWCaFPvr_k,42410
 dclab/rtdc_dataset/feat_anc_core/__init__.py,sha256=j7vtbQGJid3hchXryo19cxnwanepdDQ_RuJVf740mZs,488
 dclab/rtdc_dataset/feat_anc_core/af_basic.py,sha256=7pM6Gn1ZkuttHNfkaLijPudddAu0jMDPGJS9HzKh8rE,2268
 dclab/rtdc_dataset/feat_anc_core/af_emodulus.py,sha256=lsJpQ409EsxnMtyhO7igquWnJxIhXz_w9f8vtIq7F1M,6830
@@ -109,14 +110,14 @@ dclab/rtdc_dataset/fmt_dcor/api.py,sha256=v7xAxZtjPpQiSRq9AgYhrV6I9iM7KpPv38WzSE
 dclab/rtdc_dataset/fmt_dcor/base.py,sha256=i9VWbKtPlY3K1WeFll3iAKXEhznVvJjQE1jVaEM2c9g,6788
 dclab/rtdc_dataset/fmt_dcor/basin.py,sha256=JzofdU45r-TTBGl8Nnvo-j-YsnT23X2gXnvaOSINJxg,2599
 dclab/rtdc_dataset/fmt_dcor/logs.py,sha256=e1BiJ8we4IghbxVAZM56K4P4IjJDHIBfHH_Uz-p2w9g,609
-dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=Q2HGOZDYmy922HMca-ZiwYeMeES0rxDWT6YcKaR8NYo,1699
+dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=K-3HQ5L0TWvowBDO3emvtLF4CwBrhv-i-WX7RYmFiVU,1748
 dclab/rtdc_dataset/fmt_hdf5/__init__.py,sha256=UnitCqiMkY8mMcUKgfLBRVBP5srpTNLrZd3BIRr2tZE,276
 dclab/rtdc_dataset/fmt_hdf5/base.py,sha256=CAcYaN_6X10NK-R1IvlJj6y70lNyAVyT0OnGMs4VMB4,6583
 dclab/rtdc_dataset/fmt_hdf5/basin.py,sha256=qbYgj0RKS9k6RTu5XmYEtgdcbqnVNokD3rAxogyrWrU,822
 dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=6u2K86vqxd4qWaYk_hzRA5LMQRrduNvMxmloWWt4aMc,8488
 dclab/rtdc_dataset/fmt_hdf5/feat_defect.py,sha256=w7dfs6pULUVJ8Ypz2VBYIKokKVhCn6as6fn3GL8Z7s0,6704
 dclab/rtdc_dataset/fmt_hdf5/logs.py,sha256=c33YLC70h7RR4uw-RPc-vvTPTMZgSfd_0Nz9pAeA6d4,1037
-dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=hV2Ke7pEXQEV6iNO-PtD7pcr4JYqzX8AlzVmpkGR2l4,1562
+dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=AK5PpB_UDO4ovJSAGsve2YfKBbMkhntRqjC47zVtDKM,1613
 dclab/rtdc_dataset/fmt_hierarchy/__init__.py,sha256=NB8Tz6-AquG0rAiCeCSQGIzw_W1y7mNz4V4MI-yaEJ0,366
 dclab/rtdc_dataset/fmt_hierarchy/base.py,sha256=OivbnWpU9yNVoNJ6wcY8IFyTNTSAzm-lJa8gtz4GUK0,9718
 dclab/rtdc_dataset/fmt_hierarchy/events.py,sha256=36aIw3wyOLi6uPGUO4gG6DhLzJHFiwXTh-2bJjSqMmI,4693
@@ -129,9 +130,9 @@ dclab/rtdc_dataset/fmt_tdms/event_mask.py,sha256=cW-Tw2PIe6X1Hc4UZJ22-mI_qFaIMWA
 dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=ktWnXfMir1v5Wfeo7tOd0txSOe1bgsXotf9Ul5T5-B4,5361
 dclab/rtdc_dataset/fmt_tdms/exc.py,sha256=FfxUY4LGIMPGJTYmGITmEm7X5iu8GBsj7OfZR8Zb-IE,850
 dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=SFeWiwIN7sg0qNe0Aya2bZshN1Zbw4YcOKunZ6kfIGM,5524
-dclab-0.62.13.dist-info/LICENSE,sha256=ayjnuJcdf_kpkDyD61tUcVqVAQaNSYXJ73m5HVB4G8s,18474
-dclab-0.62.13.dist-info/METADATA,sha256=EjBFU1z3Ha7HKm4HZwqUM0K85vMSYWSMKixqpB_robE,4901
-dclab-0.62.13.dist-info/WHEEL,sha256=cRmSBGD-cl98KkuHMNqv9Ac9L9_VqTvcBYwpIvxN0cg,101
-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/RECORD,,
+dclab-0.62.15.dist-info/LICENSE,sha256=ayjnuJcdf_kpkDyD61tUcVqVAQaNSYXJ73m5HVB4G8s,18474
+dclab-0.62.15.dist-info/METADATA,sha256=_6rvXhpQW8zetFH17pOc3Eq_IzrkMRmOaWv6LGJEjKY,4901
+dclab-0.62.15.dist-info/WHEEL,sha256=GNSMLKsI4JcODC8iIUwfCC2mP5aj3pHj8CNqlVH-mAI,101
+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/RECORD,,

{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: cp312-cp312-win_amd64