Fix test failures

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

requirements.txt

@@ -10,7 +10,7 @@ chardet==5.2.0
 charset-normalizer==3.4.2
 click==8.3.0
 colorama==0.4.6
-commoncode==32.4.0
+commoncode==32.4.1
 construct==2.10.70
 container-inspector==33.0.0
 cryptography==45.0.4

setup-mini.cfg

@@ -72,7 +72,7 @@ install_requires =
     click >= 6.7, !=7.0, !=8.1.8;python_version<'3.10'
     click >= 8.2.0;python_version>='3.10'
     colorama >= 0.3.9
-    commoncode >= 32.3.0
+    commoncode >= 32.4.0
     container-inspector >= 31.0.0
     debian-inspector >= 31.1.0
     dparse2 >= 0.7.0

src/packagedcode/win_reg.py

@@ -12,6 +12,7 @@
 import sys
 from pathlib import Path
 from pathlib import PureWindowsPath
+from dataclasses import asdict
 
 import attr
 
@@ -68,7 +69,7 @@ def get_registry_tree(registry_location, registry_path):
     if not name_key_entry:
         return []
     return [
-        attr.asdict(entry) for entry in registry_hive.recurse_subkeys(name_key_entry, as_json=True)
+        asdict(entry) for entry in registry_hive.recurse_subkeys(name_key_entry, as_json=True)
     ]
 
 

tests/scancode/test_cli.py

@@ -19,8 +19,7 @@
 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 commoncode.system import py314
 
 from scancode.cli_test_utils import check_json_scan
 from scancode.cli_test_utils import load_json_result
@@ -901,8 +900,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')
@@ -919,9 +916,9 @@ 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:
+    elif on_windows or (on_linux and py314):
         expected = 2
     else:
         expected = 1
@@ -945,10 +942,10 @@ 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:
+    elif on_windows or (on_linux and py314):
         expected = 8
     else:
         expected = 7