dcicutils 8.13.3.1b29__py3-none-any.whl → 8.14.0__py3-none-any.whl

dcicutils/misc_utils.py

@@ -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.

dcicutils/structured_data.py

@@ -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:

{dcicutils-8.13.3.1b29.dist-info → dcicutils-8.14.0.dist-info}/METADATA

@@ -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

{dcicutils-8.13.3.1b29.dist-info → dcicutils-8.14.0.dist-info}/RECORD

@@ -45,7 +45,7 @@ dcicutils/license_policies/park-lab-gpl-pipeline.jsonc,sha256=vLZkwm3Js-kjV44nug
 dcicutils/license_policies/park-lab-pipeline.jsonc,sha256=9qlY0ASy3iUMQlr3gorVcXrSfRHnVGbLhkS427UaRy4,283
 dcicutils/license_utils.py,sha256=2Yxnh1T1iuMe6wluwbvpFO_zYSGPxB4-STAMc-vz-YM,47202
 dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
-dcicutils/misc_utils.py,sha256=yoccfuCRlHOky31ljxtMDugrNE4QHqaweGWOWjWHI94,115922
+dcicutils/misc_utils.py,sha256=mO-5i0IUZ2U-P7rnQcC9VURzQ35pz7jFsMZdq6BB_QM,115929
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=Az3n1aL-PQkN5gOFE6ZqC2XkYsqiwKlq7-tZggs1QN4,11062
@@ -66,7 +66,7 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
-dcicutils/structured_data.py,sha256=LN-Bn-RUM_jy0T6s-ovZT9QXDsQ8w1_QVtkb8LAHFs4,66119
+dcicutils/structured_data.py,sha256=CF2lBrHmMR72B_tVHVaJGwxbX3G_08G4u1BhfZu9GdM,66169
 dcicutils/submitr/progress_constants.py,sha256=5bxyX77ql8qEJearfHEvsvXl7D0GuUODW0T65mbRmnE,2895
 dcicutils/submitr/ref_lookup_strategy.py,sha256=VJN-Oo0LLna6Vo2cu47eC-eU-yUC9NFlQP29xajejVU,4741
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
@@ -75,8 +75,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.13.3.1b29.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.13.3.1b29.dist-info/METADATA,sha256=5o-BDPQAEwMHLLNdu8BR_8Fy2BW7HBj_sidWUUhXcy4,3440
-dcicutils-8.13.3.1b29.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.13.3.1b29.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.13.3.1b29.dist-info/RECORD,,
+dcicutils-8.14.0.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.14.0.dist-info/METADATA,sha256=hgCt8yg5wJE5esuZCuj9uCXfJNS2uqdR_w4ge8xR8CQ,3435
+dcicutils-8.14.0.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.14.0.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.14.0.dist-info/RECORD,,