dclab 0.62.16__cp39-cp39-macosx_11_0_arm64.whl → 0.63.0__cp39-cp39-macosx_11_0_arm64.whl

dclab/rtdc_dataset/export.py

@@ -13,11 +13,11 @@ import h5py
 import hdf5plugin
 
 try:
-    import imageio
+    import av
 except ModuleNotFoundError:
-    IMAGEIO_AVAILABLE = False
+    PYAV_AVAILABLE = False
 else:
-    IMAGEIO_AVAILABLE = True
+    PYAV_AVAILABLE = True
 
 try:
     import fcswrite
@@ -44,32 +44,51 @@ class Export(object):
         """Export functionalities for RT-DC datasets"""
         self.rtdc_ds = rtdc_ds
 
-    def avi(self, path, filtered=True, override=False):
-        """Exports filtered event images to an avi file
+    def avi(self,
+            path: str | pathlib.Path,
+            filtered: bool = True,
+            override: bool = False,
+            pixel_format: str = "yuv420p",
+            codec: str = "rawvideo",
+            codec_options: dict[str, str] = None,
+            progress_callback: callable = None,
+            ):
+        """Exports filtered event images to a video file
 
         Parameters
         ----------
         path: str
-            Path to a .avi file. The ending .avi is added automatically.
+            Path to a video file. The container is (.avi, .mkv, ...) is
+            deduced from the file suffix.
         filtered: bool
             If set to `True`, only the filtered data
             (index in ds.filter.all) are used.
         override: bool
             If set to `True`, an existing file ``path`` will be overridden.
             If set to `False`, raises `OSError` if ``path`` exists.
+        pixel_format: str
+            Which pixel format to give to ffmpeg.
+        codec: str
+            Codec name; e.g. "rawvideo" or "libx264"
+        codec_options:
+            Additional arguments to give to the codec using ffmpeg,
+            e.g. `{'preset': 'slow', 'crf': '0'}` for "libx264" codec.
+        progress_callback: callable
+            Function that takes at least two arguments: float between 0 and
+            1 for monitoring progress and a string describing what is being
+            done.
 
         Notes
         -----
         Raises OSError if current dataset does not contain image data
         """
-        if not IMAGEIO_AVAILABLE:
+        if not PYAV_AVAILABLE:
             raise ModuleNotFoundError(
-                "Package `imageio` required for avi export!")
+                "Package `av` required for avi export!")
         path = pathlib.Path(path)
+        if len(path.suffix) != 4:
+            path = path.with_suffix(".avi")
         ds = self.rtdc_ds
-        # Make sure that path ends with .avi
-        if path.suffix != ".avi":
-            path = path.with_name(path.name + ".avi")
         # Check if file already exist
         if not override and path.exists():
             raise OSError("File already exists: {}\n".format(
@@ -78,29 +97,50 @@ class Export(object):
         # Start exporting
         if "image" in ds:
             # Open video for writing
-            vout = imageio.get_writer(uri=path,
-                                      format="FFMPEG",
-                                      fps=25,
-                                      codec="rawvideo",
-                                      pixelformat="yuv420p",
-                                      macro_block_size=None,
-                                      ffmpeg_log_level="error")
-            # write the filtered frames to avi file
-            for evid in np.arange(len(ds)):
-                # skip frames that were filtered out
-                if filtered and not ds.filter.all[evid]:
-                    continue
-                image = ds["image"][evid]
-                # Convert image to RGB
-                image = image.reshape(image.shape[0], image.shape[1], 1)
-                image = np.repeat(image, 3, axis=2)
-                vout.append_data(image)
+            with av.open(path, mode="w") as container:
+                stream = container.add_stream(codec_name=codec,
+                                              rate=25)
+                stream.pix_fmt = pixel_format
+                stream.height = ds["image"].shape[1]
+                stream.width = ds["image"].shape[2]
+                if codec_options:
+                    stream.codec_context.options = codec_options
+
+                # write the filtered frames to the video file
+                for evid in np.arange(len(ds)):
+
+                    if progress_callback is not None and evid % 10_000 == 0:
+                        progress_callback(evid / len(ds), "exporting video")
+
+                    # skip frames that were filtered out
+                    if filtered and not ds.filter.all[evid]:
+                        continue
+                    image = ds["image"][evid]
+                    # Convert to RGB
+                    image = image.reshape(image.shape[0], image.shape[1], 1)
+                    image = np.repeat(image, 3, axis=2)
+
+                    av_frame = av.VideoFrame.from_ndarray(image,
+                                                          format="rgb24")
+
+                    for packet in stream.encode(av_frame):
+                        container.mux(packet)
+
+            if progress_callback is not None:
+                progress_callback(1.0, "video export complete")
+
         else:
             msg = "No image data to export: dataset {} !".format(ds.title)
             raise OSError(msg)
 
-    def fcs(self, path, features, meta_data=None, filtered=True,
-            override=False):
+    def fcs(self,
+            path: pathlib.Path | str,
+            features: list[str],
+            meta_data: dict = None,
+            filtered: bool = True,
+            override: bool = False,
+            progress_callback: callable = None,
+            ):
         """Export the data of an RT-DC dataset to an .fcs file
 
         Parameters
@@ -121,6 +161,10 @@ class Export(object):
         override: bool
             If set to `True`, an existing file ``path`` will be overridden.
             If set to `False`, raises `OSError` if ``path`` exists.
+        progress_callback: callable
+            Function that takes at least two arguments: float between 0 and
+            1 for monitoring progress and a string describing what is being
+            done.
 
         Notes
         -----
@@ -154,12 +198,18 @@ class Export(object):
         # Collect the header
         chn_names = [dfn.get_feature_label(c, rtdc_ds=ds) for c in features]
 
+        if progress_callback is not None:
+            progress_callback(0.0, "collecting data")
+
         # Collect the data
         if filtered:
             data = [ds[c][ds.filter.all] for c in features]
         else:
             data = [ds[c] for c in features]
 
+        if progress_callback is not None:
+            progress_callback(0.5, "exporting data")
+
         data = np.array(data).transpose()
         meta_data["dclab version"] = version
         fcswrite.write_fcs(filename=str(path),
@@ -168,6 +218,9 @@ class Export(object):
                            text_kw_pr=meta_data,
                            )
 
+        if progress_callback is not None:
+            progress_callback(1.0, "export complete")
+
     def hdf5(self,
              path: str | pathlib.Path,
              features: List[str] = None,
@@ -179,7 +232,9 @@ class Export(object):
              override: bool = False,
              compression_kwargs: Dict = None,
              compression: str = "deprecated",
-             skip_checks: bool = False):
+             skip_checks: bool = False,
+             progress_callback: callable = None,
+             ):
         """Export the data of the current instance to an HDF5 file
 
         Parameters
@@ -223,7 +278,10 @@ class Export(object):
                 Use `compression_kwargs` instead.
         skip_checks: bool
             Disable checking whether all features have the same length.
-
+        progress_callback: callable
+            Function that takes at least two arguments: float between 0 and
+            1 for monitoring progress and a string describing what is being
+            done.
 
         .. versionchanged:: 0.58.0
 
@@ -314,6 +372,8 @@ class Export(object):
         with RTDCWriter(path,
                         mode="append",
                         compression_kwargs=compression_kwargs) as hw:
+            if progress_callback is not None:
+                progress_callback(0.0, "writing metadata")
             # write meta data
             hw.store_metadata(meta)
 
@@ -348,7 +408,10 @@ class Export(object):
                                    ds.tables[tab])
 
             # write each feature individually
-            for feat in features:
+            for ii, feat in enumerate(features):
+                if progress_callback is not None:
+                    progress_callback(ii / len(features), f"exporting {feat}")
+
                 if (filter_arr is None or
                         # This does not work for the .tdms file format
                         # (and probably also not for DCOR).
@@ -372,6 +435,10 @@ class Export(object):
                                            filtarr=filter_arr)
 
             if basins:
+                if progress_callback:
+                    progress_callback(1 - 1 / (len(features) or 1),
+                                      "writing basins")
+
                 # We have to store basins. There are three options:
                 # - filtering disabled: just copy basins
                 # - filtering enabled
@@ -451,9 +518,17 @@ class Export(object):
 
                     # Do not verify basins, it takes too long.
                     hw.store_basin(**bn_dict, verify=False)
-
-    def tsv(self, path, features, meta_data=None, filtered=True,
-            override=False):
+        if progress_callback is not None:
+            progress_callback(1.0, "export complete")
+
+    def tsv(self,
+            path: pathlib.Path | str,
+            features: list[str],
+            meta_data: dict = None,
+            filtered: bool = True,
+            override: bool = False,
+            progress_callback: callable = None,
+            ):
         """Export the data of the current instance to a .tsv file
 
         Parameters
@@ -475,6 +550,10 @@ class Export(object):
         override: bool
             If set to `True`, an existing file ``path`` will be overridden.
             If set to `False`, raises `OSError` if ``path`` exists.
+        progress_callback: callable
+            Function that takes at least two arguments: float between 0 and
+            1 for monitoring progress and a string describing what is being
+            done.
         """
         if meta_data is None:
             meta_data = {}
@@ -495,6 +574,10 @@ class Export(object):
             if c not in ds.features_scalar:
                 raise ValueError("Invalid feature name {}".format(c))
         meta_data["dclab version"] = version
+
+        if progress_callback is not None:
+            progress_callback(0.0, "writing metadata")
+
         # Write BOM header
         with path.open("wb") as fd:
             fd.write(codecs.BOM_UTF8)
@@ -518,17 +601,26 @@ class Export(object):
             fd.write("# "+header2+"\n")
 
         with path.open("ab") as fd:
-            # write data
+            if progress_callback is not None:
+                progress_callback(0.1, "collecting data")
+
+            # collect data
             if filtered:
                 data = [ds[c][ds.filter.all] for c in features]
             else:
                 data = [ds[c] for c in features]
 
+            if progress_callback is not None:
+                progress_callback(0.5, "writing data")
+
             np.savetxt(fd,
                        np.array(data).transpose(),
                        fmt=str("%.10e"),
                        delimiter="\t")
 
+        if progress_callback is not None:
+            progress_callback(1.0, "export complete")
+
 
 def yield_filtered_array_stacks(data, indices):
     """Generator returning chunks with the filtered feature data

dclab/util.py

@@ -1,6 +1,7 @@
 """Utility methods"""
 import functools
 import hashlib
+import importlib
 import numbers
 import pathlib
 import warnings
@@ -60,6 +61,25 @@ class file_monitoring_lru_cache:
         return wrapper
 
 
+class LazyLoader():
+    """Lazy load a module on first attribute access"""
+
+    def __init__(self, modname):
+        self._modname = modname
+        self._mod = None
+
+    def __getattr__(self, attr):
+        """Get attribute from module, load module if not loaded yet"""
+
+        if self._mod is None:
+            # module is unset, load it
+            self._mod = importlib.import_module(self._modname)
+
+        # retry getattr if module was just loaded for first time
+        # call this outside exception handler in case it raises new exception
+        return getattr(self._mod, attr)
+
+
 @file_monitoring_lru_cache(maxsize=100)
 def hashfile(fname, blocksize=65536, count=0, constructor=hashlib.md5,
              hasher_class=None):

{dclab-0.62.16.dist-info → dclab-0.63.0.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: dclab
-Version: 0.62.16
+Version: 0.63.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>
-License: GPL version 2.0 or later
+License: GPL-2.0-or-later
 Project-URL: source, https://github.com/DC-Analysis/dclab
 Project-URL: tracker, https://github.com/DC-Analysis/dclab/issues
 Project-URL: documentation, https://dclab.readthedocs.io/en/stable/
@@ -27,8 +27,8 @@ Requires-Dist: dclab[dcor,export,http,s3,tdms]; extra == "all"
 Provides-Extra: dcor
 Requires-Dist: requests<3,>=2.31.0; extra == "dcor"
 Provides-Extra: export
-Requires-Dist: fcswrite>=0.5.0; extra == "export"
-Requires-Dist: imageio[ffmpeg]; extra == "export"
+Requires-Dist: fcswrite>=0.5.1; extra == "export"
+Requires-Dist: av; extra == "export"
 Provides-Extra: http
 Requires-Dist: requests<3,>=2.31.0; extra == "http"
 Provides-Extra: s3

{dclab-0.62.16.dist-info → dclab-0.63.0.dist-info}/RECORD

@@ -1,21 +1,15 @@
-dclab-0.62.16.dist-info/RECORD,,
-dclab-0.62.16.dist-info/WHEEL,sha256=x8XetLy-k10uSquGK-N4bhz6NlF_qbVGhvBYJhE-zto,134
-dclab-0.62.16.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.16.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.16.dist-info/METADATA,sha256=SvElgJ9evzAOSPVf9kfRkP1d-GR_6EBvQdYi56R9aIo,4777
-dclab-0.62.16.dist-info/licenses/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
-dclab/kde_methods.py,sha256=awlqkj819VRJzArG6Fx6myDa6qGpLoZ8S9IJ1J1YECA,9206
-dclab/_version.py,sha256=MI0jKDrd2fFPrMvMv71SRYVo2YigN9lk8o441qHDsfg,515
-dclab/util.py,sha256=nLL5jwG14h1YFJ_d0L-5DwsWgyfst5hVndaiLbTkYH4,5253
+dclab/kde_methods.py,sha256=f0-zDN7ETintvGB3gSzxwgBb53YtT9jZtzI70EAX50g,365
+dclab/_version.py,sha256=qUSHtJyrJO2OA6sjDKJf6cdVDtLAdHTblziUfydgBcY,513
+dclab/util.py,sha256=HFT5ZQV6AW8GIIruVMldukbVVdlMyKH50GUfOogAcxI,5860
 dclab/downsampling.pyx,sha256=OK7zbgGLl5gVyoU8ZBHo9EWwb8C9ChavmLNEvQvC9T0,7258
-dclab/__init__.py,sha256=1mskJAUo8HbvDhJRJFbcFB6HccFeqoRUCEHLuS64t_g,812
+dclab/__init__.py,sha256=wyJWhElQRPcq09vUqUnuquTU_KHgHxv6wQxuxQ988Iw,1583
 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=K_JnLZMCMWtsyEx5UGl-zrRy7hc5i2ZcGuHVPEJX3wU,258416
+dclab/downsampling.cpython-39-darwin.so,sha256=_vmCrJfOtnZjYGLIkYsa8UuqoSaN_rM_nx1lLL52Q3w,258416
 dclab/statistics.py,sha256=tJDqPlY_Jw2Hhl-s7ugMBSZAxcRuPu4LQuBAZBXz7t8,6355
-dclab/kde_contours.py,sha256=5K7PzZz-FtSGvW4IR2tLpbEKKqCSsSTQPsupu7zIsPg,6745
+dclab/kde_contours.py,sha256=UlU64lrzMQUZH11oZndW7xf7NFCzwP3FcVujwuqXDCI,278
 dclab/isoelastics/iso_LE-2D-FEM-19-volume-deform.txt,sha256=vTcazOlOXo3BQ0NQtGB_IdHKA0neOLXZ_d3JuMU--RE,83358
 dclab/isoelastics/iso_HE-3D-FEM-22-area_um-deform.txt,sha256=IjULG1KO-hClaYPoJJnwPbF2TkS9i9jxF1tbhhQTClY,71350
 dclab/isoelastics/iso_HE-2D-FEM-22-volume-deform.txt,sha256=aLOWxev_hvyP2yWquomcogn3Ze4SBfvqz-qmTOOibNw,97512
@@ -53,6 +47,10 @@ dclab/cli/common.py,sha256=uY0IexcvmScB-5AVIQhM9qMutUcSf7CM9tUrgtuawgU,7224
 dclab/cli/task_join.py,sha256=R04ZmXG2-O82E8le0ywZpy9NzOYoErw8hLx8m4q76ms,9464
 dclab/cli/task_split.py,sha256=dqW3GWkwi4ceDqRVrQx8ADGk4--KSsD3Q1knkD3ZXI4,6060
 dclab/cli/task_compress.py,sha256=LH3j41aKq5regAH-ZFdOgnXImf5DrReDJ7ITwUObUSQ,4100
+dclab/kde/contours.py,sha256=WoRqBj_xK-23FZjtaYly7E2Q8sGZ16q2ILq-DmrlmC8,6742
+dclab/kde/methods.py,sha256=SYlAjoST66hEZnRmsdZ6izMmgfebxQxTfBR5PHhzDkE,9208
+dclab/kde/__init__.py,sha256=_WSLPMfxE2su6tmO5mJxUE_9ON16-pqQUQCUlzRtyKI,55
+dclab/kde/base.py,sha256=i6bNYYeQSFlq03Z5CZjhBE-V3xpY6YLWivL3guscsnE,7683
 dclab/external/__init__.py,sha256=gb0UdzoMymEURPsTXRqVTT1ZJedJ2ubH3jApBIRkwjk,93
 dclab/external/packaging/version.py,sha256=9MLL6_EYHvGA1yCGndwL5ZmmDA_wqQsW15GyKrI6siQ,14685
 dclab/external/packaging/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197
@@ -67,17 +65,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=Cy0gDNnjpuGCcnHCzdWZWR_jG-zxlDqkOQjptudXVWg,204152
+dclab/external/skimage/_find_contours_cy.cpython-39-darwin.so,sha256=oFCr6dYmWuUQGo3G1CEdGuHC7dHoKA54JAmM8JrbLC8,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=ksCpY4wl7KZLwjf4Y6qPBTXe_FBCztTnYy3oefUoVUg,221872
+dclab/external/skimage/_pnpoly.cpython-39-darwin.so,sha256=x15yDbF5LgiT2B0WHtd22xgyoLI2Ino2PuTsq1OkGE4,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=vsml-GUrivXAGTkB6-4r5jVyIC1ZivDEKM8kL5ZFsWc,55872
+dclab/external/skimage/_shared/geometry.cpython-39-darwin.so,sha256=MlcLP13xmJTulANkIG6d4oS2GB0gaZ_UF1DrfdMOZcs,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
@@ -92,8 +90,8 @@ dclab/rtdc_dataset/feat_basin.py,sha256=ViKdvJcwFM8joysnrBYdZbA5t_wZix-6xn_Fsvzp
 dclab/rtdc_dataset/fmt_s3.py,sha256=FVw0q3CwiPwDKmz37EsjK2T5CLr4MsH3pvscu-gToVM,11278
 dclab/rtdc_dataset/feat_temp.py,sha256=XbDIS1iUUkRH0Zp9uVlwvK_untJ7hkOnKshK1Drsnt8,3694
 dclab/rtdc_dataset/__init__.py,sha256=MUHSGVQJ4Zc0IyU2lf01dpDWyOyNveHip-UjSkmPNvQ,486
-dclab/rtdc_dataset/core.py,sha256=hho2XD4-s-mag8xtaukf7NC-_XyE8W0dql2wAoGuS3A,37998
-dclab/rtdc_dataset/export.py,sha256=F_HgQUlK9ywINFgYrigPXLxcG-8qgSR5aalHjxNNeMs,29614
+dclab/rtdc_dataset/core.py,sha256=EjNWk9SV-2xBTRtf34XosLCOS164vGWKP5dKKLSOSq4,34441
+dclab/rtdc_dataset/export.py,sha256=NarfazGkPasyRpnhQ2H_riUP-oUq5QL7lG9WwvLCL2o,33121
 dclab/rtdc_dataset/fmt_dict.py,sha256=gumVQOiVVDFUKow_483PY7cxInqo-NiBBnBhIU8s4lg,3009
 dclab/rtdc_dataset/writer.py,sha256=jc6ADyxGoujXpoXu1vF2nfZjGFMaO5LbRmoYJZ83JVo,41418
 dclab/rtdc_dataset/filter.py,sha256=AFPUBzOIi3pqXgUdMQ5CIi9ZeGOKC71rfSZKLMLgtog,10023
@@ -136,3 +134,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.63.0.dist-info/RECORD,,
+dclab-0.63.0.dist-info/WHEEL,sha256=HO9mXbqgM4Go8g994JGCRqzrGrswAcuXl8i0pdN2UG8,134
+dclab-0.63.0.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-0.63.0.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-0.63.0.dist-info/METADATA,sha256=fyrdF3EWf6KgMaS-36SPHc-kW4d6W-O7GBuDVNzbhs4,4755
+dclab-0.63.0.dist-info/licenses/LICENSE,sha256=gLDaVZWRrlnLdyfOrR0qfWjLbOVcjvoJ-kCLUK0fyXA,15360

{dclab-0.62.16.dist-info → dclab-0.63.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: false
 Tag: cp39-cp39-macosx_11_0_arm64
 Generator: delocate 0.13.0

{dclab-0.62.16.dist-info → dclab-0.63.0.dist-info}/licenses/LICENSE

@@ -1,5 +1,5 @@
 Unless otherwise specified by LICENSE files in individual
-directories, all code is
+directories, all code is licensed under the following license.
 
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
@@ -281,63 +281,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {description}
-    Copyright (C) {year}  {fullname}
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  {signature of Ty Coon}, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-