dcicutils 8.16.6.1b2__tar.gz → 8.16.6.1b4__tar.gz

{dcicutils-8.16.6.1b2 → dcicutils-8.16.6.1b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.16.6.1b2
+Version: 8.16.6.1b4
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.16.6.1b2 → dcicutils-8.16.6.1b4}/dcicutils/data_readers.py

@@ -31,15 +31,22 @@ class RowReader(abc.ABC):
         self.open()
 
     def __iter__(self) -> Iterator:
+        header = self._iter_header()
         for row in self.rows:
             self.row_number += 1
             if self.is_comment_row(row):
                 continue
             if self.is_terminating_row(row):
                 break
-            if len(self.header) < len(row):  # Row values beyond what there are headers for are ignored.
+            if len(header) < len(row):  # Row values beyond what there are headers for are ignored.
                 self._warning_extra_values.append(self.row_number)
-            yield {column: self.cell_value(value) for column, value in zip(self.header, row)}
+            yield self._iter_mapper({column: self.cell_value(value) for column, value in zip(header, row)})
+
+    def _iter_header(self) -> List[str]:
+        return self.header
+
+    def _iter_mapper(self, row: dict) -> List[str]:
+        return row
 
     def _define_header(self, header: List[Optional[Any]]) -> None:
         self.header = []

{dcicutils-8.16.6.1b2 → dcicutils-8.16.6.1b4}/dcicutils/misc_utils.py

@@ -1088,7 +1088,10 @@ def to_number(value: str,
         if (dot_index := value.rfind(".")) >= 0:
             if value_fraction := value[dot_index + 1:].strip():
                 if not value_fraction.isdigit():
-                    return fallback
+                    try:
+                        value_fraction = float(value_fraction)
+                    except Exception:
+                        return fallback
             if not (value := value[:dot_index].strip()):
                 if not value_fraction:
                     return fallback

{dcicutils-8.16.6.1b2 → dcicutils-8.16.6.1b4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.16.6.1b2"  # TODO: 8.17.0
+version = "8.16.6.1b4"  # TODO: 8.17.0
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"