cs-progress 20250325__tar.gz → 20250412__tar.gz

{cs_progress-20250325 → cs_progress-20250412}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs-progress
-Version: 20250325
+Version: 20250412
 Summary: A progress tracker with methods for throughput, ETA and update notification; also a compound progress meter composed from other progress meters.
 Keywords: python2,python3
 Author-email: Cameron Simpson <cs@cskk.id.au>
@@ -30,8 +30,8 @@ Project-URL: Source, https://github.com/cameron-simpson/css/blob/main/lib/python
 A progress tracker with methods for throughput, ETA and update notification;
 also a compound progress meter composed from other progress meters.
 
-*Latest release 20250325*:
-BaseProgress.iterbar: use @uses_runstate, accept a runstate parameter overridable by the cancelled param.
+*Latest release 20250412*:
+Bugfix progressbar: fix early return if no active Upd.
 
 Module contents:
 - <a name="auto_progressbar"></a>`auto_progressbar(*da, **dkw)`: Decorator for a function accepting an optional `progress`
@@ -78,7 +78,7 @@ if its position is less than `int(other)`.
 Construct a progress arrow representing completion
 to fit in the specified `width`.
 
-*`BaseProgress.bar(*a, upd: Optional[cs.upd.Upd] = <function uses_upd.<locals>.<lambda> at 0x108fe25c0>, **kw)`*:
+*`BaseProgress.bar(*a, upd: Optional[cs.upd.Upd] = <function uses_upd.<locals>.<lambda> at 0x10c191da0>, **kw)`*:
 A context manager to create and withdraw a progress bar.
 It returns the `UpdProxy` which displays the progress bar.
 
@@ -125,7 +125,7 @@ If `remaining_time` is `None`, this is also `None`.
 Format `value` accoridng to `scale` and `max_parts`
 using `cs.units.transcribe`.
 
-*`BaseProgress.iterbar(self, it, label=None, *, itemlenfunc=None, incfirst=False, update_period=0.3, cancelled=None, runstate: Optional[cs.resources.RunState] = <function uses_runstate.<locals>.<lambda> at 0x108fe2a20>, **bar_kw)`*:
+*`BaseProgress.iterbar(self, it, label=None, *, itemlenfunc=None, incfirst=False, update_period=0.3, cancelled=None, runstate: Optional[cs.resources.RunState] = <function uses_runstate.<locals>.<lambda> at 0x10c192200>, **bar_kw)`*:
 An iterable progress bar: a generator yielding values
 from the iterable `it` while updating a progress bar.
 
@@ -433,7 +433,7 @@ Record more progress.
 >>> P.update(12)
 >>> P.position
 12
-- <a name="progressbar"></a>`progressbar(*a, upd: Optional[cs.upd.Upd] = <function uses_upd.<locals>.<lambda> at 0x109134540>, **kw)`: Convenience function to construct and run a `Progress.iterbar`
+- <a name="progressbar"></a>`progressbar(*a, upd: Optional[cs.upd.Upd] = <function uses_upd.<locals>.<lambda> at 0x10c193c40>, **kw)`: Convenience function to construct and run a `Progress.iterbar`
   wrapping the iterable `it`,
   issuing and withdrawing a progress bar during the iteration.
 
@@ -461,6 +461,9 @@ Record more progress.
 
 
 
+*Release 20250412*:
+Bugfix progressbar: fix early return if no active Upd.
+
 *Release 20250325*:
 BaseProgress.iterbar: use @uses_runstate, accept a runstate parameter overridable by the cancelled param.
 

{cs_progress-20250325 → cs_progress-20250412}/pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
 ]
-version = "20250325"
+version = "20250412"
 
 [project.license]
 text = "GNU General Public License v3 or later (GPLv3+)"
@@ -45,8 +45,8 @@ text = """
 A progress tracker with methods for throughput, ETA and update notification;
 also a compound progress meter composed from other progress meters.
 
-*Latest release 20250325*:
-BaseProgress.iterbar: use @uses_runstate, accept a runstate parameter overridable by the cancelled param.
+*Latest release 20250412*:
+Bugfix progressbar: fix early return if no active Upd.
 
 Module contents:
 - <a name=\"auto_progressbar\"></a>`auto_progressbar(*da, **dkw)`: Decorator for a function accepting an optional `progress`
@@ -93,7 +93,7 @@ if its position is less than `int(other)`.
 Construct a progress arrow representing completion
 to fit in the specified `width`.
 
-*`BaseProgress.bar(*a, upd: Optional[cs.upd.Upd] = <function uses_upd.<locals>.<lambda> at 0x108fe25c0>, **kw)`*:
+*`BaseProgress.bar(*a, upd: Optional[cs.upd.Upd] = <function uses_upd.<locals>.<lambda> at 0x10c191da0>, **kw)`*:
 A context manager to create and withdraw a progress bar.
 It returns the `UpdProxy` which displays the progress bar.
 
@@ -140,7 +140,7 @@ If `remaining_time` is `None`, this is also `None`.
 Format `value` accoridng to `scale` and `max_parts`
 using `cs.units.transcribe`.
 
-*`BaseProgress.iterbar(self, it, label=None, *, itemlenfunc=None, incfirst=False, update_period=0.3, cancelled=None, runstate: Optional[cs.resources.RunState] = <function uses_runstate.<locals>.<lambda> at 0x108fe2a20>, **bar_kw)`*:
+*`BaseProgress.iterbar(self, it, label=None, *, itemlenfunc=None, incfirst=False, update_period=0.3, cancelled=None, runstate: Optional[cs.resources.RunState] = <function uses_runstate.<locals>.<lambda> at 0x10c192200>, **bar_kw)`*:
 An iterable progress bar: a generator yielding values
 from the iterable `it` while updating a progress bar.
 
@@ -448,7 +448,7 @@ Record more progress.
 >>> P.update(12)
 >>> P.position
 12
-- <a name=\"progressbar\"></a>`progressbar(*a, upd: Optional[cs.upd.Upd] = <function uses_upd.<locals>.<lambda> at 0x109134540>, **kw)`: Convenience function to construct and run a `Progress.iterbar`
+- <a name=\"progressbar\"></a>`progressbar(*a, upd: Optional[cs.upd.Upd] = <function uses_upd.<locals>.<lambda> at 0x10c193c40>, **kw)`: Convenience function to construct and run a `Progress.iterbar`
   wrapping the iterable `it`,
   issuing and withdrawing a progress bar during the iteration.
 
@@ -476,6 +476,9 @@ Record more progress.
 
 
 
+*Release 20250412*:
+Bugfix progressbar: fix early return if no active Upd.
+
 *Release 20250325*:
 BaseProgress.iterbar: use @uses_runstate, accept a runstate parameter overridable by the cancelled param.
 

{cs_progress-20250325 → cs_progress-20250412}/src/cs/progress.py

@@ -38,7 +38,7 @@ from cs.units import (
 )
 from cs.upd import Upd, uses_upd, print  # pylint: disable=redefined-builtin
 
-__version__ = '20250325'
+__version__ = '20250412'
 
 DISTINFO = {
     'keywords': ["python2", "python3"],
@@ -1071,15 +1071,16 @@ def progressbar(
               ... do something with row ...
   '''
   if upd is None or upd.disabled:
-    return it
-  if total is None:
-    try:
-      total = len(it)
-    except TypeError:
-      total = None
-  yield from Progress(
-      name=label, position=position, total=total, units_scale=units_scale
-  ).iterbar(it, **iterbar_kw)
+    yield from it
+  else:
+    if total is None:
+      try:
+        total = len(it)
+      except TypeError:
+        total = None
+    yield from Progress(
+        name=label, position=position, total=total, units_scale=units_scale
+    ).iterbar(it, **iterbar_kw)
 
 @decorator
 def auto_progressbar(func, label=None, report_print=False):