dcicutils 8.8.3.1b18__py3-none-any.whl → 8.8.3.1b20__py3-none-any.whl

dcicutils/datetime_utils.py

@@ -235,8 +235,8 @@ def format_datetime(value: datetime,
                         return value.strftime(f"%Y-%m-%d")
                     else:
                         return value.strftime(f"%Y-%m-%dT%H:%M")
-                tz = value.strftime("%z")
-                tz = tz[:3] + ":" + tz[3:]
+                if len(tz := value.strftime("%z")) > 3:
+                    tz = tz[:3] + ":" + tz[3:]
                 if nodate is True:
                     return value.strftime(f"%H:%M") + tz
                 elif notime is True:
@@ -244,7 +244,11 @@ def format_datetime(value: datetime,
                 else:
                     return value.strftime(f"%Y-%m-%dT%H:%M") + tz
             if nodate is True:
-                return value.strftime(f"%H:%M:%S{f'.%f' if ms is True else ''}")
+                if (not (notz is True)) and len(tz := value.strftime("%z")) > 3:
+                    tz = tz[:3] + ":" + tz[3:]
+                else:
+                    tz = ""
+                return value.strftime(f"%H:%M:%S{f'.%f' if ms is True else ''}") + tz
             elif notime is True:
                 return value.strftime(f"%Y-%m-%d")
             else:
@@ -278,21 +282,20 @@ def format_datetime(value: datetime,
 
 def format_date(value: datetime,
                 utc: bool = False,
-                iso: bool = False,
                 tz: Optional[Union[timezone, bool]] = None,
                 verbose: bool = False,
                 noday: bool = False) -> str:
-    return format_datetime(value, utc=utc, iso=iso, tz=tz, verbose=verbose, noday=noday, notime=True)
+    return format_datetime(value, utc=utc, tz=tz, verbose=verbose, noday=noday, notime=True)
 
 
 def format_time(value: datetime,
                 utc: bool = False,
                 iso: bool = False,
-                ms: bool = False,
                 tz: Optional[Union[timezone, bool]] = None,
+                ms: bool = False,
                 notz: bool = False,
                 noseconds: bool = False,
                 verbose: bool = False,
                 noday: bool = False) -> str:
-    return format_datetime(value, utc=utc, iso=iso, ms=ms, tz=tz, notz=notz,
+    return format_datetime(value, utc=utc, tz=tz, iso=iso, ms=ms, notz=notz,
                            noseconds=noseconds, verbose=verbose, nodate=True)

dcicutils/progress_bar.py

@@ -298,7 +298,7 @@ class ProgressBar:
                 spinc = spina[spini % spinn] if not ("100%|" in text) else "✓" ; spini += 1  # noqa
                 text = replace_first(text, sentinel_internal, f" {spinc}")
                 text = replace_first(text, "%|", "% ◀|")
-                text = remove_extra_trailing_spaces(text)
+                text = remove_extra_trailing_spaces(text) + f"{spinc} "
                 # Another oddity: for the rate sometimes tqdm intermittently prints
                 # something like "1.54s/" rather than "1.54/s"; something to do with
                 # the unit we gave, which is empty; idunno; just replace it here.

{dcicutils-8.8.3.1b18.dist-info → dcicutils-8.8.3.1b20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.3.1b18
+Version: 8.8.3.1b20
 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.8.3.1b18.dist-info → dcicutils-8.8.3.1b20.dist-info}/RECORD

@@ -12,7 +12,7 @@ dcicutils/contribution_utils.py,sha256=vYLS1JUB3sKd24BUxZ29qUBqYeQBLK9cwo8x3k64u
 dcicutils/creds_utils.py,sha256=xrLekD49Ex0GOpL9n7LlJA4gvNcY7txTVFOSYD7LvEU,11113
 dcicutils/data_readers.py,sha256=6EMrY7TjDE8H7bA_TCWtpLQP7slJ0YTL77_dNh6e7sg,7626
 dcicutils/data_utils.py,sha256=k2OxOlsx7AJ6jF-YNlMyGus_JqSUBe4_n1s65Mv1gQQ,3098
-dcicutils/datetime_utils.py,sha256=STFFakdCIwtuRLA1PCbieeXniTPY8Rchg5Psv1CUJ84,13342
+dcicutils/datetime_utils.py,sha256=sM653aw_1zy1qBmfAH-WetCi2Fw9cnFK7FZN_Tg4onI,13499
 dcicutils/deployment_utils.py,sha256=sKv8Jb-_Zw2aH3OAywRlsre-Cqm3a7fEGG3_1PT-r-s,69908
 dcicutils/diff_utils.py,sha256=sQx-yz56DHAcQWOChYbAG3clXu7TbiZKlw-GggeveO0,8118
 dcicutils/docker_utils.py,sha256=30gUiqz7X9rJwSPXTPn4ewjQibUgoSJqhP9o9vn5X-A,1747
@@ -48,7 +48,7 @@ dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmj
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=gDXRgPsRvqCFwbC8WatsuflAxNiigOnqr0Hi93k3AgE,15422
 dcicutils/portal_utils.py,sha256=DYyE5o15GekDgzpJWas9iS7klAYbjJZUPW0G42McArk,30779
-dcicutils/progress_bar.py,sha256=v3BpdWchXmDxgK31r7_I4watQbiLSYrm6O8NuwhGzec,17833
+dcicutils/progress_bar.py,sha256=Ov5plifqRxiAbphrxSx4moZG2mlrZAKRsY_Lo77N9vU,17847
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
 dcicutils/qa_utils.py,sha256=TT0SiJWiuxYvbsIyhK9VO4uV_suxhB6CpuC4qPacCzQ,160208
@@ -72,8 +72,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=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
-dcicutils-8.8.3.1b18.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.8.3.1b18.dist-info/METADATA,sha256=oHwRt6Y-OAWiaArxmykUSHO5-cbV4olDplVGpKjBy6c,3357
-dcicutils-8.8.3.1b18.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.8.3.1b18.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.8.3.1b18.dist-info/RECORD,,
+dcicutils-8.8.3.1b20.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.3.1b20.dist-info/METADATA,sha256=rpjdvqXlMtSdM4yU4yZqkqSf2OaciE0sBAHglJwZoMs,3357
+dcicutils-8.8.3.1b20.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.3.1b20.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.3.1b20.dist-info/RECORD,,