Also support click 7.1.+ #31

This ensures that we work with all supported click versions and that
this is tested

Reference: aboutcode-org/scancode-toolkit#2713
Reference: #31
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

azure-pipelines.yml

@@ -63,6 +63,20 @@ jobs:
               all: tmp\Scripts\pytest -n 2 -vvs
 
 
+################################################################################
+# Test using many version of Click to work around regressions in API
+################################################################################
+
+
+    - template: etc/ci/azure-posix.yml
+      parameters:
+          job_name: ubuntu20_test_all_supported_click_versions
+          image_name: ubuntu-20.04
+          python_versions: ['3.6', '3.7', '3.8', '3.9']
+          test_suites:
+              click_versions: for clk_ver in 8.0.1 7.1.2 7.1.1 7.1 6.7; do pip install click==$clk_ver; tmp/bin/pytest -vvs tests/test_cliutils_progressbar.py; done
+
+
 ################################################################################
 # Test using a plain pip install to get the latest of all wheels
 ################################################################################

src/commoncode/cliutils.py

@@ -267,7 +267,8 @@ def progressmanager(
             '[%(bar)s]' + ' ' + '%(info)s'
             if bar_template is None else bar_template
         )
-    return progress_class(
+
+    kwargs = dict(
         iterable=iterable,
         length=length,
         fill_char=fill_char,
@@ -281,10 +282,21 @@ def progressmanager(
         label=label,
         file=file,
         color=color,
-        update_min_steps=update_min_steps,
         width=width,
     )
 
+    # Check if we have an "update_min_steps" argument that was introduced in
+    # Click 8. See https://github.com/pallets/click/pull/1698
+    # Note that we use this argument on Click 8 in order to fix a regression
+    # that this same PR introduced by Click and tracked originally at
+    # https://github.com/nexB/scancode-toolkit/issues/2583
+    # Here we create a dummy progress_class and then for the attribute presence.
+    pb = progress_class([])
+    if hasattr(pb, 'update_min_steps'):
+        kwargs['update_min_steps'] = update_min_steps
+
+    return progress_class(**kwargs)
+
 
 def fixed_width_file_name(path, max_length=25):
     """

tests/test_cliutils_progressbar.py

@@ -0,0 +1,28 @@
+#
+# Copyright (c) nexB Inc. and others. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
+# See https://github.com/nexB/commoncode for support or download.
+# See https://aboutcode.org for more information about nexB OSS projects.
+#
+
+import os
+
+from commoncode.testcase import FileDrivenTesting
+from commoncode.cliutils import progressmanager
+
+class TestProgressBar(FileDrivenTesting):
+
+    test_data_dir = os.path.join(os.path.dirname(__file__), 'data')
+
+    def test_progressmanager_works(self):
+        iterable = range(10)
+        with progressmanager(iterable) as it:
+            for _ in it:
+                pass
+
+    def test_progressmanager_verbose(self):
+        iterable = range(10)
+        with progressmanager(iterable, verbose=True) as it:
+            for _ in it:
+                pass