dcicutils 8.8.3.1b24__tar.gz → 8.8.3.1b27__tar.gz

{dcicutils-8.8.3.1b24 → dcicutils-8.8.3.1b27}/PKG-INFO

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

@@ -133,7 +133,7 @@ class ProgressBar:
                 if not _norefresh:
                     self._bar.refresh()
 
-    def increment_progress(self, value: int) -> None:
+    def increment_progress(self, value: int = 1) -> None:
         if isinstance(value, int) and value > 0:
             if (self._bar is not None) or self._initialize():
                 self._bar.update(value)
@@ -300,12 +300,11 @@ class ProgressBar:
                 return
             if sentinel_internal in text:
                 spinc = spina[spini % spinn] if not ("100%|" in text) else "✓"
-                if last_spin_change_time is None or ((now - last_spin_change_time) >= 0.05):
+                if last_spin_change_time is None or ((now - last_spin_change_time) >= 0.06):
                     spini += 1
                     last_spin_change_time = now
                 text = replace_first(text, sentinel_internal, f" {spinc}")
                 text = replace_first(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.
@@ -324,9 +323,6 @@ class ProgressBar:
                 # 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*)"
@@ -349,14 +345,25 @@ class ProgressBar:
             # Fun with ASCII spinner characters.
             # Dots borrowed from "rich" python package (others: ⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏).
             # Others: "◴◷◶◵" "◰◳◲◱" "◡⊙◠" "⠁⠂⠄⡀⢀⠠⠐⠈" "▁▃▄▅▆▇█▇▆▅▄▃" "◢◣◤◥" "◐◓◑◒" "✶✸✹✺✹✷" "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏"
-            spinner_chars_a = "⣾⣽⣻⢿⡿⣟⣯⣷"
-            spinner_chars_b = "|/—\\"
-            spinner_chars_c = "◰◳◲◱"
-            spinner_chars_d = "◐◓◑◒"
-            spinner_chars_e = "◴◷◶◵"
-            return ((list(spinner_chars_a[::-1]) * 18) +
-                    (list(spinner_chars_b) * 3) + (list(spinner_chars_c) * 3) +
-                    (list(spinner_chars_d) * 3) + (list(spinner_chars_e) * 3))
+            spinner_chars_a = list("⣾⣽⣻⢿⡿⣟⣯⣷"[::-1]) * 8
+            spinner_chars_b = list("⠋⠙⠹⠸⢰⣰⣠⣄⣆⡆⡖⠖⠚⠙⠋⠏⠇⡆⣆⣄⣠⣰⢰⢲⠲")
+            spinner_chars_c = list("⣀⣤⣶⣿⣶⣤")
+            spinner_chars_d = list("⡀⡄⡆⠇⠋⠙⠸⢰⢠⢀⢠⢰⠸⠙⠋⠇⡆⡄")
+            spinner_chars_e = list("⠀⡀⠄⠂⠁⠈⠐⠠⢀⣀⢄⢂⢁⢈⢐⢠⣠⢤⢢⢡⢨⢰⣰⢴⢲⢱⢸⣸⢼⢺⢹⣹⢽⢻⣻⢿⣿⣶⣤⣀")
+            spinner_chars_f = list("⠉⠒⠤⣀⠤⠒")
+            spinner_chars_g = list("⠋⠙⠹⠸⢰⣰⣠⣄⣆⡆⠇⠏")
+            spinner_chars_h = list("⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⢤⣠⣀⢀⢀⣀⣠⢤⠤⠄⠄⠤⠴⠲⠒⠂⠂⠒⠚⠙⠉⠁")
+            spinner_chars_i = list("◐◓◑◒")
+            spinner_chars_j = list("|/—*—\\")
+            return (spinner_chars_a + (spinner_chars_b * 2) +
+                    spinner_chars_a + (spinner_chars_c * 4) +
+                    spinner_chars_a + (spinner_chars_d * 2) +
+                    spinner_chars_a + (spinner_chars_e * 2) +
+                    spinner_chars_a + (spinner_chars_f * 4) +
+                    spinner_chars_a + (spinner_chars_g * 5) +
+                    spinner_chars_a + (spinner_chars_h * 2) +
+                    spinner_chars_a + (spinner_chars_i * 5) +
+                    spinner_chars_a + (spinner_chars_j * 4))
         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.1b24 → dcicutils-8.8.3.1b27}/pyproject.toml

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