dclab 0.62.14__cp38-cp38-macosx_10_9_x86_64.whl → 0.62.16__cp38-cp38-macosx_10_9_x86_64.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.14'
-__version_tuple__ = version_tuple = (0, 62, 14)
+__version__ = version = '0.62.16'
+__version_tuple__ = version_tuple = (0, 62, 16)

dclab/rtdc_dataset/fmt_s3.py

@@ -168,13 +168,19 @@ class RTDC_S3(RTDC_HDF5):
             object_path=get_object_path(url),
             endpoint_url=(endpoint_url
                           or get_endpoint_url(url)
-                          or S3_ENDPOINT_URL),
+                          or S3_ENDPOINT_URL
+                          or os.environ.get("DCLAB_S3_ENDPOINT_URL")
+                          ),
             access_key_id=(access_key_id
                            or S3_ACCESS_KEY_ID
-                           or ""),
+                           or os.environ.get("DCLAB_S3_ACCESS_KEY_ID")
+                           or ""
+                           ),
             secret_access_key=(secret_access_key
                                or S3_SECRET_ACCESS_KEY
-                               or ""),
+                               or os.environ.get("DCLAB_S3_SECRET_ACCESS_KEY")
+                               or ""
+                               ),
             use_ssl=use_ssl,
             verify_ssl=use_ssl,
             )
@@ -236,7 +242,10 @@ def is_s3_object_available(url: str,
     """
     avail = False
     if is_s3_url(url):
-        endpoint_url = get_endpoint_url(url) or S3_ENDPOINT_URL
+        endpoint_url = (get_endpoint_url(url)
+                        or S3_ENDPOINT_URL
+                        or os.environ.get("DCLAB_S3_ENDPOINT_URL")
+                        )
         if not endpoint_url:
             warnings.warn(
                 f"Could not determine endpoint from URL '{url}'. Please "
@@ -260,12 +269,18 @@ def is_s3_object_available(url: str,
                     s3file = S3File(
                         object_path=get_object_path(url),
                         endpoint_url=endpoint_url,
-                        access_key_id=(access_key_id
-                                       or S3_ACCESS_KEY_ID
-                                       or ""),
-                        secret_access_key=(secret_access_key
-                                           or S3_SECRET_ACCESS_KEY
-                                           or ""),
+                        access_key_id=(
+                            access_key_id
+                            or S3_ACCESS_KEY_ID
+                            or os.environ.get("DCLAB_S3_ACCESS_KEY_ID")
+                            or ""
+                            ),
+                        secret_access_key=(
+                            secret_access_key
+                            or S3_SECRET_ACCESS_KEY
+                            or os.environ.get("DCLAB_S3_SECRET_ACCESS_KEY")
+                            or ""
+                            ),
                         )
                     try:
                         s3file.s3_object.load()

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-0.62.14.dist-info → dclab-0.62.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dclab
-Version: 0.62.14
+Version: 0.62.16
 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.14.dist-info → dclab-0.62.16.dist-info}/RECORD

@@ -1,5 +1,11 @@
+dclab-0.62.16.dist-info/RECORD,,
+dclab-0.62.16.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
+dclab-0.62.16.dist-info/WHEEL,sha256=Kx6RWhSVfL88-gHgRuuK5c46fDrxzStSDcWbfEAkrVo,108
+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=EakTVVlHQpxmGL20zZUsMm4bo4CU9Cbwc5sS98_bMFs,4755
 dclab/kde_methods.py,sha256=awlqkj819VRJzArG6Fx6myDa6qGpLoZ8S9IJ1J1YECA,9206
-dclab/_version.py,sha256=XRYJOVRTVlCADg2_TgjmbG5T_76D28phoj0PXxmNXe0,415
+dclab/_version.py,sha256=MI0jKDrd2fFPrMvMv71SRYVo2YigN9lk8o441qHDsfg,515
 dclab/util.py,sha256=nLL5jwG14h1YFJ_d0L-5DwsWgyfst5hVndaiLbTkYH4,5253
 dclab/downsampling.pyx,sha256=OK7zbgGLl5gVyoU8ZBHo9EWwb8C9ChavmLNEvQvC9T0,7258
 dclab/__init__.py,sha256=1mskJAUo8HbvDhJRJFbcFB6HccFeqoRUCEHLuS64t_g,812
@@ -9,7 +15,7 @@ dclab/http_utils.py,sha256=YtZHEwB-BBBo2fCvwhlJvlnWvfWFMHclqol3OIJ7atM,10910
 dclab/polygon_filter.py,sha256=qexmo-rXe06CUPZhN6EMJy4y4B5gXZeqejdvIB2arOE,13480
 dclab/statistics.py,sha256=tJDqPlY_Jw2Hhl-s7ugMBSZAxcRuPu4LQuBAZBXz7t8,6355
 dclab/kde_contours.py,sha256=5K7PzZz-FtSGvW4IR2tLpbEKKqCSsSTQPsupu7zIsPg,6745
-dclab/downsampling.cpython-38-darwin.so,sha256=siCwOdmj4bOzab6OFV1oFpu8n7nUmtreagr4N1PTam4,252224
+dclab/downsampling.cpython-38-darwin.so,sha256=TXMQKMFX2KbROJP-5HiMhm4E96rgbrSmD58OzDjMecU,252224
 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
@@ -64,13 +70,13 @@ dclab/external/skimage/measure.py,sha256=y1idCqD9TUxp3-QnOiWR_d674OKaeqBJ4MN2-gV
 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/_find_contours_cy.cpython-38-darwin.so,sha256=ewfY32rVTf54Unrh_hHhNIKOirtfNhBngPQJjCZkDq4,188360
+dclab/external/skimage/_find_contours_cy.cpython-38-darwin.so,sha256=hcNI9xXjirww2DmORMZrSn5dLcuD3NWX0sWnL6VcAIw,188360
 dclab/external/skimage/__init__.py,sha256=-B2QUKHAFzQuBWuuKvPDC5JIl0Zb-x3OGmbwPaE9VwQ,72
 dclab/external/skimage/_pnpoly.pyx,sha256=Qdn6xPazDschBqbr46DzB75MB2MnqvdnoTSBMK7kUGE,2504
-dclab/external/skimage/_pnpoly.cpython-38-darwin.so,sha256=HzixfPKghiJHPz1B_sqaOPT0gBJILbwcYJ-Cn--sejQ,209672
+dclab/external/skimage/_pnpoly.cpython-38-darwin.so,sha256=IEAJZ038aQLrfgWCkhDDVYjMyPKD_sh0EHQ7e9Q1ckk,209672
 dclab/external/skimage/_find_contours_cy.pyx,sha256=pZJOBhMHzYEMkcz4WQVyjn7jDNrdjCfet47FU1hRAxk,7161
 dclab/external/skimage/_shared/geometry.pxd,sha256=kRsu9ifv_rL3kbRIgSLf86p0hn2oTMp6s013lZ9bBZM,346
-dclab/external/skimage/_shared/geometry.cpython-38-darwin.so,sha256=He0qdTfd24FKz2cUCN0zMBz_FAGEP_jhnAzLVbFt-yo,39320
+dclab/external/skimage/_shared/geometry.cpython-38-darwin.so,sha256=fOsK4CZdIoYYBIA37XNv14KoXaA1SYhUYnnN-DDOjwU,39320
 dclab/external/skimage/_shared/__init__.py,sha256=2sHZwTtJSlMTa3Q2YSvQW7jrPLMUSqDJQa-ROe5zfcw,37
 dclab/external/skimage/_shared/geometry.pyx,sha256=miCHUh6mBDbRRIoaF_0xAER1MRzsCAzFdlYQZhV7RmE,1667
 dclab/definitions/feat_logic.py,sha256=SXsSlAusgtE3uXcPu84dQwYZ07zxmV37DmPednA3_dM,5823
@@ -83,7 +89,7 @@ dclab/rtdc_dataset/config.py,sha256=MvBteFya3R6Ch3U6UgTakCsJoBgVykTxS_Z25STWPHU,
 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/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
@@ -92,7 +98,7 @@ dclab/rtdc_dataset/fmt_dict.py,sha256=gumVQOiVVDFUKow_483PY7cxInqo-NiBBnBhIU8s4l
 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
@@ -130,9 +136,3 @@ 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.14.dist-info/RECORD,,
-dclab-0.62.14.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
-dclab-0.62.14.dist-info/WHEEL,sha256=w6_R5zToL4dhiDH-J5jk0JB_efQ_6KdbwveuTVp2z9A,108
-dclab-0.62.14.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.14.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.14.dist-info/METADATA,sha256=hEQbIKq1Br4L54ZnwOez43PlE3fTE7C5RJC8rg-NQJ8,4755

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

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.3.2)
 Root-Is-Purelib: false
 Tag: cp38-cp38-macosx_10_9_x86_64