elements 3.9.2__tar.gz → 3.9.4__tar.gz

{elements-3.9.2/elements.egg-info → elements-3.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: elements
-Version: 3.9.2
+Version: 3.9.4
 Summary: Building blocks for productive research.
 Home-page: http://github.com/danijar/elements
 Classifier: Intended Audience :: Science/Research

{elements-3.9.2 → elements-3.9.4}/elements/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.9.2'
+__version__ = '3.9.4'
 
 from .agg import Agg
 from .checkpoint import Checkpoint, Saveable

{elements-3.9.2 → elements-3.9.4}/elements/path.py

@@ -1,4 +1,3 @@
-import contextlib
 import fnmatch
 import glob as globlib
 import os
@@ -282,9 +281,9 @@ class GCSPath(Path):
   def open(self, mode='r'):
     assert self.blob, 'is a directory'
     if 'w' in mode:
-      return self.blob.open(mode, chunk_size=1024 * 1024, ignore_flush=True)
+      return self.blob.open(mode, ignore_flush=True)
     else:
-      return self.blob.open(mode, chunk_size=1024 * 1024)
+      return self.blob.open(mode)
 
   def read(self, mode='r'):
     assert self.blob, 'is a directory'
@@ -345,7 +344,8 @@ class GCSPath(Path):
           else:
             folders.append(child)
     results = [x.rstrip('/') for x in folders + filenames]
-    results = sorted(fnmatch.filter(results, prefix + pattern.rstrip('/')))
+    results = fnmatch.filter(results, prefix + pattern.rstrip('/'))
+    results = sorted(set(results))
     return [type(self)(f'gs://{self.bucket.name}/{x}') for x in results]
 
   def exists(self):
@@ -384,9 +384,14 @@ class GCSPath(Path):
     folder.upload_from_string(b'')
 
   def remove(self, recursive=False):
+    isdir = self.isdir()
     if recursive:
+      from google.cloud import storage
+      assert isdir
       for child in self.glob('**'):
         child.remove()
+    if isdir:
+      storage.Blob(self.blob.name + '/', self.bucket).delete()
     else:
       self.blob.delete(self.client)
 

{elements-3.9.2 → elements-3.9.4/elements.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: elements
-Version: 3.9.2
+Version: 3.9.4
 Summary: Building blocks for productive research.
 Home-page: http://github.com/danijar/elements
 Classifier: Intended Audience :: Science/Research