dcicutils 8.8.3.1b19__tar.gz → 8.8.3.1b21__tar.gz

{dcicutils-8.8.3.1b19 → dcicutils-8.8.3.1b21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.3.1b19
+Version: 8.8.3.1b21
 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.1b19 → dcicutils-8.8.3.1b21}/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.1b19 → dcicutils-8.8.3.1b21}/dcicutils/progress_bar.py

@@ -161,6 +161,9 @@ class ProgressBar:
         self.set_total(total, _norefresh=True)
         self.set_progress(progress, _norefresh=True)
         self.set_description(description)
+        self.enable()
+        self._done = False
+        self._bar.reset()
         self._started = time.time()
 
     def done(self, description: Optional[str] = None) -> None:
@@ -311,12 +314,15 @@ class ProgressBar:
             if self._captured_output_for_testing is not None:
                 # For testing only we replace vacilliting values in the out like rate,
                 # time elapsed, and ETA with static values; so that something like this:
-                # > Working /  20% ◀|█████████▌  | 1/5 | 536.00/s | 00:01 | ETA: 00:02
+                # > Working ⣾  20% ◀|█████████▌  | 1/5 | 536.00/s | 00:01 | ETA: 00:02 ⣾
                 # becomes something more static like this after calling this function:
                 # > Working |  20% ◀|### | 1/5 | 0.0/s | 00:00 | ETA: 00:00
                 # This function obviously has intimate knowledge of the output; better here than in tests.
                 def replace_time_dependent_values_with_static(text: str) -> str:
                     blocks = "\u2587|\u2588|\u2589|\u258a|\u258b|\u258c|\u258d|\u258e|\u258f"
+                    if text.endswith("| "):
+                        # In case "|" is in the trailing spinner it messes up regex below.
+                        text = set_nth(text, len(text) - 2, "-")
                     if (n := find_nth_from_end(text, "|", 5)) >= 8:
                         pattern = re.compile(
                             rf"(\s*)(\d*%? ◀\|)(?:\s*{blocks}|#)*\s*(\|\s*\d+/\d+)?(\s*\|\s*)"
@@ -337,12 +343,8 @@ class ProgressBar:
                 sys.stdout.write = sys_stdout_write
         def ascii_spinners() -> list:  # noqa
             # Fun with ASCII spinners.
-            return list("⣾⣽⣻⢿⡿⣟⣯⣷")  # borrowed from rich python package
-            # return list("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏")  # borrowed from rich python package
-            # return list("⠿⠻⠽⠾⠷⠯⠟")
-            # return list("⠏⠛⠹⠼⠶⠧")
-            # return list("⠻⠽⠾⠷⠯⠟")
-            # return list("|/—◦\\")
+            spinner_chars = "⣾⣽⣻⢿⡿⣟⣯⣷"  # borrowed from rich python package (other: ⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏)
+            return (list(spinner_chars[::-1]) * 7) + (list("|/-\\") * 2)
         sys.stdout.write = tidy_stdout_write
         spina = ascii_spinners() ; spini = 0 ; spinn = len(spina)  # noqa
         sentinel = "[progress]" ; sentinel_internal = f"{sentinel}:"  # noqa

{dcicutils-8.8.3.1b19 → dcicutils-8.8.3.1b21}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.8.3.1b19"  # TODO: To become 8.8.4
+version = "8.8.3.1b21"  # 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"