Merge branch 'develop' into fix-doc-builds

Author: JonoYang

requirements.txt

@@ -9,7 +9,7 @@ chardet==4.0.0
 charset-normalizer==2.0.12
 click==8.0.4
 colorama==0.4.4
-commoncode==30.0.0
+commoncode==30.1.1
 construct==2.10.68
 cryptography==36.0.1
 debian-inspector==30.0.0

setup.cfg

@@ -69,7 +69,7 @@ install_requires =
     chardet >= 3.0.0
     click >= 6.7, !=7.0
     colorama >= 0.3.9
-    commoncode >= 30.0.0
+    commoncode >= 30.1.1
     debian-inspector >= 30.0.0
     dparse2 >= 0.6.0
     fasteners

src/scancode/cli_test_utils.py

@@ -94,6 +94,7 @@ def run_scan_click(
     If retry is True, wait 10 seconds after a failure and retry once
     """
     import click
+    import shutil
     from click.testing import CliRunner
     from scancode import cli
 
@@ -104,7 +105,7 @@ def run_scan_click(
 
     if monkeypatch:
         monkeypatch.setattr(click._termui_impl, 'isatty', lambda _: True)
-        monkeypatch.setattr(click , 'get_terminal_size', lambda : (80, 43,))
+        monkeypatch.setattr(shutil , 'get_terminal_size', lambda : (80, 43,))
 
     if not env:
         env = dict(os.environ)