Fix test failures

Signed-off-by: Ayan Sinha Mahapatra <asmahapatra@aboutcode.org>

Author: AyanSinhaMahapatra

requirements.txt

@@ -11,7 +11,7 @@ charset-normalizer==3.4.2
 click==8.3.0;python_version>='3.10'
 click==8.1.7;python_version<'3.10'
 colorama==0.4.6
-commoncode==32.4.0
+commoncode==32.4.2
 construct==2.10.70
 container-inspector==33.0.0
 cryptography==45.0.4

tests/scancode/data/help/help.txt

@@ -8,17 +8,17 @@ Usage: scancode [OPTIONS] <OUTPUT FORMAT OPTION(s)> <input>...
 Options:
 
   primary scans:
-    -l, --license         Scan <input> for licenses.
-    -p, --package         Scan <input> for application package and dependency
-                          manifests, lockfiles and related data.
-    --system-package      Scan <input> for installed system package databases.
+    -l, --license          Scan <input> for licenses.
+    -p, --package          Scan <input> for application package and dependency
+                           manifests, lockfiles and related data.
+    --system-package       Scan <input> for installed system package databases.
     --package-in-compiled  Scan <input> for package and dependency related data in
-                          compiled binaries. Currently supported compiled
-                          binaries:Go, Rust.
-    --package-only        Scan for system and application package data and skip
-                          license/copyright detection and top-level package
-                          creation.
-    -c, --copyright       Scan <input> for copyrights.
+                           compiled binaries. Currently supported compiled
+                           binaries: Go, Rust.
+    --package-only         Scan for system and application package data and skip
+                           license/copyright detection and top-level package
+                           creation.
+    -c, --copyright        Scan <input> for copyrights.
 
   other scans:
     -i, --info   Scan <input> for file information (size, checksums, etc).

tests/scancode/data/help/help_linux.txt

@@ -8,19 +8,19 @@ Usage: scancode [OPTIONS] <OUTPUT FORMAT OPTION(s)> <input>...
 Options:
 
   primary scans:
-    -l, --license         Scan <input> for licenses.
-    -p, --package         Scan <input> for application package and dependency
-                          manifests, lockfiles and related data.
-    --system-package      Scan <input> for installed system package databases.
+    -l, --license          Scan <input> for licenses.
+    -p, --package          Scan <input> for application package and dependency
+                           manifests, lockfiles and related data.
+    --system-package       Scan <input> for installed system package databases.
     --package-in-compiled  Scan <input> for package and dependency related data in
-                          compiled binaries. Currently supported compiled
-                          binaries: Go, Rust.
-    --package-only        Scan for system and application package data and skip
-                          license/copyright detection and top-level package
-                          creation.
-    -c, --copyright       Scan <input> for copyrights.
-    --go-symbol           Collect Go symbols.
-    --rust-symbol         Collect Rust symbols from rust binaries.
+                           compiled binaries. Currently supported compiled
+                           binaries: Go, Rust.
+    --package-only         Scan for system and application package data and skip
+                           license/copyright detection and top-level package
+                           creation.
+    -c, --copyright        Scan <input> for copyrights.
+    --go-symbol            Collect Go symbols.
+    --rust-symbol          Collect Rust symbols from rust binaries.
 
   other scans:
     -i, --info   Scan <input> for file information (size, checksums, etc).

tests/scancode/test_cli.py

@@ -19,8 +19,6 @@
 from commoncode.system import on_mac
 from commoncode.system import on_macos_14_or_higher
 from commoncode.system import on_windows
-from commoncode.system import py36
-from commoncode.system import py37
 
 from scancode.cli_test_utils import check_json_scan
 from scancode.cli_test_utils import load_json_result
@@ -901,9 +899,6 @@ def test_check_error_count():
     assert str(error_files) == str(error_count)
 
 
-on_mac_new_py = on_mac and not (py36 or py37)
-
-
 def test_scan_keep_temp_files_is_false_by_default():
     test_file = test_env.get_test_loc('tempfiles/samples')
     result_file = test_env.get_temp_file('json')
@@ -919,7 +914,7 @@ def test_scan_keep_temp_files_is_false_by_default():
     # the SCANCODE_TEMP dir is not deleted, but it should be empty
     assert os.path.exists(temp_directory)
     # this does not make sense but that's what is seen in practice
-    if on_mac_new_py:
+    if on_mac:
         expected = 4
     elif on_windows:
         expected = 2
@@ -945,8 +940,8 @@ def test_scan_keep_temp_files_keeps_files():
     # the SCANCODE_TEMP dir is not deleted, but it should not be empty
     assert os.path.exists(temp_directory)
     # this does not make sense but that's what is seen in practice
-    expected = 8 if (on_windows or on_mac_new_py) else 7
-    if on_mac_new_py:
+    expected = 8 if (on_windows or on_mac) else 7
+    if on_mac:
         expected = 10
     elif on_windows:
         expected = 8