dclab 0.63.0__cp38-cp38-win_amd64.whl → 0.63.1__cp38-cp38-win_amd64.whl

dclab/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.63.0'
-__version_tuple__ = version_tuple = (0, 63, 0)
+__version__ = version = '0.63.1'
+__version_tuple__ = version_tuple = (0, 63, 1)

dclab/rtdc_dataset/fmt_dcor/api.py

@@ -12,7 +12,7 @@ class DCORAccessError(BaseException):
 class APIHandler:
     """Handles the DCOR api with caching for simple queries"""
     #: these are cached to minimize network usage
-    cache_queries = ["metadata", "size", "feature_list", "valid"]
+    cache_queries = ["basins", "metadata", "size", "feature_list", "valid"]
     #: DCOR API Keys/Tokens in the current session
     api_keys = []
 

dclab/rtdc_dataset/fmt_s3.py

@@ -42,6 +42,27 @@ S3_ACCESS_KEY_ID = os.environ.get("DCLAB_S3_ACCESS_KEY_ID")
 S3_SECRET_ACCESS_KEY = os.environ.get("DCLAB_S3_SECRET_ACCESS_KEY")
 
 
+@functools.lru_cache(maxsize=1000)
+def get_s3_session_client(access_key_id: str,
+                          secret_access_key: str,
+                          use_ssl: bool,
+                          verify_ssl: bool,
+                          endpoint_url: str
+                          ):
+    botocore_session = botocore.session.get_session()
+    s3_session = boto3.Session(
+        aws_access_key_id=access_key_id,
+        aws_secret_access_key=secret_access_key,
+        botocore_session=botocore_session)
+    s3_client = s3_session.client(
+        service_name='s3',
+        use_ssl=use_ssl,
+        verify=verify_ssl,
+        endpoint_url=endpoint_url,
+    )
+    return botocore_session, s3_session, s3_client
+
+
 class S3File(HTTPFile):
     """Monkeypatched `HTTPFile` to support authenticated access to S3"""
     def __init__(self,
@@ -74,17 +95,15 @@ class S3File(HTTPFile):
                 "not specify the full S3 URL or that you forgot to set "
                 "the `S3_ENDPOINT_URL` environment variable.")
         endpoint_url = endpoint_url.strip().rstrip("/")
-        self.botocore_session = botocore.session.get_session()
-        self.s3_session = boto3.Session(
-            aws_access_key_id=access_key_id,
-            aws_secret_access_key=secret_access_key,
-            botocore_session=self.botocore_session)
-        self.s3_client = self.s3_session.client(
-            service_name='s3',
-            use_ssl=use_ssl,
-            verify=verify_ssl,
-            endpoint_url=endpoint_url,
+        self.botocore_session, self.s3_session, self.s3_client = \
+            get_s3_session_client(
+                access_key_id=access_key_id,
+                secret_access_key=secret_access_key,
+                use_ssl=use_ssl,
+                verify_ssl=verify_ssl,
+                endpoint_url=endpoint_url,
             )
+
         # Use a configuration that allows anonymous access
         # https://stackoverflow.com/a/34866092
         if not secret_access_key:

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

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

@@ -1,7 +1,7 @@
 dclab/__init__.py,sha256=kSr6VI0UI-beS9beOEpERTUAV1NINHx_G6u1VmBm9D8,1624
-dclab/_version.py,sha256=fEfH5CgN0B2d7s9-sLi9m1eyhJDqpXxXrA_KEBY8D3Q,534
+dclab/_version.py,sha256=76CR5h7_nIVg-oOXvxErYz2XP9VxuxVIb8vhuU2S0XQ,534
 dclab/cached.py,sha256=t01BYTf43VEsBYa0c-bMxgceF5vKoGV73b42UlLH6Lo,3014
-dclab/downsampling.cp38-win_amd64.pyd,sha256=LWKic3YWJQC7uTnORL2qPzThHI8woaqRD-oIDuj-SBQ,188416
+dclab/downsampling.cp38-win_amd64.pyd,sha256=pk1ju86egK-kFYq4F4AYD9c6MVz3XiPWDbSt_wSY2tY,188416
 dclab/downsampling.pyx,sha256=Ez6MbNbzCUzs2IXXKtAYsjtYqP22kI8hdA1IE-3mqvY,7488
 dclab/http_utils.py,sha256=nneq9Cx8dw8ChQx5oIg2pN0xGkvNWCMSY5VYmttqyXA,11232
 dclab/kde_contours.py,sha256=cYeBtvbBqLHCz5W8AiEAAd9O3yLsSBbLcRVj1WZ1pRo,288
@@ -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.cp38-win_amd64.pyd,sha256=TTl3tIOyWbUDF0GTSlIOUH5FajSG_FiXYr_qgDIPaZ8,143360
+dclab/external/skimage/_find_contours_cy.cp38-win_amd64.pyd,sha256=S7KU5eyLwWoxUS8ObvcuM79h2K4VyqYzdIh8w-9AWbw,143360
 dclab/external/skimage/_find_contours_cy.pyx,sha256=c-EobLhKjZNCpuqWxmvrcH35uAY_Bu-_hZiUHbXODms,7349
-dclab/external/skimage/_pnpoly.cp38-win_amd64.pyd,sha256=o86XPsW8H8CxkuukhQBM09QGDXzfDlLPi9vkPgbPyD8,159232
+dclab/external/skimage/_pnpoly.cp38-win_amd64.pyd,sha256=2UGIuBBXncCMYPSbqDOyDk0hv6D2742OJGeef7xgQR4,159232
 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.cp38-win_amd64.pyd,sha256=IwYcYrV9SQVILzdSSXRWIZuAkQLwyjITEjsY8PGlPgg,21504
+dclab/external/skimage/_shared/geometry.cp38-win_amd64.pyd,sha256=T2WqFHYndXYyWH_LyH7-Vae0jkI-q4HqvcER_p5Cbs0,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
@@ -94,7 +94,7 @@ dclab/rtdc_dataset/feat_temp.py,sha256=5QiF8Nc8MVoTtinYlvfoSuoopND-uvWVWKjMggBTH
 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=8jNTQ-uw4E4xdidEMJBjjLOTx-YUv5NlhHKN6uvDf1Y,11613
+dclab/rtdc_dataset/fmt_s3.py,sha256=yOBrwN6Fwz0EVNolVlPvZggTeIeCHUYYBVb8w1izO3Y,12231
 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
@@ -110,7 +110,7 @@ dclab/rtdc_dataset/feat_anc_plugin/__init__.py,sha256=EN-LAblgBz8GNNymLEdJ7bZhUF
 dclab/rtdc_dataset/feat_anc_plugin/plugin_feature.py,sha256=VMTPaVL_7dzCjqPaCKJQhmnQieq8v6OKHEbLgA4RoIY,12710
 dclab/rtdc_dataset/fmt_dcor/__init__.py,sha256=dpV4ee_GjdSu_GfRCqU7H01U_jlMYYzvbKA5a7kp244,217
 dclab/rtdc_dataset/fmt_dcor/access_token.py,sha256=CMVxEF3-rD3tijamN5VK2mlsxZwZ5pTDD5QsAO9ZVZE,2080
-dclab/rtdc_dataset/fmt_dcor/api.py,sha256=v7xAxZtjPpQiSRq9AgYhrV6I9iM7KpPv38WzSEQuNLY,4356
+dclab/rtdc_dataset/fmt_dcor/api.py,sha256=1XKPpVhxRG5zx9TQmAkthpJsecn6PU32erhnActbSlA,4366
 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
@@ -134,9 +134,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.63.0.dist-info/LICENSE,sha256=Aq3cYb2xLk3Y_aIOhaoZxi8FlVeMVs3-3FMEBvAEixM,15643
-dclab-0.63.0.dist-info/METADATA,sha256=IgmhB8q8AC2VU-oa57dTiAbCMgxPVFFMDQdInN35ugg,4879
-dclab-0.63.0.dist-info/WHEEL,sha256=2M046GvC9RLU1f1TWyM-2sB7cRKLhAC7ucAFK8l8f24,99
-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/RECORD,,
+dclab-0.63.1.dist-info/LICENSE,sha256=Aq3cYb2xLk3Y_aIOhaoZxi8FlVeMVs3-3FMEBvAEixM,15643
+dclab-0.63.1.dist-info/METADATA,sha256=BiGpe-Cni1qoU2_MoDwB6UHOJTgtpcTqx5PrHV9AX6s,4879
+dclab-0.63.1.dist-info/WHEEL,sha256=2M046GvC9RLU1f1TWyM-2sB7cRKLhAC7ucAFK8l8f24,99
+dclab-0.63.1.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-0.63.1.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-0.63.1.dist-info/RECORD,,