From: Edward Betts Date: Mon, 14 Jul 2025 10:53:04 +0200 Subject: Rename library to progressbar2 --- README.rst | 60 ++++---- docs/conf.py | 2 +- docs/usage.rst | 26 ++-- examples.py | 282 +++++++++++++++++----------------- progressbar/__main__.py | 20 +-- progressbar/bar.py | 40 ++--- progressbar/terminal/colors.py | 2 +- progressbar/terminal/stream.py | 2 +- progressbar/utils.py | 2 +- tests/conftest.py | 4 +- tests/original_examples.py | 2 +- tests/test_algorithms.py | 2 +- tests/test_backwards_compatibility.py | 10 +- tests/test_color.py | 40 ++--- tests/test_custom_widgets.py | 38 ++--- tests/test_data.py | 4 +- tests/test_data_transfer_bar.py | 6 +- tests/test_dill_pickle.py | 4 +- tests/test_empty.py | 6 +- tests/test_end.py | 14 +- tests/test_failure.py | 40 ++--- tests/test_flush.py | 4 +- tests/test_iterators.py | 24 +-- tests/test_job_status.py | 6 +- tests/test_large_values.py | 6 +- tests/test_misc.py | 2 +- tests/test_monitor_progress.py | 18 +-- tests/test_multibar.py | 58 +++---- tests/test_progressbar.py | 14 +- tests/test_progressbar_command.py | 2 +- tests/test_samples.py | 10 +- tests/test_speed.py | 4 +- tests/test_stream.py | 38 ++--- tests/test_terminal.py | 42 ++--- tests/test_timed.py | 40 ++--- tests/test_timer.py | 8 +- tests/test_unicode.py | 6 +- tests/test_unknown_length.py | 18 +-- tests/test_utils.py | 66 ++++---- tests/test_widgets.py | 188 +++++++++++------------ tests/test_windows.py | 12 +- tests/test_with.py | 8 +- tests/test_wrappingio.py | 2 +- 43 files changed, 591 insertions(+), 591 deletions(-) diff --git a/README.rst b/README.rst index ec4f7b9..06b4385 100644 --- a/README.rst +++ b/README.rst @@ -106,9 +106,9 @@ Wrapping an iterable .. code:: python import time - import progressbar + import progressbar2 - for i in progressbar.progressbar(range(100)): + for i in progressbar2.progressbar(range(100)): time.sleep(0.02) Progressbars with logging @@ -116,7 +116,7 @@ Progressbars with logging Progressbars with logging require `stderr` redirection _before_ the `StreamHandler` is initialized. To make sure the `stderr` stream has been -redirected on time make sure to call `progressbar.streams.wrap_stderr()` before +redirected on time make sure to call `progressbar2.streams.wrap_stderr()` before you initialize the `logger`. One option to force early initialization is by using the `WRAP_STDERR` @@ -130,9 +130,9 @@ If you need to flush manually while wrapping, you can do so using: .. code:: python - import progressbar + import progressbar2 - progressbar.streams.flush() + progressbar2.streams.flush() In most cases the following will work as well, as long as you initialize the `StreamHandler` after the wrapping has taken place. @@ -141,12 +141,12 @@ In most cases the following will work as well, as long as you initialize the import time import logging - import progressbar + import progressbar2 - progressbar.streams.wrap_stderr() + progressbar2.streams.wrap_stderr() logging.basicConfig() - for i in progressbar.progressbar(range(10)): + for i in progressbar2.progressbar(range(10)): logging.error('Got %d', i) time.sleep(0.2) @@ -159,7 +159,7 @@ Multiple (threaded) progressbars import threading import time - import progressbar + import progressbar2 BARS = 5 N = 50 @@ -175,7 +175,7 @@ Multiple (threaded) progressbars bar.print('random message for bar', bar, i) - with progressbar.MultiBar() as multibar: + with progressbar2.MultiBar() as multibar: for i in range(BARS): # Get a progressbar bar = multibar[f'Thread label here {i}'] @@ -187,9 +187,9 @@ Context wrapper .. code:: python import time - import progressbar + import progressbar2 - with progressbar.ProgressBar(max_value=10) as bar: + with progressbar2.ProgressBar(max_value=10) as bar: for i in range(10): time.sleep(0.1) bar.update(i) @@ -199,9 +199,9 @@ Combining progressbars with print output .. code:: python import time - import progressbar + import progressbar2 - for i in progressbar.progressbar(range(100), redirect_stdout=True): + for i in progressbar2.progressbar(range(100), redirect_stdout=True): print('Some text', i) time.sleep(0.1) @@ -210,9 +210,9 @@ Progressbar with unknown length .. code:: python import time - import progressbar + import progressbar2 - bar = progressbar.ProgressBar(max_value=progressbar.UnknownLength) + bar = progressbar2.ProgressBar(max_value=progressbar2.UnknownLength) for i in range(20): time.sleep(0.1) bar.update(i) @@ -222,14 +222,14 @@ Bar with custom widgets .. code:: python import time - import progressbar + import progressbar2 widgets=[ - ' [', progressbar.Timer(), '] ', - progressbar.Bar(), - ' (', progressbar.ETA(), ') ', + ' [', progressbar2.Timer(), '] ', + progressbar2.Bar(), + ' (', progressbar2.ETA(), ') ', ] - for i in progressbar.progressbar(range(20), widgets=widgets): + for i in progressbar2.progressbar(range(20), widgets=widgets): time.sleep(0.1) Bar with wide Chinese (or other multibyte) characters @@ -239,7 +239,7 @@ Bar with wide Chinese (or other multibyte) characters # vim: fileencoding=utf-8 import time - import progressbar + import progressbar2 def custom_len(value): @@ -256,12 +256,12 @@ Bar with wide Chinese (or other multibyte) characters return total - bar = progressbar.ProgressBar( + bar = progressbar2.ProgressBar( widgets=[ '进度: ', - progressbar.Bar(), + progressbar2.Bar(), ' ', - progressbar.Counter(format='%(value)02d/%(max_value)d'), + progressbar2.Counter(format='%(value)02d/%(max_value)d'), ], len_func=custom_len, ) @@ -277,7 +277,7 @@ Showing multiple independent progress bars in parallel import sys import time - import progressbar + import progressbar2 BARS = 5 N = 100 @@ -287,7 +287,7 @@ Showing multiple independent progress bars in parallel bars = [] for i in range(BARS): bars.append( - progressbar.ProgressBar( + progressbar2.ProgressBar( max_value=N, # We add 1 to the line offset to account for the `print_fd` line_offset=i + 1, @@ -296,7 +296,7 @@ Showing multiple independent progress bars in parallel ) # Create a file descriptor for regular printing as well - print_fd = progressbar.LineOffsetStreamWrapper(lines=0, stream=sys.stdout) + print_fd = progressbar2.LineOffsetStreamWrapper(lines=0, stream=sys.stdout) # The progress bar updates, normally you would do something useful here for i in range(N * BARS): @@ -325,7 +325,7 @@ Naturally we can do this from separate threads as well: import threading import time - import progressbar + import progressbar2 BARS = 5 N = 100 @@ -333,7 +333,7 @@ Naturally we can do this from separate threads as well: # Create the bars with the given line offset bars = [] for line_offset in range(BARS): - bars.append(progressbar.ProgressBar(line_offset=line_offset, max_value=N)) + bars.append(progressbar2.ProgressBar(line_offset=line_offset, max_value=N)) class Worker(threading.Thread): diff --git a/docs/conf.py b/docs/conf.py index a769e40..0501e0f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,7 +20,7 @@ import sys # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.insert(0, os.path.abspath('..')) -from progressbar import __about__ as metadata +from progressbar2 import __about__ as metadata # -- General configuration ----------------------------------------------- diff --git a/docs/usage.rst b/docs/usage.rst index 6aa0330..b6a86c7 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -10,9 +10,9 @@ Wrapping an iterable :: import time - import progressbar + import progressbar2 - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() for i in bar(range(100)): time.sleep(0.02) @@ -21,9 +21,9 @@ Context wrapper :: import time - import progressbar + import progressbar2 - with progressbar.ProgressBar(max_value=10) as bar: + with progressbar2.ProgressBar(max_value=10) as bar: for i in range(10): time.sleep(0.1) bar.update(i) @@ -33,9 +33,9 @@ Combining progressbars with print output :: import time - import progressbar + import progressbar2 - bar = progressbar.ProgressBar(redirect_stdout=True) + bar = progressbar2.ProgressBar(redirect_stdout=True) for i in range(100): print 'Some text', i time.sleep(0.1) @@ -46,9 +46,9 @@ Progressbar with unknown length :: import time - import progressbar + import progressbar2 - bar = progressbar.ProgressBar(max_value=progressbar.UnknownLength) + bar = progressbar2.ProgressBar(max_value=progressbar2.UnknownLength) for i in range(20): time.sleep(0.1) bar.update(i) @@ -58,12 +58,12 @@ Bar with custom widgets :: import time - import progressbar + import progressbar2 - bar = progressbar.ProgressBar(widgets=[ - ' [', progressbar.Timer(), '] ', - progressbar.Bar(), - ' (', progressbar.ETA(), ') ', + bar = progressbar2.ProgressBar(widgets=[ + ' [', progressbar2.Timer(), '] ', + progressbar2.Bar(), + ' (', progressbar2.ETA(), ') ', ]) for i in bar(range(20)): time.sleep(0.1) diff --git a/examples.py b/examples.py index aa71179..08b9e0e 100644 --- a/examples.py +++ b/examples.py @@ -9,7 +9,7 @@ import sys import time import typing -import progressbar +import progressbar2 examples: list[typing.Callable[[typing.Any], typing.Any]] = [] @@ -35,20 +35,20 @@ def example(fn): @example def fast_example() -> None: """Updates bar really quickly to cause flickering""" - with progressbar.ProgressBar(widgets=[progressbar.Bar()]) as bar: + with progressbar2.ProgressBar(widgets=[progressbar2.Bar()]) as bar: for i in range(100): bar.update(int(i / 10), force=True) @example def shortcut_example() -> None: - for _ in progressbar.progressbar(range(10)): + for _ in progressbar2.progressbar(range(10)): time.sleep(0.1) @example def prefixed_shortcut_example() -> None: - for _ in progressbar.progressbar(range(10), prefix='Hi: '): + for _ in progressbar2.progressbar(range(10), prefix='Hi: '): time.sleep(0.1) @@ -69,7 +69,7 @@ def parallel_bars_multibar_example() -> None: # Sleep up to 0.1 seconds time.sleep(random.random() * 0.1) - with progressbar.MultiBar() as multibar: + with progressbar2.MultiBar() as multibar: bar_labels = [] for i in range(BARS): # Get a progressbar @@ -92,7 +92,7 @@ def multiple_bars_line_offset_example() -> None: N = 100 bars = [ - progressbar.ProgressBar( + progressbar2.ProgressBar( max_value=N, # We add 1 to the line offset to account for the `print_fd` line_offset=i + 1, @@ -101,7 +101,7 @@ def multiple_bars_line_offset_example() -> None: for i in range(BARS) ] # Create a file descriptor for regular printing as well - print_fd = progressbar.LineOffsetStreamWrapper(lines=0, stream=sys.stdout) + print_fd = progressbar2.LineOffsetStreamWrapper(lines=0, stream=sys.stdout) assert print_fd # The progress bar updates, normally you would do something useful here @@ -120,15 +120,15 @@ def multiple_bars_line_offset_example() -> None: @example def templated_shortcut_example() -> None: - for _ in progressbar.progressbar(range(10), suffix='{seconds_elapsed:.1}'): + for _ in progressbar2.progressbar(range(10), suffix='{seconds_elapsed:.1}'): time.sleep(0.1) @example def job_status_example() -> None: - with progressbar.ProgressBar( + with progressbar2.ProgressBar( redirect_stdout=True, - widgets=[progressbar.widgets.JobStatusBar('status')], + widgets=[progressbar2.widgets.JobStatusBar('status')], ) as bar: for _ in range(30): print('random', random.random()) @@ -145,7 +145,7 @@ def job_status_example() -> None: @example def with_example_stdout_redirection() -> None: - with progressbar.ProgressBar(max_value=10, redirect_stdout=True) as p: + with progressbar2.ProgressBar(max_value=10, redirect_stdout=True) as p: for i in range(10): if i % 3 == 0: print('Some print statement %i' % i) @@ -156,8 +156,8 @@ def with_example_stdout_redirection() -> None: @example def basic_widget_example() -> None: - widgets = [progressbar.Percentage(), progressbar.Bar()] - bar = progressbar.ProgressBar(widgets=widgets, max_value=10).start() + widgets = [progressbar2.Percentage(), progressbar2.Bar()] + bar = progressbar2.ProgressBar(widgets=widgets, max_value=10).start() for i in range(10): # do something time.sleep(0.1) @@ -169,10 +169,10 @@ def basic_widget_example() -> None: def color_bar_example() -> None: widgets = [ '\x1b[33mColorful example\x1b[39m', - progressbar.Percentage(), - progressbar.Bar(marker='\x1b[32m#\x1b[39m'), + progressbar2.Percentage(), + progressbar2.Bar(marker='\x1b[32m#\x1b[39m'), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=10).start() + bar = progressbar2.ProgressBar(widgets=widgets, max_value=10).start() for i in range(10): # do something time.sleep(0.1) @@ -184,8 +184,8 @@ def color_bar_example() -> None: def color_bar_animated_marker_example() -> None: widgets = [ # Colored animated marker with colored fill: - progressbar.Bar( - marker=progressbar.AnimatedMarker( + progressbar2.Bar( + marker=progressbar2.AnimatedMarker( fill='x', # fill='█', fill_wrap='\x1b[32m{}\x1b[39m', @@ -193,7 +193,7 @@ def color_bar_animated_marker_example() -> None: ) ), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=10).start() + bar = progressbar2.ProgressBar(widgets=widgets, max_value=10).start() for i in range(10): # do something time.sleep(0.1) @@ -209,10 +209,10 @@ def multi_range_bar_example() -> None: '\x1b[31m.\x1b[39m', # Scheduling ' ', # Not started ] - widgets = [progressbar.MultiRangeBar('amounts', markers=markers)] + widgets = [progressbar2.MultiRangeBar('amounts', markers=markers)] amounts = [0] * (len(markers) - 1) + [25] - with progressbar.ProgressBar(widgets=widgets, max_value=10).start() as bar: + with progressbar2.ProgressBar(widgets=widgets, max_value=10).start() as bar: while True: incomplete_items = [ idx @@ -239,13 +239,13 @@ def multi_progress_bar_example(left: bool = True) -> None: ] widgets = [ - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.MultiProgressBar('jobs', fill_left=left), + progressbar2.MultiProgressBar('jobs', fill_left=left), ] max_value = sum([total for progress, total in jobs]) - with progressbar.ProgressBar(widgets=widgets, max_value=max_value) as bar: + with progressbar2.ProgressBar(widgets=widgets, max_value=max_value) as bar: while True: incomplete_jobs = [ idx @@ -265,24 +265,24 @@ def multi_progress_bar_example(left: bool = True) -> None: @example def granular_progress_example() -> None: widgets = [ - progressbar.GranularBar(markers=' ▏▎▍▌▋▊▉█', left='', right='|'), - progressbar.GranularBar(markers=' ▁▂▃▄▅▆▇█', left='', right='|'), - progressbar.GranularBar(markers=' ▖▌▛█', left='', right='|'), - progressbar.GranularBar(markers=' ░▒▓█', left='', right='|'), - progressbar.GranularBar(markers=' ⡀⡄⡆⡇⣇⣧⣷⣿', left='', right='|'), - progressbar.GranularBar(markers=' .oO', left='', right=''), + progressbar2.GranularBar(markers=' ▏▎▍▌▋▊▉█', left='', right='|'), + progressbar2.GranularBar(markers=' ▁▂▃▄▅▆▇█', left='', right='|'), + progressbar2.GranularBar(markers=' ▖▌▛█', left='', right='|'), + progressbar2.GranularBar(markers=' ░▒▓█', left='', right='|'), + progressbar2.GranularBar(markers=' ⡀⡄⡆⡇⣇⣧⣷⣿', left='', right='|'), + progressbar2.GranularBar(markers=' .oO', left='', right=''), ] - for _ in progressbar.progressbar(list(range(100)), widgets=widgets): + for _ in progressbar2.progressbar(list(range(100)), widgets=widgets): time.sleep(0.03) - for _ in progressbar.progressbar(iter(range(100)), widgets=widgets): + for _ in progressbar2.progressbar(iter(range(100)), widgets=widgets): time.sleep(0.03) @example def percentage_label_bar_example() -> None: - widgets = [progressbar.PercentageLabelBar()] - bar = progressbar.ProgressBar(widgets=widgets, max_value=10).start() + widgets = [progressbar2.PercentageLabelBar()] + bar = progressbar2.ProgressBar(widgets=widgets, max_value=10).start() for i in range(10): # do something time.sleep(0.1) @@ -294,15 +294,15 @@ def percentage_label_bar_example() -> None: def file_transfer_example() -> None: widgets = [ 'Test: ', - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.Bar(marker=progressbar.RotatingMarker()), + progressbar2.Bar(marker=progressbar2.RotatingMarker()), ' ', - progressbar.ETA(), + progressbar2.ETA(), ' ', - progressbar.FileTransferSpeed(), + progressbar2.FileTransferSpeed(), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=1000).start() + bar = progressbar2.ProgressBar(widgets=widgets, max_value=1000).start() for i in range(100): # do something time.sleep(0.01) @@ -312,29 +312,29 @@ def file_transfer_example() -> None: @example def custom_file_transfer_example() -> None: - class CrazyFileTransferSpeed(progressbar.FileTransferSpeed): + class CrazyFileTransferSpeed(progressbar2.FileTransferSpeed): """ It's bigger between 45 and 80 percent """ def update(self, bar): if 45 < bar.percentage() < 80: - return 'Bigger Now ' + progressbar.FileTransferSpeed.update( + return 'Bigger Now ' + progressbar2.FileTransferSpeed.update( self, bar ) else: - return progressbar.FileTransferSpeed.update(self, bar) + return progressbar2.FileTransferSpeed.update(self, bar) widgets = [ CrazyFileTransferSpeed(), ' <<<', - progressbar.Bar(), + progressbar2.Bar(), '>>> ', - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.ETA(), + progressbar2.ETA(), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=1000) + bar = progressbar2.ProgressBar(widgets=widgets, max_value=1000) # maybe do something bar.start() for i in range(200): @@ -347,13 +347,13 @@ def custom_file_transfer_example() -> None: @example def double_bar_example() -> None: widgets = [ - progressbar.Bar('>'), + progressbar2.Bar('>'), ' ', - progressbar.ETA(), + progressbar2.ETA(), ' ', - progressbar.ReverseBar('<'), + progressbar2.ReverseBar('<'), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=1000).start() + bar = progressbar2.ProgressBar(widgets=widgets, max_value=1000).start() for i in range(100): # do something time.sleep(0.01) @@ -365,15 +365,15 @@ def double_bar_example() -> None: def basic_file_transfer() -> None: widgets = [ 'Test: ', - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.Bar(marker='0', left='[', right=']'), + progressbar2.Bar(marker='0', left='[', right=']'), ' ', - progressbar.ETA(), + progressbar2.ETA(), ' ', - progressbar.FileTransferSpeed(), + progressbar2.FileTransferSpeed(), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=500) + bar = progressbar2.ProgressBar(widgets=widgets, max_value=500) bar.start() # Go beyond the max_value for i in range(100, 501, 50): @@ -384,8 +384,8 @@ def basic_file_transfer() -> None: @example def simple_progress() -> None: - bar = progressbar.ProgressBar( - widgets=[progressbar.SimpleProgress()], + bar = progressbar2.ProgressBar( + widgets=[progressbar2.SimpleProgress()], max_value=17, ).start() for i in range(17): @@ -396,7 +396,7 @@ def simple_progress() -> None: @example def basic_progress() -> None: - bar = progressbar.ProgressBar().start() + bar = progressbar2.ProgressBar().start() for i in range(10): time.sleep(0.1) bar.update(i + 1) @@ -406,7 +406,7 @@ def basic_progress() -> None: @example def progress_with_automatic_max() -> None: # Progressbar can guess max_value automatically. - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() for _ in bar(range(8)): time.sleep(0.1) @@ -414,15 +414,15 @@ def progress_with_automatic_max() -> None: @example def progress_with_unavailable_max() -> None: # Progressbar can't guess max_value. - bar = progressbar.ProgressBar(max_value=8) + bar = progressbar2.ProgressBar(max_value=8) for _ in bar(i for i in range(8)): time.sleep(0.1) @example def animated_marker() -> None: - bar = progressbar.ProgressBar( - widgets=['Working: ', progressbar.AnimatedMarker()] + bar = progressbar2.ProgressBar( + widgets=['Working: ', progressbar2.AnimatedMarker()] ) for _ in bar(i for i in range(5)): time.sleep(0.1) @@ -430,10 +430,10 @@ def animated_marker() -> None: @example def filling_bar_animated_marker() -> None: - bar = progressbar.ProgressBar( + bar = progressbar2.ProgressBar( widgets=[ - progressbar.Bar( - marker=progressbar.AnimatedMarker(fill='#'), + progressbar2.Bar( + marker=progressbar2.AnimatedMarker(fill='#'), ), ] ) @@ -445,12 +445,12 @@ def filling_bar_animated_marker() -> None: def counter_and_timer() -> None: widgets = [ 'Processed: ', - progressbar.Counter('Counter: %(value)05d'), + progressbar2.Counter('Counter: %(value)05d'), ' lines (', - progressbar.Timer(), + progressbar2.Timer(), ')', ] - bar = progressbar.ProgressBar(widgets=widgets) + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(i for i in range(15)): time.sleep(0.1) @@ -458,17 +458,17 @@ def counter_and_timer() -> None: @example def format_label() -> None: widgets = [ - progressbar.FormatLabel('Processed: %(value)d lines (in: %(elapsed)s)') + progressbar2.FormatLabel('Processed: %(value)d lines (in: %(elapsed)s)') ] - bar = progressbar.ProgressBar(widgets=widgets) + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(i for i in range(15)): time.sleep(0.1) @example def animated_balloons() -> None: - widgets = ['Balloon: ', progressbar.AnimatedMarker(markers='.oO@* ')] - bar = progressbar.ProgressBar(widgets=widgets) + widgets = ['Balloon: ', progressbar2.AnimatedMarker(markers='.oO@* ')] + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(i for i in range(24)): time.sleep(0.1) @@ -477,8 +477,8 @@ def animated_balloons() -> None: def animated_arrows() -> None: # You may need python 3.x to see this correctly try: - widgets = ['Arrows: ', progressbar.AnimatedMarker(markers='←↖↑↗→↘↓↙')] - bar = progressbar.ProgressBar(widgets=widgets) + widgets = ['Arrows: ', progressbar2.AnimatedMarker(markers='←↖↑↗→↘↓↙')] + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(i for i in range(24)): time.sleep(0.1) except UnicodeError: @@ -489,8 +489,8 @@ def animated_arrows() -> None: def animated_filled_arrows() -> None: # You may need python 3.x to see this correctly try: - widgets = ['Arrows: ', progressbar.AnimatedMarker(markers='◢◣◤◥')] - bar = progressbar.ProgressBar(widgets=widgets) + widgets = ['Arrows: ', progressbar2.AnimatedMarker(markers='◢◣◤◥')] + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(i for i in range(24)): time.sleep(0.1) except UnicodeError: @@ -501,8 +501,8 @@ def animated_filled_arrows() -> None: def animated_wheels() -> None: # You may need python 3.x to see this correctly try: - widgets = ['Wheels: ', progressbar.AnimatedMarker(markers='◐◓◑◒')] - bar = progressbar.ProgressBar(widgets=widgets) + widgets = ['Wheels: ', progressbar2.AnimatedMarker(markers='◐◓◑◒')] + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(i for i in range(24)): time.sleep(0.1) except UnicodeError: @@ -512,10 +512,10 @@ def animated_wheels() -> None: @example def format_label_bouncer() -> None: widgets = [ - progressbar.FormatLabel('Bouncer: value %(value)d - '), - progressbar.BouncingBar(), + progressbar2.FormatLabel('Bouncer: value %(value)d - '), + progressbar2.BouncingBar(), ] - bar = progressbar.ProgressBar(widgets=widgets) + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(i for i in range(100)): time.sleep(0.01) @@ -523,18 +523,18 @@ def format_label_bouncer() -> None: @example def format_label_rotating_bouncer() -> None: widgets = [ - progressbar.FormatLabel('Animated Bouncer: value %(value)d - '), - progressbar.BouncingBar(marker=progressbar.RotatingMarker()), + progressbar2.FormatLabel('Animated Bouncer: value %(value)d - '), + progressbar2.BouncingBar(marker=progressbar2.RotatingMarker()), ] - bar = progressbar.ProgressBar(widgets=widgets) + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(i for i in range(18)): time.sleep(0.1) @example def with_right_justify() -> None: - with progressbar.ProgressBar( + with progressbar2.ProgressBar( max_value=10, term_width=20, left_justify=False ) as progress: assert progress.term_width is not None @@ -544,7 +544,7 @@ def with_right_justify() -> None: @example def exceeding_maximum() -> None: - with progressbar.ProgressBar(max_value=1) as progress, contextlib.suppress( + with progressbar2.ProgressBar(max_value=1) as progress, contextlib.suppress( ValueError ): progress.update(2) @@ -552,29 +552,29 @@ def exceeding_maximum() -> None: @example def reaching_maximum() -> None: - progress = progressbar.ProgressBar(max_value=1) + progress = progressbar2.ProgressBar(max_value=1) with contextlib.suppress(RuntimeError): progress.update(1) @example def stdout_redirection() -> None: - with progressbar.ProgressBar(redirect_stdout=True) as progress: + with progressbar2.ProgressBar(redirect_stdout=True) as progress: print('', file=sys.stdout) progress.update(0) @example def stderr_redirection() -> None: - with progressbar.ProgressBar(redirect_stderr=True) as progress: + with progressbar2.ProgressBar(redirect_stderr=True) as progress: print('', file=sys.stderr) progress.update(0) @example def rotating_bouncing_marker() -> None: - widgets = [progressbar.BouncingBar(marker=progressbar.RotatingMarker())] - with progressbar.ProgressBar( + widgets = [progressbar2.BouncingBar(marker=progressbar2.RotatingMarker())] + with progressbar2.ProgressBar( widgets=widgets, max_value=20, term_width=10 ) as progress: for i in range(20): @@ -582,11 +582,11 @@ def rotating_bouncing_marker() -> None: progress.update(i) widgets = [ - progressbar.BouncingBar( - marker=progressbar.RotatingMarker(), fill_left=False + progressbar2.BouncingBar( + marker=progressbar2.RotatingMarker(), fill_left=False ) ] - with progressbar.ProgressBar( + with progressbar2.ProgressBar( widgets=widgets, max_value=20, term_width=10 ) as progress: for i in range(20): @@ -596,10 +596,10 @@ def rotating_bouncing_marker() -> None: @example def incrementing_bar() -> None: - bar = progressbar.ProgressBar( + bar = progressbar2.ProgressBar( widgets=[ - progressbar.Percentage(), - progressbar.Bar(), + progressbar2.Percentage(), + progressbar2.Bar(), ], max_value=10, ).start() @@ -614,15 +614,15 @@ def incrementing_bar() -> None: def increment_bar_with_output_redirection() -> None: widgets = [ 'Test: ', - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.Bar(marker=progressbar.RotatingMarker()), + progressbar2.Bar(marker=progressbar2.RotatingMarker()), ' ', - progressbar.ETA(), + progressbar2.ETA(), ' ', - progressbar.FileTransferSpeed(), + progressbar2.FileTransferSpeed(), ] - bar = progressbar.ProgressBar( + bar = progressbar2.ProgressBar( widgets=widgets, max_value=100, redirect_stdout=True ).start() for i in range(10): @@ -636,25 +636,25 @@ def increment_bar_with_output_redirection() -> None: @example def eta_types_demonstration() -> None: widgets = [ - progressbar.Percentage(), + progressbar2.Percentage(), ' ETA: ', - progressbar.ETA(), + progressbar2.ETA(), ' Adaptive : ', - progressbar.AdaptiveETA(), + progressbar2.AdaptiveETA(), ' Smoothing(a=0.1): ', - progressbar.SmoothingETA(smoothing_parameters=dict(alpha=0.1)), + progressbar2.SmoothingETA(smoothing_parameters=dict(alpha=0.1)), ' Smoothing(a=0.9): ', - progressbar.SmoothingETA(smoothing_parameters=dict(alpha=0.9)), + progressbar2.SmoothingETA(smoothing_parameters=dict(alpha=0.9)), ' Absolute: ', - progressbar.AbsoluteETA(), + progressbar2.AbsoluteETA(), ' Transfer: ', - progressbar.FileTransferSpeed(), + progressbar2.FileTransferSpeed(), ' Adaptive T: ', - progressbar.AdaptiveTransferSpeed(), + progressbar2.AdaptiveTransferSpeed(), ' ', - progressbar.Bar(), + progressbar2.Bar(), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=500) + bar = progressbar2.ProgressBar(widgets=widgets, max_value=500) bar.start() for i in range(500): if i < 100: @@ -669,11 +669,11 @@ def eta_types_demonstration() -> None: @example def adaptive_eta_without_value_change() -> None: - # Testing progressbar.AdaptiveETA when the value doesn't actually change - bar = progressbar.ProgressBar( + # Testing progressbar2.AdaptiveETA when the value doesn't actually change + bar = progressbar2.ProgressBar( widgets=[ - progressbar.AdaptiveETA(), - progressbar.AdaptiveTransferSpeed(), + progressbar2.AdaptiveETA(), + progressbar2.AdaptiveTransferSpeed(), ], max_value=2, poll_interval=0.0001, @@ -688,7 +688,7 @@ def adaptive_eta_without_value_change() -> None: @example def iterator_with_max_value() -> None: # Testing using progressbar as an iterator with a max value - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() for _ in bar(iter(range(100)), 100): # iter range is a way to get an iterator in both python 2 and 3 @@ -699,15 +699,15 @@ def iterator_with_max_value() -> None: def eta() -> None: widgets = [ 'Test: ', - progressbar.Percentage(), + progressbar2.Percentage(), ' | ETA: ', - progressbar.ETA(), + progressbar2.ETA(), ' | AbsoluteETA: ', - progressbar.AbsoluteETA(), + progressbar2.AbsoluteETA(), ' | AdaptiveETA: ', - progressbar.AdaptiveETA(), + progressbar2.AdaptiveETA(), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=50).start() + bar = progressbar2.ProgressBar(widgets=widgets, max_value=50).start() for i in range(50): time.sleep(0.1) bar.update(i + 1) @@ -716,16 +716,16 @@ def eta() -> None: @example def variables() -> None: - # Use progressbar.Variable to keep track of some parameter(s) during + # Use progressbar2.Variable to keep track of some parameter(s) during # your calculations widgets = [ - progressbar.Percentage(), - progressbar.Bar(), - progressbar.Variable('loss'), + progressbar2.Percentage(), + progressbar2.Bar(), + progressbar2.Variable('loss'), ', ', - progressbar.Variable('username', width=12, precision=12), + progressbar2.Variable('username', width=12, precision=12), ] - with progressbar.ProgressBar(max_value=100, widgets=widgets) as bar: + with progressbar2.ProgressBar(max_value=100, widgets=widgets) as bar: min_so_far = 1 for i in range(100): time.sleep(0.01) @@ -759,7 +759,7 @@ def user_variables() -> None: } num_subtasks = sum(len(x) for x in tasks.values()) - with progressbar.ProgressBar( + with progressbar2.ProgressBar( prefix='{variables.task} >> {variables.subtask}', variables={'task': '--', 'subtask': '--'}, max_value=10 * num_subtasks, @@ -775,7 +775,7 @@ def user_variables() -> None: @example def format_custom_text() -> None: - format_custom_text = progressbar.FormatCustomText( + format_custom_text = progressbar2.FormatCustomText( 'Spam: %(spam).1f kg, eggs: %(eggs)d', dict( spam=0.25, @@ -783,11 +783,11 @@ def format_custom_text() -> None: ), ) - bar = progressbar.ProgressBar( + bar = progressbar2.ProgressBar( widgets=[ format_custom_text, ' :: ', - progressbar.Percentage(), + progressbar2.Percentage(), ] ) for i in bar(range(25)): @@ -797,7 +797,7 @@ def format_custom_text() -> None: @example def simple_api_example() -> None: - bar = progressbar.ProgressBar(widget_kwargs=dict(fill='█')) + bar = progressbar2.ProgressBar(widget_kwargs=dict(fill='█')) for _ in bar(range(200)): time.sleep(0.02) @@ -809,14 +809,14 @@ def eta_on_generators(): yield None widgets = [ - progressbar.AdaptiveETA(), + progressbar2.AdaptiveETA(), ' ', - progressbar.ETA(), + progressbar2.ETA(), ' ', - progressbar.Timer(), + progressbar2.Timer(), ] - bar = progressbar.ProgressBar(widgets=widgets) + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(gen()): time.sleep(0.02) @@ -828,15 +828,15 @@ def percentage_on_generators(): yield None widgets = [ - progressbar.Counter(), + progressbar2.Counter(), ' ', - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.SimpleProgress(), + progressbar2.SimpleProgress(), ' ', ] - bar = progressbar.ProgressBar(widgets=widgets) + bar = progressbar2.ProgressBar(widgets=widgets) for _ in bar(gen()): time.sleep(0.02) diff --git a/progressbar/__main__.py b/progressbar/__main__.py index 0bfd7fb..7974c21 100644 --- a/progressbar/__main__.py +++ b/progressbar/__main__.py @@ -8,7 +8,7 @@ import typing from pathlib import Path from typing import IO, BinaryIO, TextIO -import progressbar +import progressbar2 def size_to_bytes(size_str: str) -> int: @@ -320,29 +320,29 @@ def main(argv: list[str] | None = None) -> None: # noqa: C901 if filesize_available: # Create the progress bar components widgets = [ - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.Bar(), + progressbar2.Bar(), ' ', - progressbar.Timer(), + progressbar2.Timer(), ' ', - progressbar.FileTransferSpeed(), + progressbar2.FileTransferSpeed(), ] else: widgets = [ - progressbar.SimpleProgress(), + progressbar2.SimpleProgress(), ' ', - progressbar.DataSize(), + progressbar2.DataSize(), ' ', - progressbar.Timer(), + progressbar2.Timer(), ] if args.eta: widgets.append(' ') - widgets.append(progressbar.AdaptiveETA()) + widgets.append(progressbar2.AdaptiveETA()) # Initialize the progress bar - bar = progressbar.ProgressBar( + bar = progressbar2.ProgressBar( # widgets=widgets, max_value=total_size or None, max_error=False, diff --git a/progressbar/bar.py b/progressbar/bar.py index c267fa2..e0d8557 100644 --- a/progressbar/bar.py +++ b/progressbar/bar.py @@ -17,9 +17,9 @@ from types import FrameType from python_utils import converters, types -import progressbar.env -import progressbar.terminal -import progressbar.terminal.stream +import progressbar2.env +import progressbar2.terminal +import progressbar2.terminal.stream from . import ( base, @@ -188,14 +188,14 @@ class DefaultFdMixin(ProgressBarMixinBase): #: For true (24 bit/16M) color support you can use `COLORTERM=truecolor`. #: For 256 color support you can use `TERM=xterm-256color`. #: For 16 colorsupport you can use `TERM=xterm`. - enable_colors: progressbar.env.ColorSupport = progressbar.env.COLOR_SUPPORT + enable_colors: progressbar2.env.ColorSupport = progressbar2.env.COLOR_SUPPORT def __init__( self, fd: base.TextIO = sys.stderr, is_terminal: bool | None = None, line_breaks: bool | None = None, - enable_colors: progressbar.env.ColorSupport | None = None, + enable_colors: progressbar2.env.ColorSupport | None = None, line_offset: int = 0, **kwargs: typing.Any, ): @@ -206,8 +206,8 @@ class DefaultFdMixin(ProgressBarMixinBase): fd = self._apply_line_offset(fd, line_offset) self.fd = fd - self.is_ansi_terminal = progressbar.env.is_ansi_terminal(fd) - self.is_terminal = progressbar.env.is_terminal(fd, is_terminal) + self.is_ansi_terminal = progressbar2.env.is_ansi_terminal(fd) + self.is_terminal = progressbar2.env.is_terminal(fd, is_terminal) self.line_breaks = self._determine_line_breaks(line_breaks) self.enable_colors = self._determine_enable_colors(enable_colors) @@ -219,7 +219,7 @@ class DefaultFdMixin(ProgressBarMixinBase): line_offset: int, ) -> base.TextIO: if line_offset: - return progressbar.terminal.stream.LineOffsetStreamWrapper( + return progressbar2.terminal.stream.LineOffsetStreamWrapper( line_offset, fd, ) @@ -228,7 +228,7 @@ class DefaultFdMixin(ProgressBarMixinBase): def _determine_line_breaks(self, line_breaks: bool | None) -> bool | None: if line_breaks is None: - return progressbar.env.env_flag( + return progressbar2.env.env_flag( 'PROGRESSBAR_LINE_BREAKS', not self.is_terminal, ) @@ -237,8 +237,8 @@ class DefaultFdMixin(ProgressBarMixinBase): def _determine_enable_colors( self, - enable_colors: progressbar.env.ColorSupport | None, - ) -> progressbar.env.ColorSupport: + enable_colors: progressbar2.env.ColorSupport | None, + ) -> progressbar2.env.ColorSupport: """ Determines the color support for the progress bar. @@ -266,29 +266,29 @@ class DefaultFdMixin(ProgressBarMixinBase): ValueError: If `enable_colors` is not None, True, False, or an instance of `progressbar.env.ColorSupport`. """ - color_support: progressbar.env.ColorSupport + color_support: progressbar2.env.ColorSupport if enable_colors is None: colors = ( - progressbar.env.env_flag('PROGRESSBAR_ENABLE_COLORS'), - progressbar.env.env_flag('FORCE_COLOR'), + progressbar2.env.env_flag('PROGRESSBAR_ENABLE_COLORS'), + progressbar2.env.env_flag('FORCE_COLOR'), self.is_ansi_terminal, ) for color_enabled in colors: if color_enabled is not None: if color_enabled: - color_support = progressbar.env.COLOR_SUPPORT + color_support = progressbar2.env.COLOR_SUPPORT else: - color_support = progressbar.env.ColorSupport.NONE + color_support = progressbar2.env.ColorSupport.NONE break else: - color_support = progressbar.env.ColorSupport.NONE + color_support = progressbar2.env.ColorSupport.NONE elif enable_colors is True: - color_support = progressbar.env.ColorSupport.XTERM_256 + color_support = progressbar2.env.ColorSupport.XTERM_256 elif enable_colors is False: - color_support = progressbar.env.ColorSupport.NONE - elif isinstance(enable_colors, progressbar.env.ColorSupport): + color_support = progressbar2.env.ColorSupport.NONE + elif isinstance(enable_colors, progressbar2.env.ColorSupport): color_support = enable_colors else: raise ValueError(f'Invalid color support value: {enable_colors}') diff --git a/progressbar/terminal/colors.py b/progressbar/terminal/colors.py index 37e5ea9..4e32824 100644 --- a/progressbar/terminal/colors.py +++ b/progressbar/terminal/colors.py @@ -3,7 +3,7 @@ from __future__ import annotations # Based on: https://www.ditig.com/256-colors-cheat-sheet import os -from progressbar.terminal.base import HSL, RGB, ColorGradient, Colors +from progressbar2.terminal.base import HSL, RGB, ColorGradient, Colors black = Colors.register(RGB(0, 0, 0), HSL(0, 0, 0), 'Black', 0) maroon = Colors.register(RGB(128, 0, 0), HSL(0, 100, 25), 'Maroon', 1) diff --git a/progressbar/terminal/stream.py b/progressbar/terminal/stream.py index eb8de2a..1b5cd10 100644 --- a/progressbar/terminal/stream.py +++ b/progressbar/terminal/stream.py @@ -5,7 +5,7 @@ import typing from types import TracebackType from typing import Iterable, Iterator -from progressbar import base +from progressbar2 import base class TextIOOutputWrapper(base.TextIO): # pragma: no cover diff --git a/progressbar/utils.py b/progressbar/utils.py index 6323ae8..6c727c9 100644 --- a/progressbar/utils.py +++ b/progressbar/utils.py @@ -16,7 +16,7 @@ from python_utils.converters import scale_1024 from python_utils.terminal import get_terminal_size from python_utils.time import epoch, format_time, timedelta_to_seconds -from progressbar import base, env, terminal +from progressbar2 import base, env, terminal if types.TYPE_CHECKING: from .bar import ProgressBar, ProgressBarMixinBase diff --git a/tests/conftest.py b/tests/conftest.py index 787e643..eb0df6a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,7 +8,7 @@ from datetime import datetime import freezegun import pytest -import progressbar +import progressbar2 LOG_LEVELS: dict[str, int] = { '0': logging.ERROR, @@ -28,7 +28,7 @@ def pytest_configure(config) -> None: def small_interval(monkeypatch) -> None: # Remove the update limit for tests by default monkeypatch.setattr( - progressbar.ProgressBar, + progressbar2.ProgressBar, '_MINIMUM_UPDATE_INTERVAL', 1e-6, ) diff --git a/tests/original_examples.py b/tests/original_examples.py index 7f1db16..aae1bbe 100644 --- a/tests/original_examples.py +++ b/tests/original_examples.py @@ -3,7 +3,7 @@ import sys import time -from progressbar import ( +from progressbar2 import ( ETA, AdaptiveETA, AnimatedMarker, diff --git a/tests/test_algorithms.py b/tests/test_algorithms.py index a6cc646..fec58fa 100644 --- a/tests/test_algorithms.py +++ b/tests/test_algorithms.py @@ -2,7 +2,7 @@ from datetime import timedelta import pytest -from progressbar import algorithms +from progressbar2 import algorithms def test_ema_initialization() -> None: diff --git a/tests/test_backwards_compatibility.py b/tests/test_backwards_compatibility.py index 204a674..bed6973 100644 --- a/tests/test_backwards_compatibility.py +++ b/tests/test_backwards_compatibility.py @@ -1,16 +1,16 @@ import time -import progressbar +import progressbar2 def test_progressbar_1_widgets() -> None: widgets = [ - progressbar.AdaptiveETA(format='Time left: %s'), - progressbar.Timer(format='Time passed: %s'), - progressbar.Bar(), + progressbar2.AdaptiveETA(format='Time left: %s'), + progressbar2.Timer(format='Time passed: %s'), + progressbar2.Bar(), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=100).start() + bar = progressbar2.ProgressBar(widgets=widgets, max_value=100).start() for i in range(1, 101): bar.update(i) diff --git a/tests/test_color.py b/tests/test_color.py index 90b9b1b..b567228 100644 --- a/tests/test_color.py +++ b/tests/test_color.py @@ -5,10 +5,10 @@ from typing import ClassVar import pytest -import progressbar -import progressbar.terminal -from progressbar import env, terminal, widgets -from progressbar.terminal import Colors, apply_colors, colors +import progressbar2 +import progressbar2.terminal +from progressbar2 import env, terminal, widgets +from progressbar2.terminal import Colors, apply_colors, colors ENVIRONMENT_VARIABLES = [ 'PROGRESSBAR_ENABLE_COLORS', @@ -53,17 +53,17 @@ def test_color_environment_variables( ) monkeypatch.setenv(variable, 'true') - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() assert not env.is_ansi_terminal(bar.fd) assert not bar.is_ansi_terminal assert bar.enable_colors monkeypatch.setenv(variable, 'false') - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() assert not bar.enable_colors monkeypatch.setenv(variable, '') - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() assert not bar.enable_colors @@ -117,24 +117,24 @@ def test_color_support_from_env_jupyter(monkeypatch, variable) -> None: def test_enable_colors_flags() -> None: - bar = progressbar.ProgressBar(enable_colors=True) + bar = progressbar2.ProgressBar(enable_colors=True) assert bar.enable_colors - bar = progressbar.ProgressBar(enable_colors=False) + bar = progressbar2.ProgressBar(enable_colors=False) assert not bar.enable_colors - bar = progressbar.ProgressBar( + bar = progressbar2.ProgressBar( enable_colors=env.ColorSupport.XTERM_TRUECOLOR, ) assert bar.enable_colors with pytest.raises(ValueError): - progressbar.ProgressBar(enable_colors=12345) + progressbar2.ProgressBar(enable_colors=12345) -class _TestFixedColorSupport(progressbar.widgets.WidgetBase): +class _TestFixedColorSupport(progressbar2.widgets.WidgetBase): _fixed_colors: ClassVar[widgets.TFixedColors] = widgets.TFixedColors( - fg_none=progressbar.widgets.colors.yellow, + fg_none=progressbar2.widgets.colors.yellow, bg_none=None, ) @@ -142,10 +142,10 @@ class _TestFixedColorSupport(progressbar.widgets.WidgetBase): pass -class _TestFixedGradientSupport(progressbar.widgets.WidgetBase): +class _TestFixedGradientSupport(progressbar2.widgets.WidgetBase): _gradient_colors: ClassVar[widgets.TGradientColors] = ( widgets.TGradientColors( - fg=progressbar.widgets.colors.gradient, + fg=progressbar2.widgets.colors.gradient, bg=None, ) ) @@ -157,8 +157,8 @@ class _TestFixedGradientSupport(progressbar.widgets.WidgetBase): @pytest.mark.parametrize( 'widget', [ - progressbar.Percentage, - progressbar.SimpleProgress, + progressbar2.Percentage, + progressbar2.SimpleProgress, _TestFixedColorSupport, _TestFixedGradientSupport, ], @@ -194,7 +194,7 @@ def test_color_gradient() -> None: @pytest.mark.parametrize( 'widget', [ - progressbar.Counter, + progressbar2.Counter, ], ) def test_no_color_widgets(widget) -> None: @@ -379,7 +379,7 @@ def test_windows_colors(monkeypatch) -> None: def test_ansi_color(monkeypatch) -> None: - color = progressbar.terminal.Color( + color = progressbar2.terminal.Color( colors.red.rgb, colors.red.hls, 'red-ansi', @@ -401,4 +401,4 @@ def test_ansi_color(monkeypatch) -> None: def test_sgr_call() -> None: - assert progressbar.terminal.encircled('test') == '\x1b[52mtest\x1b[54m' + assert progressbar2.terminal.encircled('test') == '\x1b[52mtest\x1b[54m' diff --git a/tests/test_custom_widgets.py b/tests/test_custom_widgets.py index b0a272e..2631744 100644 --- a/tests/test_custom_widgets.py +++ b/tests/test_custom_widgets.py @@ -2,32 +2,32 @@ import time import pytest -import progressbar +import progressbar2 -class CrazyFileTransferSpeed(progressbar.FileTransferSpeed): +class CrazyFileTransferSpeed(progressbar2.FileTransferSpeed): "It's bigger between 45 and 80 percent" def update(self, pbar): if 45 < pbar.percentage() < 80: - value = progressbar.FileTransferSpeed.update(self, pbar) + value = progressbar2.FileTransferSpeed.update(self, pbar) return f'Bigger Now {value}' else: - return progressbar.FileTransferSpeed.update(self, pbar) + return progressbar2.FileTransferSpeed.update(self, pbar) def test_crazy_file_transfer_speed_widget() -> None: widgets = [ # CrazyFileTransferSpeed(), ' <<<', - progressbar.Bar(), + progressbar2.Bar(), '>>> ', - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.ETA(), + progressbar2.ETA(), ] - p = progressbar.ProgressBar(widgets=widgets, max_value=1000) + p = progressbar2.ProgressBar(widgets=widgets, max_value=1000) # maybe do something p.start() for i in range(0, 200, 5): @@ -40,20 +40,20 @@ def test_crazy_file_transfer_speed_widget() -> None: def test_variable_widget_widget() -> None: widgets = [ ' [', - progressbar.Timer(), + progressbar2.Timer(), '] ', - progressbar.Bar(), + progressbar2.Bar(), ' (', - progressbar.ETA(), + progressbar2.ETA(), ') ', - progressbar.Variable('loss'), - progressbar.Variable('text'), - progressbar.Variable('error', precision=None), - progressbar.Variable('missing'), - progressbar.Variable('predefined'), + progressbar2.Variable('loss'), + progressbar2.Variable('text'), + progressbar2.Variable('error', precision=None), + progressbar2.Variable('missing'), + progressbar2.Variable('predefined'), ] - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( widgets=widgets, max_value=1000, variables=dict(predefined='predefined'), @@ -76,7 +76,7 @@ def test_variable_widget_widget() -> None: def test_format_custom_text_widget() -> None: - widget = progressbar.FormatCustomText( + widget = progressbar2.FormatCustomText( 'Spam: %(spam).1f kg, eggs: %(eggs)d', dict( spam=0.25, @@ -84,7 +84,7 @@ def test_format_custom_text_widget() -> None: ), ) - bar = progressbar.ProgressBar( + bar = progressbar2.ProgressBar( widgets=[ widget, ], diff --git a/tests/test_data.py b/tests/test_data.py index 4307163..cf8cedc 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -1,6 +1,6 @@ import pytest -import progressbar +import progressbar2 @pytest.mark.parametrize( @@ -21,5 +21,5 @@ import progressbar ], ) def test_data_size(value, expected) -> None: - widget = progressbar.DataSize() + widget = progressbar2.DataSize() assert widget(None, dict(value=value)) == expected diff --git a/tests/test_data_transfer_bar.py b/tests/test_data_transfer_bar.py index 7e5cfcc..a4382ea 100644 --- a/tests/test_data_transfer_bar.py +++ b/tests/test_data_transfer_bar.py @@ -1,5 +1,5 @@ -import progressbar -from progressbar import DataTransferBar +import progressbar2 +from progressbar2 import DataTransferBar def test_known_length() -> None: @@ -10,7 +10,7 @@ def test_known_length() -> None: def test_unknown_length() -> None: - dtb = DataTransferBar().start(max_value=progressbar.UnknownLength) + dtb = DataTransferBar().start(max_value=progressbar2.UnknownLength) for i in range(50): dtb.update(i) dtb.finish() diff --git a/tests/test_dill_pickle.py b/tests/test_dill_pickle.py index 3731245..f752c7d 100644 --- a/tests/test_dill_pickle.py +++ b/tests/test_dill_pickle.py @@ -1,10 +1,10 @@ import dill # type: ignore -import progressbar +import progressbar2 def test_dill() -> None: - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() assert bar._started is False assert bar._finished is False diff --git a/tests/test_empty.py b/tests/test_empty.py index f326e38..17ad8dc 100644 --- a/tests/test_empty.py +++ b/tests/test_empty.py @@ -1,11 +1,11 @@ -import progressbar +import progressbar2 def test_empty_list() -> None: - for x in progressbar.ProgressBar()([]): + for x in progressbar2.ProgressBar()([]): print(x) def test_empty_iterator() -> None: - for x in progressbar.ProgressBar(max_value=0)(iter([])): + for x in progressbar2.ProgressBar(max_value=0)(iter([])): print(x) diff --git a/tests/test_end.py b/tests/test_end.py index e7c69e3..b777670 100644 --- a/tests/test_end.py +++ b/tests/test_end.py @@ -1,13 +1,13 @@ import pytest -import progressbar +import progressbar2 @pytest.fixture(autouse=True) def large_interval(monkeypatch) -> None: # Remove the update limit for tests by default monkeypatch.setattr( - progressbar.ProgressBar, + progressbar2.ProgressBar, '_MINIMUM_UPDATE_INTERVAL', 0.1, ) @@ -15,8 +15,8 @@ def large_interval(monkeypatch) -> None: def test_end() -> None: m = 24514315 - p = progressbar.ProgressBar( - widgets=[progressbar.Percentage(), progressbar.Bar()], + p = progressbar2.ProgressBar( + widgets=[progressbar2.Percentage(), progressbar2.Bar()], max_value=m, ) @@ -35,9 +35,9 @@ def test_end() -> None: def test_end_100(monkeypatch) -> None: - assert progressbar.ProgressBar._MINIMUM_UPDATE_INTERVAL == 0.1 - p = progressbar.ProgressBar( - widgets=[progressbar.Percentage(), progressbar.Bar()], + assert progressbar2.ProgressBar._MINIMUM_UPDATE_INTERVAL == 0.1 + p = progressbar2.ProgressBar( + widgets=[progressbar2.Percentage(), progressbar2.Bar()], max_value=103, ) diff --git a/tests/test_failure.py b/tests/test_failure.py index 5953284..1b00c00 100644 --- a/tests/test_failure.py +++ b/tests/test_failure.py @@ -3,26 +3,26 @@ import time import pytest -import progressbar +import progressbar2 def test_missing_format_values(caplog) -> None: caplog.set_level(logging.CRITICAL, logger='progressbar.widgets') with pytest.raises(KeyError): - p = progressbar.ProgressBar( - widgets=[progressbar.widgets.FormatLabel('%(x)s')], + p = progressbar2.ProgressBar( + widgets=[progressbar2.widgets.FormatLabel('%(x)s')], ) p.update(5) def test_max_smaller_than_min() -> None: with pytest.raises(ValueError): - progressbar.ProgressBar(min_value=10, max_value=5) + progressbar2.ProgressBar(min_value=10, max_value=5) def test_no_max_value() -> None: """Looping up to 5 without max_value? No problem""" - p = progressbar.ProgressBar() + p = progressbar2.ProgressBar() p.start() for i in range(5): time.sleep(1) @@ -31,7 +31,7 @@ def test_no_max_value() -> None: def test_correct_max_value() -> None: """Looping up to 5 when max_value is 10? No problem""" - p = progressbar.ProgressBar(max_value=10) + p = progressbar2.ProgressBar(max_value=10) for i in range(5): time.sleep(1) p.update(i) @@ -39,7 +39,7 @@ def test_correct_max_value() -> None: def test_minus_max_value() -> None: """negative max_value, shouldn't work""" - p = progressbar.ProgressBar(min_value=-2, max_value=-1) + p = progressbar2.ProgressBar(min_value=-2, max_value=-1) with pytest.raises(ValueError): p.update(-1) @@ -47,7 +47,7 @@ def test_minus_max_value() -> None: def test_zero_max_value() -> None: """max_value of zero, it could happen""" - p = progressbar.ProgressBar(max_value=0) + p = progressbar2.ProgressBar(max_value=0) p.update(0) with pytest.raises(ValueError): @@ -56,7 +56,7 @@ def test_zero_max_value() -> None: def test_one_max_value() -> None: """max_value of one, another corner case""" - p = progressbar.ProgressBar(max_value=1) + p = progressbar2.ProgressBar(max_value=1) p.update(0) p.update(0) @@ -67,14 +67,14 @@ def test_one_max_value() -> None: def test_changing_max_value() -> None: """Changing max_value? No problem""" - p = progressbar.ProgressBar(max_value=10)(range(20), max_value=20) + p = progressbar2.ProgressBar(max_value=10)(range(20), max_value=20) for _i in p: time.sleep(1) def test_backwards() -> None: """progressbar going backwards""" - p = progressbar.ProgressBar(max_value=1) + p = progressbar2.ProgressBar(max_value=1) p.update(1) p.update(0) @@ -82,7 +82,7 @@ def test_backwards() -> None: def test_incorrect_max_value() -> None: """Looping up to 10 when max_value is 5? This is madness!""" - p = progressbar.ProgressBar(max_value=5) + p = progressbar2.ProgressBar(max_value=5) for i in range(5): time.sleep(1) p.update(i) @@ -95,23 +95,23 @@ def test_incorrect_max_value() -> None: def test_deprecated_maxval() -> None: with pytest.warns(DeprecationWarning): - progressbar.ProgressBar(maxval=5) + progressbar2.ProgressBar(maxval=5) def test_deprecated_poll() -> None: with pytest.warns(DeprecationWarning): - progressbar.ProgressBar(poll=5) + progressbar2.ProgressBar(poll=5) def test_deprecated_currval() -> None: with pytest.warns(DeprecationWarning): - bar = progressbar.ProgressBar(max_value=5) + bar = progressbar2.ProgressBar(max_value=5) bar.update(2) assert bar.currval == 2 def test_unexpected_update_keyword_arg() -> None: - p = progressbar.ProgressBar(max_value=10) + p = progressbar2.ProgressBar(max_value=10) with pytest.raises(TypeError): for i in range(10): time.sleep(1) @@ -120,21 +120,21 @@ def test_unexpected_update_keyword_arg() -> None: def test_variable_not_str() -> None: with pytest.raises(TypeError): - progressbar.Variable(1) + progressbar2.Variable(1) def test_variable_too_many_strs() -> None: with pytest.raises(ValueError): - progressbar.Variable('too long') + progressbar2.Variable('too long') def test_negative_value() -> None: - bar = progressbar.ProgressBar(max_value=10) + bar = progressbar2.ProgressBar(max_value=10) with pytest.raises(ValueError): bar.update(value=-1) def test_increment() -> None: - bar = progressbar.ProgressBar(max_value=10) + bar = progressbar2.ProgressBar(max_value=10) bar.increment() del bar diff --git a/tests/test_flush.py b/tests/test_flush.py index edade1c..5fb9e71 100644 --- a/tests/test_flush.py +++ b/tests/test_flush.py @@ -1,11 +1,11 @@ import time -import progressbar +import progressbar2 def test_flush() -> None: """Left justify using the terminal width""" - p = progressbar.ProgressBar(poll_interval=0.001) + p = progressbar2.ProgressBar(poll_interval=0.001) p.print('hello') for i in range(10): diff --git a/tests/test_iterators.py b/tests/test_iterators.py index d4474e7..6444dd2 100644 --- a/tests/test_iterators.py +++ b/tests/test_iterators.py @@ -2,41 +2,41 @@ import time import pytest -import progressbar +import progressbar2 def test_list() -> None: """Progressbar can guess max_value automatically.""" - p = progressbar.ProgressBar() + p = progressbar2.ProgressBar() for _i in p(range(10)): time.sleep(0.001) def test_iterator_with_max_value() -> None: """Progressbar can't guess max_value.""" - p = progressbar.ProgressBar(max_value=10) + p = progressbar2.ProgressBar(max_value=10) for _i in p(iter(range(10))): time.sleep(0.001) def test_iterator_without_max_value_error() -> None: """Progressbar can't guess max_value.""" - p = progressbar.ProgressBar() + p = progressbar2.ProgressBar() for _i in p(iter(range(10))): time.sleep(0.001) - assert p.max_value is progressbar.UnknownLength + assert p.max_value is progressbar2.UnknownLength def test_iterator_without_max_value() -> None: """Progressbar can't guess max_value.""" - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( widgets=[ - progressbar.AnimatedMarker(), - progressbar.FormatLabel('%(value)d'), - progressbar.BouncingBar(), - progressbar.BouncingBar(marker=progressbar.RotatingMarker()), + progressbar2.AnimatedMarker(), + progressbar2.FormatLabel('%(value)d'), + progressbar2.BouncingBar(), + progressbar2.BouncingBar(marker=progressbar2.RotatingMarker()), ], ) for _i in p(iter(range(10))): @@ -45,14 +45,14 @@ def test_iterator_without_max_value() -> None: def test_iterator_with_incorrect_max_value() -> None: """Progressbar can't guess max_value.""" - p = progressbar.ProgressBar(max_value=10) + p = progressbar2.ProgressBar(max_value=10) with pytest.raises(ValueError): for _i in p(iter(range(20))): time.sleep(0.001) def test_adding_value() -> None: - p = progressbar.ProgressBar(max_value=10) + p = progressbar2.ProgressBar(max_value=10) p.start() p.update(5) p += 2 diff --git a/tests/test_job_status.py b/tests/test_job_status.py index 778b6ce..b9e7871 100644 --- a/tests/test_job_status.py +++ b/tests/test_job_status.py @@ -2,7 +2,7 @@ import time import pytest -import progressbar +import progressbar2 @pytest.mark.parametrize( @@ -14,8 +14,8 @@ import progressbar ], ) def test_status(status) -> None: - with progressbar.ProgressBar( - widgets=[progressbar.widgets.JobStatusBar('status')], + with progressbar2.ProgressBar( + widgets=[progressbar2.widgets.JobStatusBar('status')], ) as bar: for _ in range(5): bar.increment(status=status, force=True) diff --git a/tests/test_large_values.py b/tests/test_large_values.py index 2e7ad72..4738b5f 100644 --- a/tests/test_large_values.py +++ b/tests/test_large_values.py @@ -1,17 +1,17 @@ import time -import progressbar +import progressbar2 def test_large_max_value() -> None: - with progressbar.ProgressBar(max_value=1e10) as bar: + with progressbar2.ProgressBar(max_value=1e10) as bar: for i in range(10): bar.update(i) time.sleep(0.1) def test_value_beyond_max_value() -> None: - with progressbar.ProgressBar(max_value=10, max_error=False) as bar: + with progressbar2.ProgressBar(max_value=10, max_error=False) as bar: for i in range(20): bar.update(i) time.sleep(0.01) diff --git a/tests/test_misc.py b/tests/test_misc.py index b0725af..0d58375 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -1,4 +1,4 @@ -from progressbar import __about__ +from progressbar2 import __about__ def test_about() -> None: diff --git a/tests/test_monitor_progress.py b/tests/test_monitor_progress.py index 4f99df9..cff3331 100644 --- a/tests/test_monitor_progress.py +++ b/tests/test_monitor_progress.py @@ -4,7 +4,7 @@ from __future__ import annotations import os import pprint -import progressbar +import progressbar2 pytest_plugins = 'pytester' @@ -14,12 +14,12 @@ sys.path.append({progressbar_path!r}) import time import timeit import freezegun -import progressbar +import progressbar2 with freezegun.freeze_time() as fake_time: timeit.default_timer = time.time - with progressbar.ProgressBar(widgets={widgets}, **{kwargs!r}) as bar: + with progressbar2.ProgressBar(widgets={widgets}, **{kwargs!r}) as bar: bar._MINIMUM_UPDATE_INTERVAL = 1e-9 for i in bar({items}): {loop_code} @@ -54,7 +54,7 @@ def _create_script( kwargs=kwargs, loop_code=indent.join(loop_code), progressbar_path=os.path.dirname( - os.path.dirname(progressbar.__file__), + os.path.dirname(progressbar2.__file__), ), ) print('# Script:') @@ -162,7 +162,7 @@ def test_non_timed(testdir) -> None: result = testdir.runpython( testdir.makepyfile( _create_script( - widgets='[progressbar.Percentage(), progressbar.Bar()]', + widgets='[progressbar2.Percentage(), progressbar2.Bar()]', items=list(range(5)), ), ), @@ -185,7 +185,7 @@ def test_line_breaks(testdir) -> None: result = testdir.runpython( testdir.makepyfile( _create_script( - widgets='[progressbar.Percentage(), progressbar.Bar()]', + widgets='[progressbar2.Percentage(), progressbar2.Bar()]', line_breaks=True, items=list(range(5)), ), @@ -209,7 +209,7 @@ def test_no_line_breaks(testdir) -> None: result = testdir.runpython( testdir.makepyfile( _create_script( - widgets='[progressbar.Percentage(), progressbar.Bar()]', + widgets='[progressbar2.Percentage(), progressbar2.Bar()]', line_breaks=False, items=list(range(5)), ), @@ -233,7 +233,7 @@ def test_percentage_label_bar(testdir) -> None: result = testdir.runpython( testdir.makepyfile( _create_script( - widgets='[progressbar.PercentageLabelBar()]', + widgets='[progressbar2.PercentageLabelBar()]', line_breaks=False, items=list(range(5)), ), @@ -257,7 +257,7 @@ def test_granular_bar(testdir) -> None: result = testdir.runpython( testdir.makepyfile( _create_script( - widgets='[progressbar.GranularBar(markers=" .oO")]', + widgets='[progressbar2.GranularBar(markers=" .oO")]', line_breaks=False, items=list(range(5)), ), diff --git a/tests/test_multibar.py b/tests/test_multibar.py index 8448420..80c7661 100644 --- a/tests/test_multibar.py +++ b/tests/test_multibar.py @@ -4,7 +4,7 @@ import time import pytest -import progressbar +import progressbar2 N = 10 BARS = 3 @@ -13,10 +13,10 @@ SLEEP = 0.002 def test_multi_progress_bar_out_of_range() -> None: widgets = [ - progressbar.MultiProgressBar('multivalues'), + progressbar2.MultiProgressBar('multivalues'), ] - bar = progressbar.ProgressBar(widgets=widgets, max_value=10) + bar = progressbar2.ProgressBar(widgets=widgets, max_value=10) with pytest.raises(ValueError): bar.update(multivalues=[123]) @@ -25,7 +25,7 @@ def test_multi_progress_bar_out_of_range() -> None: def test_multibar() -> None: - multibar = progressbar.MultiBar( + multibar = progressbar2.MultiBar( sort_keyfunc=lambda bar: bar.label, remove_finished=0.005, ) @@ -39,7 +39,7 @@ def test_multibar() -> None: multibar.prepend_label = True # Test handling of progressbars that don't call the super constructors - bar = progressbar.ProgressBar(max_value=N) + bar = progressbar2.ProgressBar(max_value=N) bar.index = -1 multibar['x'] = bar bar.start() @@ -53,7 +53,7 @@ def test_multibar() -> None: multibar.prepend_label = False multibar.append_label = True - append_bar = progressbar.ProgressBar(max_value=N) + append_bar = progressbar2.ProgressBar(max_value=N) append_bar.start() multibar._label_bar(append_bar) multibar['append'] = append_bar @@ -95,17 +95,17 @@ def test_multibar() -> None: 'label', 'value', 'percentage', - progressbar.SortKey.CREATED, - progressbar.SortKey.LABEL, - progressbar.SortKey.VALUE, - progressbar.SortKey.PERCENTAGE, + progressbar2.SortKey.CREATED, + progressbar2.SortKey.LABEL, + progressbar2.SortKey.VALUE, + progressbar2.SortKey.PERCENTAGE, ], ) def test_multibar_sorting(sort_key) -> None: - with progressbar.MultiBar() as multibar: + with progressbar2.MultiBar() as multibar: for i in range(BARS): label = f'bar {i}' - multibar[label] = progressbar.ProgressBar(max_value=N) + multibar[label] = progressbar2.ProgressBar(max_value=N) for bar in multibar.values(): for _j in bar(range(N)): @@ -117,20 +117,20 @@ def test_multibar_sorting(sort_key) -> None: def test_offset_bar() -> None: - with progressbar.ProgressBar(line_offset=2) as bar: + with progressbar2.ProgressBar(line_offset=2) as bar: for i in range(N): bar.update(i) def test_multibar_show_finished() -> None: - multibar = progressbar.MultiBar(show_finished=True) - multibar['bar'] = progressbar.ProgressBar(max_value=N) + multibar = progressbar2.MultiBar(show_finished=True) + multibar['bar'] = progressbar2.ProgressBar(max_value=N) multibar.render(force=True) - with progressbar.MultiBar(show_finished=False) as multibar: + with progressbar2.MultiBar(show_finished=False) as multibar: multibar.finished_format = 'finished: {label}' for i in range(3): - multibar[f'bar {i}'] = progressbar.ProgressBar(max_value=N) + multibar[f'bar {i}'] = progressbar2.ProgressBar(max_value=N) for bar in multibar.values(): for i in range(N): @@ -141,14 +141,14 @@ def test_multibar_show_finished() -> None: def test_multibar_show_initial() -> None: - multibar = progressbar.MultiBar(show_initial=False) - multibar['bar'] = progressbar.ProgressBar(max_value=N) + multibar = progressbar2.MultiBar(show_initial=False) + multibar['bar'] = progressbar2.ProgressBar(max_value=N) multibar.render(force=True) def test_multibar_empty_key() -> None: - multibar = progressbar.MultiBar() - multibar[''] = progressbar.ProgressBar(max_value=N) + multibar = progressbar2.MultiBar() + multibar[''] = progressbar2.ProgressBar(max_value=N) for name in multibar: assert name == '' @@ -171,7 +171,7 @@ def test_multibar_print() -> None: if random.random() < probability: bar.print('random message for bar', bar, i) - with progressbar.MultiBar() as multibar: + with progressbar2.MultiBar() as multibar: for i in range(bars): # Get a progressbar bar = multibar[f'Thread label here {i}'] @@ -190,7 +190,7 @@ def test_multibar_print() -> None: def test_multibar_no_format() -> None: - with progressbar.MultiBar( + with progressbar2.MultiBar( initial_format=None, finished_format=None ) as multibar: bar = multibar['a'] @@ -200,8 +200,8 @@ def test_multibar_no_format() -> None: def test_multibar_finished() -> None: - multibar = progressbar.MultiBar(initial_format=None, finished_format=None) - bar = multibar['bar'] = progressbar.ProgressBar(max_value=5) + multibar = progressbar2.MultiBar(initial_format=None, finished_format=None) + bar = multibar['bar'] = progressbar2.ProgressBar(max_value=5) bar2 = multibar['bar2'] multibar.render(force=True) multibar.print('Hi') @@ -215,10 +215,10 @@ def test_multibar_finished() -> None: def test_multibar_finished_format() -> None: - multibar = progressbar.MultiBar( + multibar = progressbar2.MultiBar( finished_format='Finished {label}', show_finished=True ) - bar = multibar['bar'] = progressbar.ProgressBar(max_value=5) + bar = multibar['bar'] = progressbar2.ProgressBar(max_value=5) bar2 = multibar['bar2'] multibar.render(force=True) multibar.print('Hi') @@ -237,8 +237,8 @@ def test_multibar_finished_format() -> None: def test_multibar_threads() -> None: - multibar = progressbar.MultiBar(finished_format=None, show_finished=True) - bar = multibar['bar'] = progressbar.ProgressBar(max_value=5) + multibar = progressbar2.MultiBar(finished_format=None, show_finished=True) + bar = multibar['bar'] = progressbar2.ProgressBar(max_value=5) multibar.start() time.sleep(0.1) bar.update(3) diff --git a/tests/test_progressbar.py b/tests/test_progressbar.py index eb79e66..9603863 100644 --- a/tests/test_progressbar.py +++ b/tests/test_progressbar.py @@ -5,7 +5,7 @@ import time import original_examples # type: ignore import pytest -import progressbar +import progressbar2 # Import hack to allow for parallel Tox try: @@ -29,7 +29,7 @@ def test_examples(monkeypatch) -> None: @pytest.mark.filterwarnings('ignore:.*maxval.*:DeprecationWarning') @pytest.mark.parametrize('example', original_examples.examples) def test_original_examples(example, monkeypatch) -> None: - monkeypatch.setattr(progressbar.ProgressBar, '_MINIMUM_UPDATE_INTERVAL', 1) + monkeypatch.setattr(progressbar2.ProgressBar, '_MINIMUM_UPDATE_INTERVAL', 1) monkeypatch.setattr(time, 'sleep', lambda t: None) example() @@ -37,13 +37,13 @@ def test_original_examples(example, monkeypatch) -> None: @pytest.mark.parametrize('example', examples.examples) def test_examples_nullbar(monkeypatch, example) -> None: # Patch progressbar to use null bar instead of regular progress bar - monkeypatch.setattr(progressbar, 'ProgressBar', progressbar.NullBar) - assert progressbar.ProgressBar._MINIMUM_UPDATE_INTERVAL < 0.0001 + monkeypatch.setattr(progressbar2, 'ProgressBar', progressbar2.NullBar) + assert progressbar2.ProgressBar._MINIMUM_UPDATE_INTERVAL < 0.0001 example() def test_reuse() -> None: - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() bar.start() for i in range(10): bar.update(i) @@ -61,7 +61,7 @@ def test_reuse() -> None: def test_dirty() -> None: - bar = progressbar.ProgressBar() + bar = progressbar2.ProgressBar() bar.start() assert bar.started() for i in range(10): @@ -72,7 +72,7 @@ def test_dirty() -> None: def test_negative_maximum() -> None: - with pytest.raises(ValueError), progressbar.ProgressBar( + with pytest.raises(ValueError), progressbar2.ProgressBar( max_value=-1 ) as progress: progress.start() diff --git a/tests/test_progressbar_command.py b/tests/test_progressbar_command.py index 3dd82d6..b3fbb84 100644 --- a/tests/test_progressbar_command.py +++ b/tests/test_progressbar_command.py @@ -2,7 +2,7 @@ import io import pytest -import progressbar.__main__ as main +import progressbar2.__main__ as main def test_size_to_bytes() -> None: diff --git a/tests/test_samples.py b/tests/test_samples.py index 2881fac..4bfc51a 100644 --- a/tests/test_samples.py +++ b/tests/test_samples.py @@ -3,14 +3,14 @@ from datetime import datetime, timedelta from python_utils.containers import SliceableDeque -import progressbar -from progressbar import widgets +import progressbar2 +from progressbar2 import widgets def test_numeric_samples() -> None: samples = 5 samples_widget = widgets.SamplesMixin(samples=samples) - bar = progressbar.ProgressBar(widgets=[samples_widget]) + bar = progressbar2.ProgressBar(widgets=[samples_widget]) # Force updates in all cases samples_widget.INTERVAL = timedelta(0) @@ -46,7 +46,7 @@ def test_numeric_samples() -> None: def test_timedelta_samples() -> None: samples = timedelta(seconds=5) samples_widget = widgets.SamplesMixin(samples=samples) - bar = progressbar.ProgressBar(widgets=[samples_widget]) + bar = progressbar2.ProgressBar(widgets=[samples_widget]) # Force updates in all cases samples_widget.INTERVAL = timedelta(0) @@ -85,7 +85,7 @@ def test_timedelta_samples() -> None: def test_timedelta_no_update() -> None: samples = timedelta(seconds=0.1) samples_widget = widgets.SamplesMixin(samples=samples) - bar = progressbar.ProgressBar(widgets=[samples_widget]) + bar = progressbar2.ProgressBar(widgets=[samples_widget]) bar.update() assert samples_widget(bar, None, True) == (None, None) diff --git a/tests/test_speed.py b/tests/test_speed.py index 4f53639..182e139 100644 --- a/tests/test_speed.py +++ b/tests/test_speed.py @@ -1,6 +1,6 @@ import pytest -import progressbar +import progressbar2 @pytest.mark.parametrize( @@ -23,7 +23,7 @@ import progressbar ], ) def test_file_transfer_speed(total_seconds_elapsed, value, expected) -> None: - widget = progressbar.FileTransferSpeed() + widget = progressbar2.FileTransferSpeed() assert ( widget( None, diff --git a/tests/test_stream.py b/tests/test_stream.py index d14845d..4701db7 100644 --- a/tests/test_stream.py +++ b/tests/test_stream.py @@ -4,42 +4,42 @@ import sys import pytest -import progressbar -from progressbar import terminal +import progressbar2 +from progressbar2 import terminal def test_nowrap() -> None: # Make sure we definitely unwrap for _i in range(5): - progressbar.streams.unwrap(stderr=True, stdout=True) + progressbar2.streams.unwrap(stderr=True, stdout=True) stdout = sys.stdout stderr = sys.stderr - progressbar.streams.wrap() + progressbar2.streams.wrap() assert stdout == sys.stdout assert stderr == sys.stderr - progressbar.streams.unwrap() + progressbar2.streams.unwrap() assert stdout == sys.stdout assert stderr == sys.stderr # Make sure we definitely unwrap for _i in range(5): - progressbar.streams.unwrap(stderr=True, stdout=True) + progressbar2.streams.unwrap(stderr=True, stdout=True) def test_wrap() -> None: # Make sure we definitely unwrap for _i in range(5): - progressbar.streams.unwrap(stderr=True, stdout=True) + progressbar2.streams.unwrap(stderr=True, stdout=True) stdout = sys.stdout stderr = sys.stderr - progressbar.streams.wrap(stderr=True, stdout=True) + progressbar2.streams.wrap(stderr=True, stdout=True) assert stdout != sys.stdout assert stderr != sys.stderr @@ -48,31 +48,31 @@ def test_wrap() -> None: stdout = sys.stdout stderr = sys.stderr - progressbar.streams.wrap(stderr=True, stdout=True) + progressbar2.streams.wrap(stderr=True, stdout=True) assert stdout == sys.stdout assert stderr == sys.stderr # Make sure we definitely unwrap for _i in range(5): - progressbar.streams.unwrap(stderr=True, stdout=True) + progressbar2.streams.unwrap(stderr=True, stdout=True) def test_excepthook() -> None: - progressbar.streams.wrap(stderr=True, stdout=True) + progressbar2.streams.wrap(stderr=True, stdout=True) try: raise RuntimeError() # noqa: TRY301 except RuntimeError: - progressbar.streams.excepthook(*sys.exc_info()) + progressbar2.streams.excepthook(*sys.exc_info()) - progressbar.streams.unwrap_excepthook() - progressbar.streams.unwrap_excepthook() + progressbar2.streams.unwrap_excepthook() + progressbar2.streams.unwrap_excepthook() def test_fd_as_io_stream() -> None: stream = io.StringIO() - with progressbar.ProgressBar(fd=stream) as pb: + with progressbar2.ProgressBar(fd=stream) as pb: for i in range(101): pb.update(i) stream.close() @@ -86,14 +86,14 @@ def test_no_newlines() -> None: is_terminal=True, ) - with progressbar.ProgressBar(**kwargs) as bar: + with progressbar2.ProgressBar(**kwargs) as bar: for i in range(5): bar.update(i) for i in range(5, 10): try: - print('\n\n', file=progressbar.streams.stdout) - print('\n\n', file=progressbar.streams.stderr) + print('\n\n', file=progressbar2.streams.stdout) + print('\n\n', file=progressbar2.streams.stderr) except ValueError: pass bar.update(i) @@ -102,7 +102,7 @@ def test_no_newlines() -> None: @pytest.mark.parametrize('stream', [sys.__stdout__, sys.__stderr__]) @pytest.mark.skipif(os.name == 'nt', reason='Windows does not support this') def test_fd_as_standard_streams(stream) -> None: - with progressbar.ProgressBar(fd=stream) as pb: + with progressbar2.ProgressBar(fd=stream) as pb: for i in range(101): pb.update(i) diff --git a/tests/test_terminal.py b/tests/test_terminal.py index 3980e5f..cb6bc98 100644 --- a/tests/test_terminal.py +++ b/tests/test_terminal.py @@ -3,14 +3,14 @@ import sys import time from datetime import timedelta -import progressbar -from progressbar import terminal +import progressbar2 +from progressbar2 import terminal def test_left_justify() -> None: """Left justify using the terminal width""" - p = progressbar.ProgressBar( - widgets=[progressbar.BouncingBar(marker=progressbar.RotatingMarker())], + p = progressbar2.ProgressBar( + widgets=[progressbar2.BouncingBar(marker=progressbar2.RotatingMarker())], max_value=100, term_width=20, left_justify=True, @@ -23,8 +23,8 @@ def test_left_justify() -> None: def test_right_justify() -> None: """Right justify using the terminal width""" - p = progressbar.ProgressBar( - widgets=[progressbar.BouncingBar(marker=progressbar.RotatingMarker())], + p = progressbar2.ProgressBar( + widgets=[progressbar2.BouncingBar(marker=progressbar2.RotatingMarker())], max_value=100, term_width=20, left_justify=False, @@ -49,9 +49,9 @@ def test_auto_width(monkeypatch) -> None: monkeypatch.setattr(fcntl, 'ioctl', ioctl) monkeypatch.setattr(signal, 'signal', fake_signal) - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( widgets=[ - progressbar.BouncingBar(marker=progressbar.RotatingMarker()), + progressbar2.BouncingBar(marker=progressbar2.RotatingMarker()), ], max_value=100, left_justify=True, @@ -67,8 +67,8 @@ def test_auto_width(monkeypatch) -> None: def test_fill_right() -> None: """Right justify using the terminal width""" - p = progressbar.ProgressBar( - widgets=[progressbar.BouncingBar(fill_left=False)], + p = progressbar2.ProgressBar( + widgets=[progressbar2.BouncingBar(fill_left=False)], max_value=100, term_width=20, ) @@ -80,8 +80,8 @@ def test_fill_right() -> None: def test_fill_left() -> None: """Right justify using the terminal width""" - p = progressbar.ProgressBar( - widgets=[progressbar.BouncingBar(fill_left=True)], + p = progressbar2.ProgressBar( + widgets=[progressbar2.BouncingBar(fill_left=True)], max_value=100, term_width=20, ) @@ -93,11 +93,11 @@ def test_fill_left() -> None: def test_no_fill(monkeypatch) -> None: """Simply bounce within the terminal width""" - bar = progressbar.BouncingBar() + bar = progressbar2.BouncingBar() bar.INTERVAL = timedelta(seconds=1) - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( widgets=[bar], - max_value=progressbar.UnknownLength, + max_value=progressbar2.UnknownLength, term_width=20, ) @@ -109,7 +109,7 @@ def test_no_fill(monkeypatch) -> None: def test_stdout_redirection() -> None: - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( fd=sys.stdout, max_value=10, redirect_stdout=True, @@ -121,8 +121,8 @@ def test_stdout_redirection() -> None: def test_double_stdout_redirection() -> None: - p = progressbar.ProgressBar(max_value=10, redirect_stdout=True) - p2 = progressbar.ProgressBar(max_value=10, redirect_stdout=True) + p = progressbar2.ProgressBar(max_value=10, redirect_stdout=True) + p2 = progressbar2.ProgressBar(max_value=10, redirect_stdout=True) for i in range(10): print('', file=sys.stdout) @@ -131,7 +131,7 @@ def test_double_stdout_redirection() -> None: def test_stderr_redirection() -> None: - p = progressbar.ProgressBar(max_value=10, redirect_stderr=True) + p = progressbar2.ProgressBar(max_value=10, redirect_stderr=True) for i in range(10): print('', file=sys.stderr) @@ -139,7 +139,7 @@ def test_stderr_redirection() -> None: def test_stdout_stderr_redirection() -> None: - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( max_value=10, redirect_stdout=True, redirect_stderr=True, @@ -168,7 +168,7 @@ def test_resize(monkeypatch) -> None: monkeypatch.setattr(fcntl, 'ioctl', ioctl) monkeypatch.setattr(signal, 'signal', fake_signal) - p = progressbar.ProgressBar(max_value=10) + p = progressbar2.ProgressBar(max_value=10) p.start() for i in range(10): diff --git a/tests/test_timed.py b/tests/test_timed.py index ee19ab9..9295432 100644 --- a/tests/test_timed.py +++ b/tests/test_timed.py @@ -1,15 +1,15 @@ import datetime import time -import progressbar +import progressbar2 def test_timer() -> None: """Testing (Adaptive)ETA when the value doesn't actually change""" widgets = [ - progressbar.Timer(), + progressbar2.Timer(), ] - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( max_value=2, widgets=widgets, poll_interval=0.0001, @@ -27,9 +27,9 @@ def test_timer() -> None: def test_eta() -> None: """Testing (Adaptive)ETA when the value doesn't actually change""" widgets = [ - progressbar.ETA(), + progressbar2.ETA(), ] - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( min_value=0, max_value=2, widgets=widgets, @@ -54,10 +54,10 @@ def test_eta() -> None: def test_adaptive_eta() -> None: """Testing (Adaptive)ETA when the value doesn't actually change""" widgets = [ - progressbar.AdaptiveETA(), + progressbar2.AdaptiveETA(), ] widgets[0].INTERVAL = datetime.timedelta(microseconds=1) - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( max_value=2, samples=2, widgets=widgets, @@ -74,9 +74,9 @@ def test_adaptive_eta() -> None: def test_adaptive_transfer_speed() -> None: """Testing (Adaptive)ETA when the value doesn't actually change""" widgets = [ - progressbar.AdaptiveTransferSpeed(), + progressbar2.AdaptiveTransferSpeed(), ] - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( max_value=2, widgets=widgets, poll_interval=0.0001, @@ -94,8 +94,8 @@ def test_etas(monkeypatch) -> None: n = 10 interval = datetime.timedelta(seconds=1) widgets = [ - progressbar.FileTransferSpeed(), - progressbar.AdaptiveTransferSpeed(samples=n / 2), + progressbar2.FileTransferSpeed(), + progressbar2.AdaptiveTransferSpeed(samples=n / 2), ] datas = [] @@ -110,9 +110,9 @@ def test_etas(monkeypatch) -> None: datas.append(data) return 0, 0 - monkeypatch.setattr(progressbar.FileTransferSpeed, '_speed', calculate_eta) + monkeypatch.setattr(progressbar2.FileTransferSpeed, '_speed', calculate_eta) monkeypatch.setattr( - progressbar.AdaptiveTransferSpeed, + progressbar2.AdaptiveTransferSpeed, '_speed', calculate_eta, ) @@ -120,7 +120,7 @@ def test_etas(monkeypatch) -> None: for widget in widgets: widget.INTERVAL = interval - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( max_value=n, widgets=widgets, poll_interval=interval, @@ -154,11 +154,11 @@ def test_etas(monkeypatch) -> None: def test_non_changing_eta() -> None: """Testing (Adaptive)ETA when the value doesn't actually change""" widgets = [ - progressbar.AdaptiveETA(), - progressbar.ETA(), - progressbar.AdaptiveTransferSpeed(), + progressbar2.AdaptiveETA(), + progressbar2.ETA(), + progressbar2.AdaptiveTransferSpeed(), ] - p = progressbar.ProgressBar( + p = progressbar2.ProgressBar( max_value=2, widgets=widgets, poll_interval=0.0001, @@ -180,8 +180,8 @@ def test_eta_not_available(): def gen(): yield from range(200) - widgets = [progressbar.AdaptiveETA(), progressbar.ETA()] + widgets = [progressbar2.AdaptiveETA(), progressbar2.ETA()] - bar = progressbar.ProgressBar(widgets=widgets) + bar = progressbar2.ProgressBar(widgets=widgets) for _i in bar(gen()): pass diff --git a/tests/test_timer.py b/tests/test_timer.py index 083e1b1..2e25186 100644 --- a/tests/test_timer.py +++ b/tests/test_timer.py @@ -2,7 +2,7 @@ from datetime import timedelta import pytest -import progressbar +import progressbar2 @pytest.mark.parametrize( @@ -23,7 +23,7 @@ import progressbar ) def test_poll_interval(parameter, poll_interval, expected) -> None: # Test int, float and timedelta intervals - bar = progressbar.ProgressBar(**{parameter: poll_interval}) + bar = progressbar2.ProgressBar(**{parameter: poll_interval}) assert getattr(bar, parameter) == expected @@ -36,11 +36,11 @@ def test_poll_interval(parameter, poll_interval, expected) -> None: ) def test_intervals(monkeypatch, interval) -> None: monkeypatch.setattr( - progressbar.ProgressBar, + progressbar2.ProgressBar, '_MINIMUM_UPDATE_INTERVAL', interval, ) - bar = progressbar.ProgressBar(max_value=100) + bar = progressbar2.ProgressBar(max_value=100) # Initially there should be no last_update_time assert bar.last_update_time is None diff --git a/tests/test_unicode.py b/tests/test_unicode.py index 3babbdd..dd6c7a1 100644 --- a/tests/test_unicode.py +++ b/tests/test_unicode.py @@ -5,7 +5,7 @@ import time import pytest from python_utils import converters -import progressbar +import progressbar2 @pytest.mark.parametrize( @@ -25,9 +25,9 @@ def test_markers(name, markers: bytes | str, as_unicode) -> None: widgets = [ f'{name.capitalize()}: ', - progressbar.AnimatedMarker(markers=markers), + progressbar2.AnimatedMarker(markers=markers), ] - bar = progressbar.ProgressBar(widgets=widgets) + bar = progressbar2.ProgressBar(widgets=widgets) bar._MINIMUM_UPDATE_INTERVAL = 1e-12 for _i in bar(iter(range(24))): time.sleep(0.001) diff --git a/tests/test_unknown_length.py b/tests/test_unknown_length.py index 65a5477..efd3178 100644 --- a/tests/test_unknown_length.py +++ b/tests/test_unknown_length.py @@ -1,17 +1,17 @@ -import progressbar +import progressbar2 def test_unknown_length() -> None: - pb = progressbar.ProgressBar( - widgets=[progressbar.AnimatedMarker()], - max_value=progressbar.UnknownLength, + pb = progressbar2.ProgressBar( + widgets=[progressbar2.AnimatedMarker()], + max_value=progressbar2.UnknownLength, ) - assert pb.max_value is progressbar.UnknownLength + assert pb.max_value is progressbar2.UnknownLength def test_unknown_length_default_widgets() -> None: # The default widgets picked should work without a known max_value - pb = progressbar.ProgressBar(max_value=progressbar.UnknownLength).start() + pb = progressbar2.ProgressBar(max_value=progressbar2.UnknownLength).start() for i in range(60): pb.update(i) pb.finish() @@ -19,12 +19,12 @@ def test_unknown_length_default_widgets() -> None: def test_unknown_length_at_start() -> None: # The default widgets should be picked after we call .start() - pb = progressbar.ProgressBar().start(max_value=progressbar.UnknownLength) + pb = progressbar2.ProgressBar().start(max_value=progressbar2.UnknownLength) for i in range(60): pb.update(i) pb.finish() - pb2 = progressbar.ProgressBar().start(max_value=progressbar.UnknownLength) + pb2 = progressbar2.ProgressBar().start(max_value=progressbar2.UnknownLength) for w in pb2.widgets: print(type(w), repr(w)) - assert any(isinstance(w, progressbar.Bar) for w in pb2.widgets) + assert any(isinstance(w, progressbar2.Bar) for w in pb2.widgets) diff --git a/tests/test_utils.py b/tests/test_utils.py index e347acd..8c53550 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -2,8 +2,8 @@ import io import pytest -import progressbar -import progressbar.env +import progressbar2 +import progressbar2.env @pytest.mark.parametrize( @@ -28,11 +28,11 @@ import progressbar.env def test_env_flag(value, expected, monkeypatch) -> None: if value is not None: monkeypatch.setenv('TEST_ENV', value) - assert progressbar.env.env_flag('TEST_ENV') == expected + assert progressbar2.env.env_flag('TEST_ENV') == expected if value: monkeypatch.setenv('TEST_ENV', value.upper()) - assert progressbar.env.env_flag('TEST_ENV') == expected + assert progressbar2.env.env_flag('TEST_ENV') == expected monkeypatch.undo() @@ -41,74 +41,74 @@ def test_is_terminal(monkeypatch) -> None: fd = io.StringIO() monkeypatch.delenv('PROGRESSBAR_IS_TERMINAL', raising=False) - monkeypatch.setattr(progressbar.env, 'JUPYTER', False) + monkeypatch.setattr(progressbar2.env, 'JUPYTER', False) - assert progressbar.env.is_terminal(fd) is False - assert progressbar.env.is_terminal(fd, True) is True - assert progressbar.env.is_terminal(fd, False) is False + assert progressbar2.env.is_terminal(fd) is False + assert progressbar2.env.is_terminal(fd, True) is True + assert progressbar2.env.is_terminal(fd, False) is False - monkeypatch.setattr(progressbar.env, 'JUPYTER', True) - assert progressbar.env.is_terminal(fd) is True + monkeypatch.setattr(progressbar2.env, 'JUPYTER', True) + assert progressbar2.env.is_terminal(fd) is True # Sanity check - monkeypatch.setattr(progressbar.env, 'JUPYTER', False) - assert progressbar.env.is_terminal(fd) is False + monkeypatch.setattr(progressbar2.env, 'JUPYTER', False) + assert progressbar2.env.is_terminal(fd) is False monkeypatch.setenv('PROGRESSBAR_IS_TERMINAL', 'true') - assert progressbar.env.is_terminal(fd) is True + assert progressbar2.env.is_terminal(fd) is True monkeypatch.setenv('PROGRESSBAR_IS_TERMINAL', 'false') - assert progressbar.env.is_terminal(fd) is False + assert progressbar2.env.is_terminal(fd) is False monkeypatch.delenv('PROGRESSBAR_IS_TERMINAL') # Sanity check - assert progressbar.env.is_terminal(fd) is False + assert progressbar2.env.is_terminal(fd) is False def test_is_ansi_terminal(monkeypatch) -> None: fd = io.StringIO() monkeypatch.delenv('PROGRESSBAR_IS_TERMINAL', raising=False) - monkeypatch.setattr(progressbar.env, 'JUPYTER', False) + monkeypatch.setattr(progressbar2.env, 'JUPYTER', False) - assert not progressbar.env.is_ansi_terminal(fd) - assert progressbar.env.is_ansi_terminal(fd, True) is True - assert progressbar.env.is_ansi_terminal(fd, False) is False + assert not progressbar2.env.is_ansi_terminal(fd) + assert progressbar2.env.is_ansi_terminal(fd, True) is True + assert progressbar2.env.is_ansi_terminal(fd, False) is False - monkeypatch.setattr(progressbar.env, 'JUPYTER', True) - assert progressbar.env.is_ansi_terminal(fd) is True - monkeypatch.setattr(progressbar.env, 'JUPYTER', False) + monkeypatch.setattr(progressbar2.env, 'JUPYTER', True) + assert progressbar2.env.is_ansi_terminal(fd) is True + monkeypatch.setattr(progressbar2.env, 'JUPYTER', False) # Sanity check - assert not progressbar.env.is_ansi_terminal(fd) + assert not progressbar2.env.is_ansi_terminal(fd) monkeypatch.setenv('PROGRESSBAR_IS_TERMINAL', 'true') - assert not progressbar.env.is_ansi_terminal(fd) + assert not progressbar2.env.is_ansi_terminal(fd) monkeypatch.setenv('PROGRESSBAR_IS_TERMINAL', 'false') - assert not progressbar.env.is_ansi_terminal(fd) + assert not progressbar2.env.is_ansi_terminal(fd) monkeypatch.delenv('PROGRESSBAR_IS_TERMINAL') # Sanity check - assert not progressbar.env.is_ansi_terminal(fd) + assert not progressbar2.env.is_ansi_terminal(fd) # Fake TTY mode for environment testing fd.isatty = lambda: True monkeypatch.setenv('TERM', 'xterm') - assert progressbar.env.is_ansi_terminal(fd) is True + assert progressbar2.env.is_ansi_terminal(fd) is True monkeypatch.setenv('TERM', 'xterm-256') - assert progressbar.env.is_ansi_terminal(fd) is True + assert progressbar2.env.is_ansi_terminal(fd) is True monkeypatch.setenv('TERM', 'xterm-256color') - assert progressbar.env.is_ansi_terminal(fd) is True + assert progressbar2.env.is_ansi_terminal(fd) is True monkeypatch.setenv('TERM', 'xterm-24bit') - assert progressbar.env.is_ansi_terminal(fd) is True + assert progressbar2.env.is_ansi_terminal(fd) is True monkeypatch.delenv('TERM') monkeypatch.setenv('ANSICON', 'true') - assert progressbar.env.is_ansi_terminal(fd) is True + assert progressbar2.env.is_ansi_terminal(fd) is True monkeypatch.delenv('ANSICON') - assert not progressbar.env.is_ansi_terminal(fd) + assert not progressbar2.env.is_ansi_terminal(fd) def raise_error(): raise RuntimeError('test') fd.isatty = raise_error - assert not progressbar.env.is_ansi_terminal(fd) + assert not progressbar2.env.is_ansi_terminal(fd) diff --git a/tests/test_widgets.py b/tests/test_widgets.py index 7ab3d88..29423e9 100644 --- a/tests/test_widgets.py +++ b/tests/test_widgets.py @@ -4,37 +4,37 @@ import time import pytest -import progressbar +import progressbar2 -max_values: list[None | type[progressbar.base.UnknownLength] | int] = [ +max_values: list[None | type[progressbar2.base.UnknownLength] | int] = [ None, 10, - progressbar.UnknownLength, + progressbar2.UnknownLength, ] def test_create_wrapper() -> None: with pytest.raises(AssertionError): - progressbar.widgets.create_wrapper('ab') + progressbar2.widgets.create_wrapper('ab') with pytest.raises(RuntimeError): - progressbar.widgets.create_wrapper(123) + progressbar2.widgets.create_wrapper(123) def test_widgets_small_values() -> None: widgets = [ 'Test: ', - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.Bar(marker=progressbar.RotatingMarker()), + progressbar2.Bar(marker=progressbar2.RotatingMarker()), ' ', - progressbar.ETA(), + progressbar2.ETA(), ' ', - progressbar.AbsoluteETA(), + progressbar2.AbsoluteETA(), ' ', - progressbar.FileTransferSpeed(), + progressbar2.FileTransferSpeed(), ] - p = progressbar.ProgressBar(widgets=widgets, max_value=10).start() + p = progressbar2.ProgressBar(widgets=widgets, max_value=10).start() p.update(0) for i in range(10): time.sleep(1) @@ -46,17 +46,17 @@ def test_widgets_small_values() -> None: def test_widgets_large_values(max_value) -> None: widgets = [ 'Test: ', - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.Bar(marker=progressbar.RotatingMarker()), + progressbar2.Bar(marker=progressbar2.RotatingMarker()), ' ', - progressbar.ETA(), + progressbar2.ETA(), ' ', - progressbar.AbsoluteETA(), + progressbar2.AbsoluteETA(), ' ', - progressbar.FileTransferSpeed(), + progressbar2.FileTransferSpeed(), ] - p = progressbar.ProgressBar(widgets=widgets, max_value=max_value).start() + p = progressbar2.ProgressBar(widgets=widgets, max_value=max_value).start() for i in range(0, 10**6, 10**4): time.sleep(1) p.update(i + 1) @@ -65,10 +65,10 @@ def test_widgets_large_values(max_value) -> None: def test_format_widget() -> None: widgets = [ - progressbar.FormatLabel(f'%({mapping})r') - for mapping in progressbar.FormatLabel.mapping + progressbar2.FormatLabel(f'%({mapping})r') + for mapping in progressbar2.FormatLabel.mapping ] - p = progressbar.ProgressBar(widgets=widgets) + p = progressbar2.ProgressBar(widgets=widgets) for _ in p(range(10)): time.sleep(1) @@ -76,26 +76,26 @@ def test_format_widget() -> None: @pytest.mark.parametrize('max_value', [None, 10]) def test_all_widgets_small_values(max_value) -> None: widgets = [ - progressbar.Timer(), - progressbar.ETA(), - progressbar.AdaptiveETA(), - progressbar.AbsoluteETA(), - progressbar.DataSize(), - progressbar.FileTransferSpeed(), - progressbar.AdaptiveTransferSpeed(), - progressbar.AnimatedMarker(), - progressbar.Counter(), - progressbar.Percentage(), - progressbar.FormatLabel('%(value)d'), - progressbar.SimpleProgress(), - progressbar.Bar(), - progressbar.ReverseBar(), - progressbar.BouncingBar(), - progressbar.CurrentTime(), - progressbar.CurrentTime(microseconds=False), - progressbar.CurrentTime(microseconds=True), + progressbar2.Timer(), + progressbar2.ETA(), + progressbar2.AdaptiveETA(), + progressbar2.AbsoluteETA(), + progressbar2.DataSize(), + progressbar2.FileTransferSpeed(), + progressbar2.AdaptiveTransferSpeed(), + progressbar2.AnimatedMarker(), + progressbar2.Counter(), + progressbar2.Percentage(), + progressbar2.FormatLabel('%(value)d'), + progressbar2.SimpleProgress(), + progressbar2.Bar(), + progressbar2.ReverseBar(), + progressbar2.BouncingBar(), + progressbar2.CurrentTime(), + progressbar2.CurrentTime(microseconds=False), + progressbar2.CurrentTime(microseconds=True), ] - p = progressbar.ProgressBar(widgets=widgets, max_value=max_value) + p = progressbar2.ProgressBar(widgets=widgets, max_value=max_value) for i in range(10): time.sleep(1) p.update(i + 1) @@ -105,24 +105,24 @@ def test_all_widgets_small_values(max_value) -> None: @pytest.mark.parametrize('max_value', [10**6, 10**7]) def test_all_widgets_large_values(max_value) -> None: widgets = [ - progressbar.Timer(), - progressbar.ETA(), - progressbar.AdaptiveETA(), - progressbar.AbsoluteETA(), - progressbar.DataSize(), - progressbar.FileTransferSpeed(), - progressbar.AdaptiveTransferSpeed(), - progressbar.AnimatedMarker(), - progressbar.Counter(), - progressbar.Percentage(), - progressbar.FormatLabel('%(value)d/%(max_value)d'), - progressbar.SimpleProgress(), - progressbar.Bar(fill=lambda progress, data, width: '#'), - progressbar.ReverseBar(), - progressbar.BouncingBar(), - progressbar.FormatCustomText('Custom %(text)s', dict(text='text')), + progressbar2.Timer(), + progressbar2.ETA(), + progressbar2.AdaptiveETA(), + progressbar2.AbsoluteETA(), + progressbar2.DataSize(), + progressbar2.FileTransferSpeed(), + progressbar2.AdaptiveTransferSpeed(), + progressbar2.AnimatedMarker(), + progressbar2.Counter(), + progressbar2.Percentage(), + progressbar2.FormatLabel('%(value)d/%(max_value)d'), + progressbar2.SimpleProgress(), + progressbar2.Bar(fill=lambda progress, data, width: '#'), + progressbar2.ReverseBar(), + progressbar2.BouncingBar(), + progressbar2.FormatCustomText('Custom %(text)s', dict(text='text')), ] - p = progressbar.ProgressBar(widgets=widgets, max_value=max_value) + p = progressbar2.ProgressBar(widgets=widgets, max_value=max_value) p.update() time.sleep(1) p.update() @@ -136,30 +136,30 @@ def test_all_widgets_large_values(max_value) -> None: @pytest.mark.parametrize('term_width', [1, 2, 80, 120]) def test_all_widgets_min_width(min_width, term_width) -> None: widgets = [ - progressbar.Timer(min_width=min_width), - progressbar.ETA(min_width=min_width), - progressbar.AdaptiveETA(min_width=min_width), - progressbar.AbsoluteETA(min_width=min_width), - progressbar.DataSize(min_width=min_width), - progressbar.FileTransferSpeed(min_width=min_width), - progressbar.AdaptiveTransferSpeed(min_width=min_width), - progressbar.AnimatedMarker(min_width=min_width), - progressbar.Counter(min_width=min_width), - progressbar.Percentage(min_width=min_width), - progressbar.FormatLabel('%(value)d', min_width=min_width), - progressbar.SimpleProgress(min_width=min_width), - progressbar.Bar(min_width=min_width), - progressbar.ReverseBar(min_width=min_width), - progressbar.BouncingBar(min_width=min_width), - progressbar.FormatCustomText( + progressbar2.Timer(min_width=min_width), + progressbar2.ETA(min_width=min_width), + progressbar2.AdaptiveETA(min_width=min_width), + progressbar2.AbsoluteETA(min_width=min_width), + progressbar2.DataSize(min_width=min_width), + progressbar2.FileTransferSpeed(min_width=min_width), + progressbar2.AdaptiveTransferSpeed(min_width=min_width), + progressbar2.AnimatedMarker(min_width=min_width), + progressbar2.Counter(min_width=min_width), + progressbar2.Percentage(min_width=min_width), + progressbar2.FormatLabel('%(value)d', min_width=min_width), + progressbar2.SimpleProgress(min_width=min_width), + progressbar2.Bar(min_width=min_width), + progressbar2.ReverseBar(min_width=min_width), + progressbar2.BouncingBar(min_width=min_width), + progressbar2.FormatCustomText( 'Custom %(text)s', dict(text='text'), min_width=min_width, ), - progressbar.DynamicMessage('custom', min_width=min_width), - progressbar.CurrentTime(min_width=min_width), + progressbar2.DynamicMessage('custom', min_width=min_width), + progressbar2.CurrentTime(min_width=min_width), ] - p = progressbar.ProgressBar(widgets=widgets, term_width=term_width) + p = progressbar2.ProgressBar(widgets=widgets, term_width=term_width) p.update(0) p.update() for widget in p._format_widgets(): @@ -173,30 +173,30 @@ def test_all_widgets_min_width(min_width, term_width) -> None: @pytest.mark.parametrize('term_width', [1, 2, 80, 120]) def test_all_widgets_max_width(max_width, term_width) -> None: widgets = [ - progressbar.Timer(max_width=max_width), - progressbar.ETA(max_width=max_width), - progressbar.AdaptiveETA(max_width=max_width), - progressbar.AbsoluteETA(max_width=max_width), - progressbar.DataSize(max_width=max_width), - progressbar.FileTransferSpeed(max_width=max_width), - progressbar.AdaptiveTransferSpeed(max_width=max_width), - progressbar.AnimatedMarker(max_width=max_width), - progressbar.Counter(max_width=max_width), - progressbar.Percentage(max_width=max_width), - progressbar.FormatLabel('%(value)d', max_width=max_width), - progressbar.SimpleProgress(max_width=max_width), - progressbar.Bar(max_width=max_width), - progressbar.ReverseBar(max_width=max_width), - progressbar.BouncingBar(max_width=max_width), - progressbar.FormatCustomText( + progressbar2.Timer(max_width=max_width), + progressbar2.ETA(max_width=max_width), + progressbar2.AdaptiveETA(max_width=max_width), + progressbar2.AbsoluteETA(max_width=max_width), + progressbar2.DataSize(max_width=max_width), + progressbar2.FileTransferSpeed(max_width=max_width), + progressbar2.AdaptiveTransferSpeed(max_width=max_width), + progressbar2.AnimatedMarker(max_width=max_width), + progressbar2.Counter(max_width=max_width), + progressbar2.Percentage(max_width=max_width), + progressbar2.FormatLabel('%(value)d', max_width=max_width), + progressbar2.SimpleProgress(max_width=max_width), + progressbar2.Bar(max_width=max_width), + progressbar2.ReverseBar(max_width=max_width), + progressbar2.BouncingBar(max_width=max_width), + progressbar2.FormatCustomText( 'Custom %(text)s', dict(text='text'), max_width=max_width, ), - progressbar.DynamicMessage('custom', max_width=max_width), - progressbar.CurrentTime(max_width=max_width), + progressbar2.DynamicMessage('custom', max_width=max_width), + progressbar2.CurrentTime(max_width=max_width), ] - p = progressbar.ProgressBar(widgets=widgets, term_width=term_width) + p = progressbar2.ProgressBar(widgets=widgets, term_width=term_width) p.update(0) p.update() for widget in p._format_widgets(): diff --git a/tests/test_windows.py b/tests/test_windows.py index 4c95fae..5902e49 100644 --- a/tests/test_windows.py +++ b/tests/test_windows.py @@ -9,17 +9,17 @@ if os.name == 'nt': else: pytest.skip('skipping windows-only tests', allow_module_level=True) -import progressbar +import progressbar2 pytest_plugins = 'pytester' _WIDGETS = [ - progressbar.Percentage(), + progressbar2.Percentage(), ' ', - progressbar.Bar(), + progressbar2.Bar(), ' ', - progressbar.FileTransferSpeed(), + progressbar2.FileTransferSpeed(), ' ', - progressbar.ETA(), + progressbar2.ETA(), ] _MB: int = 1024 * 1024 @@ -43,7 +43,7 @@ def scrape_console(line_count): # --------------------------------------------------------------------------- def runprogress() -> int: print('***BEGIN***') - b = progressbar.ProgressBar( + b = progressbar2.ProgressBar( widgets=['example.m4v: ', *_WIDGETS], max_value=10 * _MB, ) diff --git a/tests/test_with.py b/tests/test_with.py index 3d2253f..b3771ba 100644 --- a/tests/test_with.py +++ b/tests/test_with.py @@ -1,19 +1,19 @@ -import progressbar +import progressbar2 def test_with() -> None: - with progressbar.ProgressBar(max_value=10) as p: + with progressbar2.ProgressBar(max_value=10) as p: for i in range(10): p.update(i) def test_with_stdout_redirection() -> None: - with progressbar.ProgressBar(max_value=10, redirect_stdout=True) as p: + with progressbar2.ProgressBar(max_value=10, redirect_stdout=True) as p: for i in range(10): p.update(i) def test_with_extra_start() -> None: - with progressbar.ProgressBar(max_value=10) as p: + with progressbar2.ProgressBar(max_value=10) as p: p.start() p.start() diff --git a/tests/test_wrappingio.py b/tests/test_wrappingio.py index 71a711b..ba316f7 100644 --- a/tests/test_wrappingio.py +++ b/tests/test_wrappingio.py @@ -3,7 +3,7 @@ import sys import pytest -from progressbar import utils +from progressbar2 import utils def test_wrappingio() -> None: