dcicutils 8.8.3.1b18__tar.gz → 8.8.3.1b20__tar.gz

{dcicutils-8.8.3.1b18 → dcicutils-8.8.3.1b20}/PKG-INFO

@@ -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 → dcicutils-8.8.3.1b20}/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-8.8.3.1b18 → dcicutils-8.8.3.1b20}/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 → dcicutils-8.8.3.1b20}/pyproject.toml

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