Merge pull request #387 from mabel-dev/0.6.13

0.6.13
mabel-dev · Jun 26, 2023 · 37537fa · 37537fa
2 parents 785e0fe + e4f50c8
commit 37537fa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/mabel/data/internals/xmler.py b/mabel/data/internals/xmler.py
@@ -23,8 +23,6 @@ def strip_namespace(entry):
                 strip_namespace(child)
 
 
-
-
 def etree_to_dict(t):
     d = {t.tag: {} if t.attrib else None}
     children = list(t)

diff --git a/mabel/data/readers/internals/base_inner_reader.py b/mabel/data/readers/internals/base_inner_reader.py
@@ -254,13 +254,20 @@ def safe_get_next(lst, item):
                             if len(as_ats) > 0:
                                 as_at = as_ats.pop()
                             else:
-                                return []
-                        get_logger().debug(f"Reading from DataSet frame `{as_at}`")
-                        partitioned_blobs = [
-                            blob
-                            for blob in partitioned_blobs
-                            if (as_at in blob) and ("/frame.complete" not in blob)
-                        ]
+                                as_at = None
+                                break
+                        if as_at is None:
+                            get_logger().error(
+                                f"There are no valid frames at `{partitioned_folder}`"
+                            )
+                            partitioned_blobs = []
+                        else:
+                            get_logger().debug(f"Reading from DataSet frame `{as_at}`")
+                            partitioned_blobs = [
+                                blob
+                                for blob in partitioned_blobs
+                                if (as_at in blob) and ("/frame.complete" not in blob)
+                            ]
 
                     blobs += partitioned_blobs
 

diff --git a/mabel/utils/paths.py b/mabel/utils/paths.py
@@ -67,8 +67,6 @@ def date_format(path_string: str, date: datetime.date = None):
     return path_string
 
 
-
-
 def silent_remove(filename):
     try:
         os.remove(filename)

diff --git a/mabel/version.py b/mabel/version.py
@@ -1,6 +1,6 @@
 # Store the version here so:
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
-__version__ = "0.6.12"
+__version__ = "0.6.13"
 
 # nodoc - don't add to the documentation wiki
diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,6 @@ bitarray
 cython
 lz4
 orjson
-orso
 pydantic
 siphashc
 zstandard