cloud-files 5.8.0__py3-none-any.whl → 5.8.2__py3-none-any.whl

{cloud_files-5.8.0.dist-info → cloud_files-5.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloud-files
-Version: 5.8.0
+Version: 5.8.2
 Summary: Fast access to cloud storage and local FS.
 Home-page: https://github.com/seung-lab/cloud-files/
 Author: William Silversmith

{cloud_files-5.8.0.dist-info → cloud_files-5.8.2.dist-info}/RECORD

@@ -4,10 +4,10 @@ cloudfiles/compression.py,sha256=WXJHnoNLJ_NWyoY9ygZmFA2qMou35_9xS5dzF7-2H-M,626
 cloudfiles/connectionpools.py,sha256=aL8RiSjRepECfgAFmJcz80aJFKbou7hsbuEgugDKwB8,4814
 cloudfiles/exceptions.py,sha256=N0oGQNG-St6RvnT8e5p_yC_E61q2kgAe2scwAL0F49c,843
 cloudfiles/gcs.py,sha256=unqu5KxGKaPq6N4QeHSpCDdtnK1BzPOAerTZ8FLt2_4,3820
-cloudfiles/interfaces.py,sha256=5rUh2DWOVlg13fAxyZ0wAaQyfW04xc2zlUfTItFV-zQ,45325
+cloudfiles/interfaces.py,sha256=M62UdugtWcF-J4iQMClHNDEQYu7xxCSc1aT7WW2C1lU,44942
 cloudfiles/lib.py,sha256=HHjCvjmOjA0nZWSvHGoSeYpxqd6FAG8xk8LM212LAUA,5382
 cloudfiles/monitoring.py,sha256=N5Xq0PYZK1OxoYtwBFsnnfaq7dElTgY8Rn2Ez_I3aoo,20897
-cloudfiles/paths.py,sha256=HOvtdLSIYGwlwvnZt9d_Ez3TXOe7WWd18bZNDpExUDQ,12231
+cloudfiles/paths.py,sha256=FLdShqkOg1XlkHurU9eiKzLadx2JFYG1EmleCpOFsYQ,12229
 cloudfiles/resumable_tools.py,sha256=NyuSoGh1SaP5akrHCpd9kgy2-JruEWrHW9lvJxV7jpE,6711
 cloudfiles/scheduler.py,sha256=ioqBT5bMPCVHEHlnL-SW_wHulxGgjeThiKHlnaDOydo,3831
 cloudfiles/secrets.py,sha256=IuYKHmmvFmQTyG2Zcmbx7e8U2LIv-woG5d8qyOlyCD8,5431
@@ -17,11 +17,11 @@ cloudfiles/typing.py,sha256=f3ZYkNfN9poxhGu5j-P0KCxjCCqSn9HAg5KiIPkjnCg,416
 cloudfiles_cli/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
 cloudfiles_cli/__init__.py,sha256=Wftt3R3F21QsHtWqx49ODuqT9zcSr0em7wk48kcH0WM,29
 cloudfiles_cli/cloudfiles_cli.py,sha256=JlP9ocqxZbMANAZhZCQSvvjwe6syovQ1asUzSeAlNYk,38459
-cloud_files-5.8.0.dist-info/AUTHORS,sha256=BFVmobgAhaVFI5fqbuqAY5XmBQxe09ZZAsAOTy87hKQ,318
-cloud_files-5.8.0.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
-cloud_files-5.8.0.dist-info/METADATA,sha256=uXp_MHaSxsZl91_w6JH5AK57J0NrpGg0i5Wj5GstvYQ,30530
-cloud_files-5.8.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cloud_files-5.8.0.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
-cloud_files-5.8.0.dist-info/pbr.json,sha256=dhdn7QTnwpurvm9-sKoKO96OpKHfH64LwrYqVj-oPTs,46
-cloud_files-5.8.0.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
-cloud_files-5.8.0.dist-info/RECORD,,
+cloud_files-5.8.2.dist-info/AUTHORS,sha256=BFVmobgAhaVFI5fqbuqAY5XmBQxe09ZZAsAOTy87hKQ,318
+cloud_files-5.8.2.dist-info/LICENSE,sha256=Jna4xYE8CCQmaxjr5Fs-wmUBnIQJ1DGcNn9MMjbkprk,1538
+cloud_files-5.8.2.dist-info/METADATA,sha256=iMhQdNleZM5bNnHKDZ97QNjVuA-7GIWIMHa_wZtePLU,30530
+cloud_files-5.8.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cloud_files-5.8.2.dist-info/entry_points.txt,sha256=xlirb1FVhn1mbcv4IoyMEGumDqKOA4VMVd3drsRQxIg,51
+cloud_files-5.8.2.dist-info/pbr.json,sha256=geeaELiKgs-Cl3LBIxRry_acNuF2kxgqEmZPNhjainY,46
+cloud_files-5.8.2.dist-info/top_level.txt,sha256=xPyrST3okJbsmdCF5IC2gYAVxg_aD5AYVTnNo8UuoZU,26
+cloud_files-5.8.2.dist-info/RECORD,,

cloud_files-5.8.2.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "99528f8", "is_release": true}

cloudfiles/interfaces.py

@@ -798,6 +798,7 @@ class GoogleCloudStorageInterface(StorageInterface):
       except google.cloud.exceptions.NotFound:
         pass
 
+
   @retry
   def list_files(self, prefix, flat=False):
     """
@@ -817,33 +818,22 @@ class GoogleCloudStorageInterface(StorageInterface):
       delimiter=delimiter,
     )
 
-    first = True
-    for blob in blobs:
-      # This awkward construction is necessary
-      # because the request that populates prefixes 
-      # isn't made until the iterator is activated.
-      if first and blobs.prefixes:
+    for page in blobs.pages:
+      if page.prefixes:
         yield from (
           item.removeprefix(path)
-          for item in blobs.prefixes
+          for item in page.prefixes
         )
-        first = False
 
-      filename = blob.name.removeprefix(layer_path)
-      if not filename:
-        continue
-      elif not flat and filename[-1] != '/':
-        yield filename
-      elif flat and '/' not in blob.name.removeprefix(path):
-        yield filename
+      for blob in page:
+        filename = blob.name.removeprefix(layer_path)
+        if not filename:
+          continue
+        elif not flat and filename[-1] != '/':
+          yield filename
+        elif flat and '/' not in blob.name.removeprefix(path):
+          yield filename
 
-    # When there are no regular items at this level
-    # we need to still print the directories.
-    if first and blobs.prefixes:
-      yield from (
-        item.removeprefix(path)
-        for item in blobs.prefixes
-      )
 
   def release_connection(self):
     global GC_POOL

cloudfiles/paths.py

@@ -22,7 +22,7 @@ PRECOMPUTED_SUFFIX = '|neuroglancer-precomputed:'
 
 ALIAS_FILE = os.path.join(CLOUD_FILES_DIR, "aliases.json")
 OFFICIAL_ALIASES = {
-  "nokura": "s3://https://nokura.pni.princeton.edu/",
+  "nokura": "s3://https://c10s.pni.princeton.edu/",
   "matrix": "s3://https://s3-hpcrc.rc.princeton.edu/",
   "tigerdata": "s3://https://td.princeton.edu/",
 }

cloud_files-5.8.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "9e3fa7f", "is_release": true}