PyPI - dcicutils - Versions diffs - 8.13.3.1b29__tar.gz → 8.14.0__tar.gz - Mend

@@ -1027,7 +1027,7 @@ _TO_NUMBER_MULTIPLIER_SUFFIXES = {
     "GB": _TO_NUMBER_POWER_OF_TEN_FOR_G,
     "T": _TO_NUMBER_POWER_OF_TEN_FOR_T,
     "TB": _TO_NUMBER_POWER_OF_TEN_FOR_T,
-    # B means bytes or bases and BP means base pairs; needs to be last.
+    # B means bytes or bases and BP means base pairs; this needs to be last.
     "B": _TO_NUMBER_POWER_OF_TEN_FOR_NOTHING,
     "BP": _TO_NUMBER_POWER_OF_TEN_FOR_NOTHING
 }
@@ -1093,9 +1093,9 @@ def to_number(value: str,
                 if not value_fraction:
                     return fallback
                 value = "0"
-    elif (as_float is not True) and (value_dot_zero_suffix := re.search(r"\.0*$", value)):
+    elif (as_float is not True) and (value_dot_zeros_suffix := re.search(r"\.0*$", value)):
         # Allow for example "123.00" to mean 123 (int).
-        value = value[:value_dot_zero_suffix.start()]
+        value = value[:value_dot_zeros_suffix.start()]
     if (allow_commas is True) and ("," in value):
         # Make sure any commas are properly placed/spaced.

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

@@ -749,14 +749,16 @@ class Schema(SchemaBase):
     def _map_function_date(self, typeinfo: dict) -> Callable:
         def map_date(value: str, src: Optional[str]) -> str:
-            value = normalize_date_string(value)
-            return value if value is not None else ""
+            if not (parsed_value := normalize_date_string(value)):
+                return value
+            return parsed_value
         return map_date
     def _map_function_datetime(self, typeinfo: dict) -> Callable:
         def map_datetime(value: str, src: Optional[str]) -> str:
-            value = normalize_datetime_string(value)
-            return value if value is not None else ""
+            if not (parsed_value := normalize_datetime_string(value)):
+                return value
+            return parsed_value
         return map_datetime
     def _map_function_ref(self, typeinfo: dict) -> Callable:

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

dcicutils 8.13.3.1b29__tar.gz → 8.14.0__tar.gz