dclab 0.62.11__cp311-cp311-win_amd64.whl → 2.18.0__cp311-cp311-win_amd64.whl

dclab/rtdc_dataset/export.py

@@ -224,7 +224,6 @@ 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
@@ -319,21 +318,18 @@ class Export(object):
 
             # write export log
             hw.store_log(time.strftime("dclab-export_%Y-%m-%d_%H.%M.%S"),
-                         json.dumps(
-                             {"dclab version": version_tuple,
-                              "kwargs": {
-                                  "features": features,
-                                  "filtered": filtered,
-                                  "logs": logs,
-                                  "tables": tables,
-                                  "basins": basins,
-                                  "meta_prefix": meta_prefix,
-                                  "skip_checks": skip_checks
-                                  }
-                              },
-                             indent=2,
-                             sort_keys=True,
-                         ).split("\n"))
+                         json.dumps({
+                             "dclab version": version_tuple,
+                             "kwargs": {
+                                 "features": features,
+                                 "filtered": filtered,
+                                 "logs": logs,
+                                 "tables": tables,
+                                 "basins": basins,
+                                 "meta_prefix": meta_prefix,
+                                 "skip_checks": skip_checks
+                             }
+                         }).split("\n"))
 
             if logs:
                 # write logs

dclab/rtdc_dataset/feat_basin.py

@@ -9,18 +9,11 @@ import abc
 import numbers
 import threading
 from typing import Dict, List, Literal
-import uuid
 import warnings
 import weakref
 
 import numpy as np
 
-from ..util import copy_if_needed
-
-
-class BasinFeatureMissingWarning(UserWarning):
-    """Used when a badin feature is defined but not stored"""
-
 
 class CyclicBasinDependencyFoundWarning(UserWarning):
     """Used when a basin is defined in one of its sub-basins"""
@@ -75,7 +68,6 @@ class Basin(abc.ABC):
                                   ] = "same",
                  mapping_referrer: Dict = None,
                  ignored_basins: List[str] = None,
-                 key: str = None,
                  **kwargs):
         """
 
@@ -111,10 +103,6 @@ class Basin(abc.ABC):
             :class:`.RTDCBase`.
         ignored_basins: list of str
             List of basins to ignore in subsequent basin instantiations
-        key: str
-            Unique key to identify this basin; normally computed from
-            a JSON dump of the basin definition. A random string is used
-            if None is specified.
         kwargs:
             Additional keyword arguments passed to the `load_dataset`
             method of the `Basin` subclass.
@@ -130,8 +118,6 @@ class Basin(abc.ABC):
         self.name = name
         #: lengthy description of the basin
         self.description = description
-        # defining key of the basin
-        self.key = key or str(uuid.uuid4())
         # features this basin provides
         self._features = features
         #: measurement identifier of the referencing dataset
@@ -375,7 +361,6 @@ class BasinProxy:
             dataset to the downstream dataset
         """
         self.ds = ds
-        self.basins_get_dicts = ds.basins_get_dicts
         self.basinmap = basinmap
         self._features = {}
 
@@ -420,7 +405,7 @@ class BasinProxyFeature(np.lib.mixins.NDArrayOperatorsMixin):
         self._cache = None
         self.is_scalar = bool(len(self.feat_obj.shape) == 1)
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         if self._cache is None and self.is_scalar:
             self._cache = self.feat_obj[:][self.basinmap]
         else:
@@ -511,19 +496,6 @@ class InternalH5DatasetBasin(Basin):
         if self._features is None:
             raise ValueError("You must specify features when defining "
                              "internal basins.")
-        # Redefine the features if necessary
-        h5root = self._basinmap_referrer().h5file
-        available_features = []
-        for feat in self._features:
-            if self.location in h5root and feat in h5root[self.location]:
-                available_features.append(feat)
-            else:
-                warnings.warn(
-                    f"Feature '{feat}' is defined as an internal basin, "
-                    f"but it cannot be found in '{self.location}'.",
-                    BasinFeatureMissingWarning)
-        self._features.clear()
-        self._features += available_features
 
     def _load_dataset(self, location, **kwargs):
         from .fmt_dict import RTDC_Dict
@@ -535,7 +507,8 @@ class InternalH5DatasetBasin(Basin):
         return RTDC_Dict(ds_dict)
 
     def is_available(self):
-        return bool(self._features)
+        h5root = self._basinmap_referrer().h5file
+        return self.location in h5root
 
     def verify_basin(self, *args, **kwargs):
         """It's not necessary to verify internal basins"""

dclab/rtdc_dataset/fmt_dcor/tables.py

@@ -30,13 +30,11 @@ class DCORTables:
             tables = {}
             for key in table_data:
                 columns, data = table_data[key]
+                ds_dt = np.dtype({'names': columns,
+                                  'formats': [np.float64] * len(columns)})
                 tab_data = np.asarray(data)
-                if columns is not None:
-                    # We have a rec-array (named columns)
-                    ds_dt = np.dtype({'names': columns,
-                                      'formats': [np.float64] * len(columns)})
-                    tab_data = np.rec.array(tab_data, dtype=ds_dt)
-                tables[key] = tab_data
+                rec_arr = np.rec.array(tab_data, dtype=ds_dt)
+                tables[key] = rec_arr
 
             self._tables_cache = tables
         return self._tables_cache

dclab/rtdc_dataset/fmt_hdf5/base.py

@@ -175,15 +175,10 @@ class RTDC_HDF5(RTDCBase):
 
     def basins_get_dicts(self):
         """Return list of dicts for all basins defined in `self.h5file`"""
-        return self.basin_get_dicts_from_h5file(self.h5file)
-
-    @staticmethod
-    def basin_get_dicts_from_h5file(h5file):
-        """Return list of dicts for all basins defined in `h5file`"""
         basins = []
         # Do not sort anything here, sorting is done in `RTDCBase`.
-        for bk in h5file.get("basins", []):
-            bdat = list(h5file["basins"][bk])
+        for bk in self.h5file.get("basins", []):
+            bdat = list(self.h5file["basins"][bk])
             if isinstance(bdat[0], bytes):
                 bdat = [bi.decode("utf") for bi in bdat]
             bdict = json.loads(" ".join(bdat))

dclab/rtdc_dataset/fmt_hdf5/events.py

@@ -7,7 +7,7 @@ import numbers
 import numpy as np
 
 from ... import definitions as dfn
-from ...util import copy_if_needed
+
 
 from . import feat_defect
 
@@ -140,7 +140,7 @@ class H5MaskEvent:
         self.identifier = (self.h5dataset.file.filename, self.h5dataset.name)
         self.dtype = np.dtype(bool)
 
-    def __array__(self, dtype=np.bool_, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=np.bool_, copy=False, *args, **kwargs):
         if dtype is not np.uint8:
             warnings.warn("Please avoid calling the `__array__` method of the "
                           "`H5MaskEvent`. It may consume a lot of memory.",
@@ -180,7 +180,7 @@ class H5ScalarEvent(np.lib.mixins.NDArrayOperatorsMixin):
         # attrs
         self._ufunc_attrs = dict(self.h5ds.attrs)
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         if self._array is None:
             self._array = np.asarray(self.h5ds, *args, **kwargs)
         return np.array(self._array, dtype=dtype, copy=copy)

dclab/rtdc_dataset/fmt_hierarchy/base.py

@@ -60,6 +60,7 @@ class RTDC_Hierarchy(RTDCBase):
 
         self._events = {}
 
+        #: hierarchy parent
         self.hparent = hparent
 
         self.config = self._create_config()  # init config

dclab/rtdc_dataset/fmt_hierarchy/events.py

@@ -3,7 +3,6 @@ import warnings
 
 import numpy as np
 
-from ...util import copy_if_needed
 from .mapper import map_indices_child2parent
 
 
@@ -38,7 +37,7 @@ class ChildNDArray(ChildBase):
         super(ChildNDArray, self).__init__(child)
         self.feat = feat
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         warnings.warn("Please avoid calling the `__array__` method of the "
                       "`ChildNDArray`. It may consume a lot of memory. "
                       "Consider using a generator instead.",
@@ -70,7 +69,7 @@ class ChildScalar(np.lib.mixins.NDArrayOperatorsMixin):
         self._ufunc_attrs = {}
         self.ndim = 1  # matplotlib might expect this from an array
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         if self._array is None:
             hparent = self.child.hparent
             filt_arr = hparent.filter.all
@@ -122,7 +121,7 @@ class ChildTraceItem(ChildBase):
         super(ChildTraceItem, self).__init__(child)
         self.flname = flname
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         warnings.warn("Please avoid calling the `__array__` method of the "
                       "`ChildTraceItem`. It may consume a lot of memory. "
                       "Consider using a generator instead.",

dclab/rtdc_dataset/linker.py

@@ -0,0 +1,124 @@
+"""Tools for linking HDF5 datasets across files"""
+from __future__ import annotations
+
+import io
+import pathlib
+from typing import BinaryIO, Literal
+
+import h5py
+
+
+class ExternalDataForbiddenError(BaseException):
+    """Raised when a dataset contains external data
+
+    External data are a security risk, because they could be
+    used to access data that are not supposed to be accessed.
+    This is especially critical when the data are accessed within
+    a web server process (e.g. in DCOR).
+    """
+    pass
+
+
+def assert_no_external(h5):
+    """Raise ExternalDataForbiddenError if `h5` refers to external data"""
+    has_ext, path_ext = check_external(h5)
+    if has_ext:
+        raise ExternalDataForbiddenError(
+            f"Dataset {h5.file.filename} contains external data, but these "
+            f"are not permitted for security reasons ({path_ext})!")
+
+
+def check_external(h5):
+    """Check recursively, whether an h5py object contains external data
+
+    External data includes binary data in external files, virtual
+    datasets, and external links.
+
+    Returns a tuple of either
+
+    - `(True, path_ext)` if the object contains external data
+    - `(False, None)` if this is not the case
+
+    where `path_ext` is the path to the group or dataset in `h5`.
+
+    .. versionadded:: 0.51.0
+
+    """
+    for key in h5:
+        obj = h5[key]
+        if (obj.file != h5.file  # not in same file
+                or (isinstance(obj, h5py.Dataset)
+                    and (obj.is_virtual  # virtual dataset
+                         or obj.external))):  # external dataset
+            # These are external data
+            return True, f"{h5.name}/{key}".replace("//", "/")
+        elif isinstance(obj, h5py.Group):
+            # Perform recursive check for external data
+            has_ext, path_ext = check_external(obj)
+            if has_ext:
+                return True, path_ext
+    else:
+        return False, None
+
+
+def combine_h5files(
+        paths: list,
+        external: Literal["follow", "raise"] = "follow"
+        ) -> BinaryIO:
+    """Create an in-memory file that combines multiple .rtdc files
+
+    The .rtdc files must have the same number of events. The in-memory
+    file is populated with the "events" data from `paths` according to
+    the order that `paths` are given in. Metadata, including logs, basins,
+    and tables are only taken from the first path.
+
+    .. versionadded:: 0.51.0
+
+    Parameters
+    ----------
+    paths: list of str or pathlib.Path
+        Paths of the input .rtdc files. The first input file is always
+        used as a source for the metadata. The other files only complement
+        the features.
+    external: str
+        Defines how external (links, binary, virtual) data in `paths`
+        should be handled. The default is to "follow" external datasets or
+        links to external data. In a zero-trust context, you can set this
+        to "raise" which will cause an :class:`.ExternalDataForbiddenError`
+        exception when external data are encountered.
+
+    Returns
+    -------
+    fd: BinaryIO
+        seekable, file-like object representing an HDF5 file opened in
+        binary mode; This can be passed to `:class:h5py.File`
+    """
+    fd = io.BytesIO()
+    with h5py.File(fd, "w", libver="latest") as hv:
+        for ii, pp in enumerate(paths):
+            pp = pathlib.Path(pp).resolve()
+            with h5py.File(pp, libver="latest") as h5:
+                if external == "raise":
+                    # Check for external data
+                    assert_no_external(h5)
+                if ii == 0:
+                    # Only write attributes once.
+                    # Interestingly, writing the attributes takes
+                    # the most time. Maybe there is some shortcut
+                    # that can be taken (since e.g. we know we don't have to
+                    # check for existing attributes).
+                    # https://github.com/h5py/h5py/blob/master/
+                    # h5py/_hl/attrs.py
+                    hv.attrs.update(h5.attrs)
+                    # Also, write basins/logs/tables/... (anything that is
+                    # not events) only once.
+                    for group in h5:
+                        if group != "events":
+                            hv[group] = h5py.ExternalLink(str(pp), group)
+                # Append features
+                hve = hv.require_group("events")
+                for feat in h5["events"]:
+                    if feat not in hve:
+                        hve[feat] = h5py.ExternalLink(str(pp),
+                                                      f"/events/{feat}")
+    return fd

dclab/rtdc_dataset/writer.py

@@ -389,7 +389,7 @@ class RTDCWriter:
                     flocs.append(str(pp.resolve()))
                     # Also store the relative path for user convenience.
                     # Don't use pathlib.Path.relative_to, because that
-                    # only has `walk_up` since Python 3.12.
+                    # is deprecated in Python 3.12.
                     # Also, just look in subdirectories which simplifies
                     # path resolution.
                     this_parent = str(self.path.parent) + os.sep
@@ -408,7 +408,7 @@ class RTDCWriter:
         else:
             raise ValueError(f"Unknown basin type '{basin_type}'")
 
-        b_lines = json.dumps(b_data, indent=2, sort_keys=True).split("\n")
+        b_lines = json.dumps(b_data, indent=2).split("\n")
         basins = self.h5file.require_group("basins")
         key = hashobj(b_lines)
         if key not in basins:
@@ -616,7 +616,7 @@ class RTDCWriter:
                     convfunc = dfn.get_config_value_func(sec, ck)
                     self.h5file.attrs[idk] = convfunc(value)
 
-    def store_table(self, name, cmp_array, h5_attrs=None):
+    def store_table(self, name, cmp_array):
         """Store a compound array table
 
         Tables are semi-metadata. They may contain information collected
@@ -629,33 +629,16 @@ class RTDCWriter:
         ----------
         name: str
             Name of the table
-        cmp_array: np.recarray, h5py.Dataset, np.ndarray, or dict
+        cmp_array: np.recarray, h5py.Dataset, or dict
             If a np.recarray or h5py.Dataset are provided, then they
             are written as-is to the file. If a dictionary is provided,
             then the dictionary is converted into a numpy recarray.
-            If a numpy array is provided, then the array is written
-            as a raw table (no column names) to the file.
-        h5_attrs: dict, optional
-            Attributes to store alongside the corresponding HDF5 dataset
         """
-        if h5_attrs is None:
-            h5_attrs = {}
-
-        if isinstance(cmp_array, np.recarray):
+        if isinstance(cmp_array, (np.recarray, h5py.Dataset)):
             # A table is a compound array (np.recarray). If we are here,
-            # this means that the user passed an instance of np.recarray.
-            pass
-        elif isinstance(cmp_array, h5py.Dataset):
-            # An instance of h5py.Dataset (which we trust to be a proper
+            # this means that the user passed an instance of np.recarray
+            # or an instance h5py.Dataset (which we trust to be a proper
             # compound dataset at this point). No additional steps needed.
-            h5_attrs.update(cmp_array.attrs)
-            pass
-        elif isinstance(cmp_array, np.ndarray):
-            # A numpy array was passed. This usually means we have something
-            # that we can look at, so we add image tags.
-            h5_attrs['CLASS'] = np.bytes_('IMAGE')
-            h5_attrs['IMAGE_VERSION'] = np.bytes_('1.2')
-            h5_attrs['IMAGE_SUBCLASS'] = np.bytes_('IMAGE_GRAYSCALE')
             pass
         elif isinstance(cmp_array, dict):
             # The user passed a dict which we now have to convert to a
@@ -676,18 +659,16 @@ class RTDCWriter:
         else:
             raise NotImplementedError(
                 f"Cannot convert {type(cmp_array)} to table!")
-
-        # data
         group = self.h5file.require_group("tables")
         tab = group.create_dataset(
             name,
             data=cmp_array,
             fletcher32=True,
             **self.compression_kwargs)
-
-        # metadata
-        if h5_attrs:
-            tab.attrs.update(h5_attrs)
+        # Also store metadata
+        if hasattr(cmp_array, "attrs"):
+            for key in cmp_array.attrs:
+                tab.attrs[key] = cmp_array.attrs[key]
 
     def version_brand(self, old_version=None, write_attribute=True):
         """Perform version branding

dclab/util.py

@@ -10,12 +10,6 @@ import numpy as np
 from .rtdc_dataset.config import Configuration, ConfigurationDict
 
 
-if np.lib.NumpyVersion(np.__version__) >= "2.0.0":
-    copy_if_needed = None
-else:
-    copy_if_needed = False
-
-
 class file_monitoring_lru_cache:
     """Decorator for caching data extracted from files
 

{dclab-0.62.11.dist-info → dclab-2.18.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: dclab
-Version: 0.62.11
+Version: 2.18.0
 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>
@@ -23,7 +23,7 @@ Requires-Dist: importlib-resources>=6.0
 Requires-Dist: numpy<3,>=1.21
 Requires-Dist: scipy<2,>=1.10.0
 Provides-Extra: all
-Requires-Dist: dclab[dcor,export,http,s3,tdms]; extra == "all"
+Requires-Dist: dclab[dcor,export,http,lme4,s3,tdms]; extra == "all"
 Provides-Extra: dcor
 Requires-Dist: requests<3,>=2.31.0; extra == "dcor"
 Provides-Extra: export
@@ -31,6 +31,8 @@ Requires-Dist: fcswrite>=0.5.0; extra == "export"
 Requires-Dist: imageio[ffmpeg]; extra == "export"
 Provides-Extra: http
 Requires-Dist: requests<3,>=2.31.0; extra == "http"
+Provides-Extra: lme4
+Requires-Dist: rpy2>=2.9.4; extra == "lme4"
 Provides-Extra: s3
 Requires-Dist: boto3>=1.34.31; extra == "s3"
 Provides-Extra: tdms

{dclab-0.62.11.dist-info → dclab-2.18.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 dclab/__init__.py,sha256=7_y6YtYcoL_a5M6Q9PiwZPzHSxS66yCTgs_uuK5C1dg,835
-dclab/_version.py,sha256=6k5Rk2Ap5YBUoGawDNLFVJOIfoIxcLr4FCtSHL8cFtM,431
+dclab/_version.py,sha256=FtxqWMMTICqFm_T17FM6lxcr-fqIwqwRcXNbxZPVYdg,429
 dclab/cached.py,sha256=t01BYTf43VEsBYa0c-bMxgceF5vKoGV73b42UlLH6Lo,3014
-dclab/downsampling.cp311-win_amd64.pyd,sha256=GPSA2G9zlGmthtwW-9mOkuztb094aF602VLSWSNE6SY,187392
+dclab/downsampling.cp311-win_amd64.pyd,sha256=sn3f2qOTHpfeh-d5Rfb5CbUd-np9xuHu0MJ_N2-bdmc,187392
 dclab/downsampling.pyx,sha256=Ez6MbNbzCUzs2IXXKtAYsjtYqP22kI8hdA1IE-3mqvY,7488
-dclab/http_utils.py,sha256=nneq9Cx8dw8ChQx5oIg2pN0xGkvNWCMSY5VYmttqyXA,11232
+dclab/http_utils.py,sha256=IBRKlad0irZOZ0anjdGEGwrcNorKNiE_SIBMMJ3pMpo,10874
 dclab/kde_contours.py,sha256=k0Y1UsJNtuYY8iqYmfQ-Nml-dFpJAcigd3vmt9U6zsY,6967
 dclab/kde_methods.py,sha256=_Fm91_cJZoTGQEgfuK5To4nEFcW7lolNsldY8a_AUoM,9509
 dclab/polygon_filter.py,sha256=C4uBvK8zzT8irUOIgITvASlCtc0EEMM5edp4dFx-9jw,13878
 dclab/statistics.py,sha256=6saNuiXCcYmI8_cmb8Tb7E34BbsxHzTvNNlbKeNoDIw,6558
-dclab/util.py,sha256=RG0p4dyO-G67r9-CeG6_GYuBkrxi1c6oGG1tQXAVG1Y,5409
+dclab/util.py,sha256=YxX8u8DHhMDGD6lEswArM40o51zYYmhhjvikQHNVvXc,5291
 dclab/warn.py,sha256=pv_W9cKBJg-mUn-_6O4xBwRmwI9QaEIW9EBEIiyL0iU,538
 dclab/cli/__init__.py,sha256=IB33_cscv866CAwXnP1ZO9tlBpOldB0UQuR5P87FmSQ,493
 dclab/cli/common.py,sha256=_YEmejfizH54aBI2q5solRMz8HN421rDkLj1dRXp7Tk,7461
@@ -22,7 +22,7 @@ dclab/cli/task_verify_dataset.py,sha256=OFy7aWHvA6NInndnMBg0MVZSBibvJeNHhc_C79_9
 dclab/definitions/__init__.py,sha256=cubgnqpBbPgk_c1_uUPggRsmtUd-baV1haybLqbMf8k,2860
 dclab/definitions/feat_const.py,sha256=I772sd6aSNv8PzhT9MHnNKbGhx6ZJt3z3_FVs5oxMtw,9836
 dclab/definitions/feat_logic.py,sha256=uMHXInzESTtBWPBsk9PxqSFFrSM1vNbTDxOlso9zhT0,6006
-dclab/definitions/meta_const.py,sha256=X3U3orhlY_i78TYN4DUBJaOGBltNnXaRsQauH1LxuJ0,13377
+dclab/definitions/meta_const.py,sha256=WnCUyfSdpwWIM4FsNJjiPomEgXM95C4pyGRSP2QzESI,12641
 dclab/definitions/meta_logic.py,sha256=no6fTCmKFrwpmirs_9358-Ysh5aZeib1xJrL_30WkqU,4305
 dclab/definitions/meta_parse.py,sha256=UtgSm7hkfqnyj6FAbDmctbXqfZOHU9d4uoMf3EcYWtQ,2487
 dclab/external/__init__.py,sha256=cnwVRsdIQOHQrys3-g_dslbTEUi1hfTL709TaZ6hFVY,97
@@ -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.cp311-win_amd64.pyd,sha256=Qn21AWt0d1P4IwQua63AuJyh52-ByX8bEl8gVk0ji0I,142848
+dclab/external/skimage/_find_contours_cy.cp311-win_amd64.pyd,sha256=cZta5ehQWv8S_Q2D9Fm1NAfiEKZrJy2cEFLAVy3WqVU,142848
 dclab/external/skimage/_find_contours_cy.pyx,sha256=c-EobLhKjZNCpuqWxmvrcH35uAY_Bu-_hZiUHbXODms,7349
-dclab/external/skimage/_pnpoly.cp311-win_amd64.pyd,sha256=Vft7qBgM11bANroeFVMj1NYWPjAKpOP2Pd9zPgnfRZU,158720
+dclab/external/skimage/_pnpoly.cp311-win_amd64.pyd,sha256=-EvORRshHVLo6O8-5fAKi-VhcVF2LvOL4UgR2P7OXOc,158720
 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.cp311-win_amd64.pyd,sha256=UASpEXw9is1Fe54MXuE7vpXsleTm9cXywYGShF7XscE,21504
+dclab/external/skimage/_shared/geometry.cp311-win_amd64.pyd,sha256=Ufez4pyv6lOsbg46fzwpUjNkMJOsI6QunFvYcCDOXvI,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
@@ -75,24 +75,25 @@ dclab/isoelastics/iso_HE-3D-FEM-22-volume-deform.txt,sha256=NlaE7yKz7N8yF65ri3H8
 dclab/isoelastics/iso_LE-2D-FEM-19-area_um-deform.txt,sha256=lcTjUUnIwj_bVBrG2T2OWBK1ApuLjxJkvL2KAuU51OM,79694
 dclab/isoelastics/iso_LE-2D-FEM-19-volume-deform.txt,sha256=vTcazOlOXo3BQ0NQtGB_IdHKA0neOLXZ_d3JuMU--RE,83358
 dclab/isoelastics/iso_LE-2D-ana-18-area_um-deform.txt,sha256=KD2RkhCfkrna20pLJ3UzNZZapMkhQydMYz0iKdMtRRE,46805
-dclab/lme4/__init__.py,sha256=85rlF3G9ZblRue7SB2DrMqSfVPVyE37ujr55Oy7OZaI,277
-dclab/lme4/lme4_template.R,sha256=9jRrdMVh9UlfzyE4BsktRTlFzeWI6AvbwzZXzNO5EfI,2664
-dclab/lme4/rsetup.py,sha256=_3ov0QlBH_CguoAanKmsm09JfgjfADhRimqMR16FnMk,6094
-dclab/lme4/wrapr.py,sha256=tZYvUy5LUM7sM3d8NiOIlxbrtu89LAihG4hqI6MSv2Q,15403
+dclab/lme4/__init__.py,sha256=_l1dvI1yL06D3wdtst-aUE02N-rZu-dZJXK8xvgvYVc,240
+dclab/lme4/rlibs.py,sha256=FCV2919MMKbdvEvy61O0dYvt0EUZhiPHuP7OyyZ4esM,2632
+dclab/lme4/rsetup.py,sha256=1svUQqJIuMPYNX_Kxs2Jcq1N4RsOtAv87gda5c1bpM8,7158
+dclab/lme4/wrapr.py,sha256=zTlDmDFJgpVbLxjSxLeag17zKPkOfsK7Mr3r72jqdGY,17399
 dclab/rtdc_dataset/__init__.py,sha256=BuWKEUm7QUe-Kj1wMR0AXON_XN2mzXlbOgouHdnvAw4,501
-dclab/rtdc_dataset/check.py,sha256=l2QoIL3gno_Z2-e8RvYHAurHZP_oLGtZk8l6jUDiuTA,35908
+dclab/rtdc_dataset/check.py,sha256=dt535xuyjTs8kTf2LITruWeh4WRWci9rjfjczs170Xc,33240
 dclab/rtdc_dataset/config.py,sha256=HVJiqKlqd-SpYqnNTKSr1yUsq2Bkfq5s5zluT-8PUc0,17965
-dclab/rtdc_dataset/copier.py,sha256=imD0ijAz9BY0nksF2zUBeoGmeo_dUTUnBgY9TqRaD4g,14528
-dclab/rtdc_dataset/core.py,sha256=7pQOcFGEO2AnI7r8rJLjXkAi8mXkY4GCQ41eXfBHMx0,38999
-dclab/rtdc_dataset/export.py,sha256=gdcg8FSacFBdIfCPbquEOV7J96FlHAvWu9PpK2KTdkc,30351
-dclab/rtdc_dataset/feat_basin.py,sha256=nDMMkjBmVrH26_lhSJ4pmgUfcwdV1wDON-Hu-864is8,21622
+dclab/rtdc_dataset/copier.py,sha256=zg9iuokrH6E-yqF-guZhvDs6JyaDK0kAK9tNzWEJI-I,12289
+dclab/rtdc_dataset/core.py,sha256=yTxpOPqb6Ihaqmq5wJLRtkxHzpPQNUN3O3DyOw0dZJ4,38663
+dclab/rtdc_dataset/export.py,sha256=4hvuRM2Ta7RW0H7Dp7sD4QojBdcbMDD6vhrxJACLVjI,30217
+dclab/rtdc_dataset/feat_basin.py,sha256=-kMXEC06_ZG6cJQB0iW84VsvFet5fVJGpfKMvJ6WzoU,20520
 dclab/rtdc_dataset/feat_temp.py,sha256=5QiF8Nc8MVoTtinYlvfoSuoopND-uvWVWKjMggBTHLw,3796
 dclab/rtdc_dataset/filter.py,sha256=IRaEUt0tWtZGLKYvtqzfYO2kN5yhqx9eLoHd3VOLCTE,10286
 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/linker.py,sha256=sQ4GUc0p6ATRrhxM4dSh24dpLN4EL1LIUFiB3W-6ciI,4753
 dclab/rtdc_dataset/load.py,sha256=IKRtlZbHGAHNCNaZQPRXFxJjnnMH5HXnhNuIwqYmHzo,2545
-dclab/rtdc_dataset/writer.py,sha256=IWD4hepdcF-x0fTe_90WQuOu0XEZ4UQ2kcPhWg05xI4,42157
+dclab/rtdc_dataset/writer.py,sha256=Actk8Xan-TbZEOQs0joLf5IBMvfwMw7JFlfkiTi2aPQ,41393
 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,17 +110,17 @@ 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=5-RFH8NAQ04LRiOnq0f22FqFirr7lUBkE9_WgxvLzBI,1223
+dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=rCkKnSoJpQPhjhCgG9hAd6L1wimlIMd7qM5vaNATgbM,1109
 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/base.py,sha256=hwcOc7vvdzqdWX-C3WBKJig7ecPivvpeGUigifYAzCE,6393
 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/events.py,sha256=Fuhcv0RM6Z1kE3iPFm6MmZWbH6lgIC3GOJ-GOPmGQuc,8436
 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=9MJtLfDUyCr6bpBY7awaLSBBxeabbTo4yrkz0iYsRH8,902
 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
+dclab/rtdc_dataset/fmt_hierarchy/base.py,sha256=_fw48sCssdy9nxXhFmSsBztdFFpWK-GqbyHro23PVtA,9747
+dclab/rtdc_dataset/fmt_hierarchy/events.py,sha256=TOmLsOLFlJPRbiXDyAD-_9qGxFgAwc54sffZfakdI8U,4630
 dclab/rtdc_dataset/fmt_hierarchy/hfilter.py,sha256=EQhA8grohdMYOdbzJdB4rGv7hjtnDkpXWG7REOopmB4,5992
 dclab/rtdc_dataset/fmt_hierarchy/mapper.py,sha256=lTnHKtTOpljcdzDflucsFKW4SfxP62bl_VpAvIhRBts,4344
 dclab/rtdc_dataset/fmt_tdms/__init__.py,sha256=2aQki_mZeiPl0yxmDhdpveXiUOFnzjlj-fa28-mbGj4,19399
@@ -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.11.dist-info/LICENSE,sha256=ayjnuJcdf_kpkDyD61tUcVqVAQaNSYXJ73m5HVB4G8s,18474
-dclab-0.62.11.dist-info/METADATA,sha256=R6xumDUGvna8Gge4hJnWlsYETNz0heiKxzNpwbI4_M4,4901
-dclab-0.62.11.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
-dclab-0.62.11.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.11.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.11.dist-info/RECORD,,
+dclab-2.18.0.dist-info/LICENSE,sha256=ayjnuJcdf_kpkDyD61tUcVqVAQaNSYXJ73m5HVB4G8s,18474
+dclab-2.18.0.dist-info/METADATA,sha256=AgCQASKJSpYGXuc8qJNOS16uigVQaQ6EsXoSSQzuiuU,4972
+dclab-2.18.0.dist-info/WHEEL,sha256=WRbBgi9HBHR6yzaPlBW1thcwhnq7JwQcoZZASdBlCwA,101
+dclab-2.18.0.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-2.18.0.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-2.18.0.dist-info/RECORD,,

{dclab-0.62.11.dist-info → dclab-2.18.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: false
 Tag: cp311-cp311-win_amd64