[GR-21590][GR-59478] Update imports

msimacek · msimacek · commit 2aa9a4b6a8e4 · 2025-01-13T13:52:56.000Z
PullRequest: graalpython/3642
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ "overlay": "74159503b4e58471a5eddfca77d836f348e045e1" }
+{ "overlay": "a2c662481228644c2e37d5adac1219bb2778eea1" }
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/conftest.toml b/graalpython/com.oracle.graal.python.test/src/tests/conftest.toml
@@ -21,18 +21,15 @@ partial_splits_individual_tests = true
 # on Windows, yet, add their files here.
 exclude_on = ['win32']
 selector = [
-    "test_mmap.py", # all tests fail with PermissionError, so does the mmap test in test_memoryview and cpyext/test_abstract
     "test_multiprocessing_graalpy.py", # import _winapi
     "test_patched_pip.py",
     "test_pathlib.py",
     "test_posix.py", # import posix
     "test_pyio.py", # pyio imports msvcrt
     "test_signal.py",
     "test_structseq.py", # import posix
-    "cpyext/test_abstract.py", # mmap PermissionError
     "cpyext/test_member.py", # Too many assumptions about long size
     "cpyext/test_memoryview.py", # Failure in test_memoryview_read_0dim
-    "cpyext/test_mmap.py",
     "cpyext/test_shutdown.py", # Uses gcc-specific attribute
     "cpyext/test_wiki.py", # Assumptions about long size
 ]
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_asyncio.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_asyncio.txt
@@ -606,7 +606,7 @@ test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_recvfrom @ darwin
 test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_recvfrom_into @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sendto_blocking @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_accept @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_connect_racing @ darwin-x86_64,linux-aarch64,linux-x86_64
+test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_connect_racing @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_fail @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_ops @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_racing @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_collections.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_collections.txt
@@ -22,6 +22,7 @@ test.test_collections.TestChainMap.test_missing @ darwin-arm64,darwin-x86_64,lin
 test.test_collections.TestChainMap.test_new_child @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_collections.TestChainMap.test_order_preservation @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_collections.TestChainMap.test_ordering @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_collections.TestChainMap.test_union_operators @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_collections.TestCollectionABCs.test_ByteString @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_collections.TestCollectionABCs.test_Mapping @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_collections.TestCollectionABCs.test_MutableMapping @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_concurrent_futures.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_concurrent_futures.txt
@@ -77,7 +77,7 @@ test.test_concurrent_futures.test_shutdown.ProcessPoolSpawnProcessPoolShutdownTe
 !test.test_concurrent_futures.test_shutdown.ProcessPoolSpawnProcessPoolShutdownTest.test_submit_after_interpreter_shutdown @ darwin-arm64,linux-aarch64,linux-x86_64
 test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_cancel_futures @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_context_manager_shutdown @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_del_shutdown @ darwin-x86_64
+!test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_del_shutdown
 test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_hang_gh94440 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_hang_issue12364 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_run_after_shutdown @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_descr.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_descr.txt
@@ -93,6 +93,7 @@ test.test_descr.ClassPropertiesAndMethods.test_str_of_str_subclass @ darwin-arm6
 test.test_descr.ClassPropertiesAndMethods.test_str_operations @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_descr.ClassPropertiesAndMethods.test_str_subclass_as_dict_key @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_descr.ClassPropertiesAndMethods.test_subclass_propagation @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_descr.ClassPropertiesAndMethods.test_subclass_right_op @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_descr.ClassPropertiesAndMethods.test_subclassing_does_not_duplicate_dict_descriptors @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_descr.ClassPropertiesAndMethods.test_supers @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_descr.ClassPropertiesAndMethods.test_type___getattribute__ @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt
@@ -1,22 +1,22 @@
 test.test_mmap.LargeMmapTests.test_large_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_mmap.MmapTests.test_anonymous @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
+test.test_mmap.MmapTests.test_anonymous @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_mmap.MmapTests.test_bad_file_desc @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_mmap.MmapTests.test_basic @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_mmap.MmapTests.test_concat_repeat_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_mmap.MmapTests.test_context_manager @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_mmap.MmapTests.test_context_manager_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_mmap.MmapTests.test_double_close @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_mmap.MmapTests.test_empty_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_mmap.MmapTests.test_entire_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_mmap.MmapTests.test_find_does_not_access_beyond_buffer @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_mmap.MmapTests.test_find_end @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_mmap.MmapTests.test_flush_return_value @ darwin-arm64,darwin-x86_64
+test.test_mmap.MmapTests.test_double_close @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_mmap.MmapTests.test_empty_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_mmap.MmapTests.test_entire_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_mmap.MmapTests.test_find_does_not_access_beyond_buffer @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_mmap.MmapTests.test_find_end @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_mmap.MmapTests.test_flush_return_value @ darwin-arm64,darwin-x86_64,win32-AMD64
 test.test_mmap.MmapTests.test_length_0_large_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_mmap.MmapTests.test_length_0_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_mmap.MmapTests.test_offset @ darwin-x86_64,linux-x86_64
 test.test_mmap.MmapTests.test_prot_readonly @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_mmap.MmapTests.test_read_all @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
+test.test_mmap.MmapTests.test_read_all @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_mmap.MmapTests.test_read_invalid_arg @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_mmap.MmapTests.test_subclass @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_mmap.MmapTests.test_tougher_find @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_mmap.MmapTests.test_write_returning_the_number_of_bytes_written @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
+test.test_mmap.MmapTests.test_write_returning_the_number_of_bytes_written @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_os.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_os.txt
@@ -114,6 +114,7 @@ test.test_os.RemoveDirsTests.test_remove_nothing @ darwin-arm64,darwin-x86_64,li
 test.test_os.RemoveDirsTests.test_remove_partial @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_os.StatAttributeTests.test_15261 @ win32-AMD64
 test.test_os.StatAttributeTests.test_1686475 @ win32-AMD64
+test.test_os.StatAttributeTests.test_access_denied @ win32-AMD64
 test.test_os.StatAttributeTests.test_stat_attributes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_os.StatAttributeTests.test_stat_attributes_bytes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_os.StatAttributeTests.test_stat_result_pickle @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_subprocess.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_subprocess.txt
@@ -174,6 +174,7 @@ test.test_subprocess.RunFuncTestCase.test_stdout_with_capture_output_arg @ darwi
 test.test_subprocess.RunFuncTestCase.test_timeout @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_subprocess.Win32ProcessTestCase.test_call_string @ win32-AMD64
 test.test_subprocess.Win32ProcessTestCase.test_close_fds @ win32-AMD64
+test.test_subprocess.Win32ProcessTestCase.test_creationflags @ win32-AMD64
 test.test_subprocess.Win32ProcessTestCase.test_kill @ win32-AMD64
 test.test_subprocess.Win32ProcessTestCase.test_kill_dead @ win32-AMD64
 test.test_subprocess.Win32ProcessTestCase.test_send_signal @ win32-AMD64
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt
@@ -1,9 +1,9 @@
 test.test_sys.ActiveExceptionTests.test_exc_info_no_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.ActiveExceptionTests.test_exc_info_with_exception_instance @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.ActiveExceptionTests.test_exc_info_with_exception_type @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_sys.ActiveExceptionTests.test_sys_exception_no_exception @ linux-x86_64
-test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_instance @ linux-x86_64
-test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_type @ linux-x86_64
+test.test_sys.ActiveExceptionTests.test_sys_exception_no_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_instance @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
+test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_type @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.DisplayHookTest.test_custom_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.DisplayHookTest.test_lost_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_sys.DisplayHookTest.test_original_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_venv.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_venv.txt
@@ -3,7 +3,7 @@ test.test_venv.BasicTest.test_deactivate_with_strict_bash_opts @ darwin-arm64,da
 test.test_venv.BasicTest.test_defaults_with_pathlib_path @ win32-AMD64
 test.test_venv.BasicTest.test_defaults_with_str_path @ win32-AMD64
 test.test_venv.BasicTest.test_executable @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_venv.BasicTest.test_executable_symlinks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
+test.test_venv.BasicTest.test_executable_symlinks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_venv.BasicTest.test_isolation @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_venv.BasicTest.test_macos_env @ darwin-arm64,darwin-x86_64
 test.test_venv.BasicTest.test_multiprocessing @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
@@ -14,7 +14,7 @@ test.test_venv.BasicTest.test_prefixes @ darwin-arm64,darwin-x86_64,linux-aarch6
 test.test_venv.BasicTest.test_prompt @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_venv.BasicTest.test_symlinking @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
 test.test_venv.BasicTest.test_sysconfig @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
-test.test_venv.BasicTest.test_sysconfig_symlinks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
+test.test_venv.BasicTest.test_sysconfig_symlinks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_venv.BasicTest.test_unoverwritable_fails @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_venv.BasicTest.test_upgrade @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_venv.BasicTest.test_upgrade_dependencies @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
diff --git a/mx.graalpython/mx_graalpython_bisect.py b/mx.graalpython/mx_graalpython_bisect.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -195,6 +195,8 @@ def bound_is_valid(self, bad_result):
 
     def bound_is_significant(self, bad_result, epsilon):
         avg = (self.value + bad_result.value) / 2
+        if not avg:
+            return False
         diff = abs(self.value - bad_result.value)
         return diff / avg >= epsilon
 
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "45f3c25ca22c18a67ee001c2d814881ad2a408a9",
+                "version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "45f3c25ca22c18a67ee001c2d814881ad2a408a9",
+                "version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "45f3c25ca22c18a67ee001c2d814881ad2a408a9",
+                "version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "45f3c25ca22c18a67ee001c2d814881ad2a408a9",
+                "version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "overlay": "74159503b4e58471a5eddfca77d836f348e045e1" }`
	`1`	`+{ "overlay": "a2c662481228644c2e37d5adac1219bb2778eea1" }`