Skip to content

Commit 2aa9a4b

Browse files
msimacekmsimacek
committed
[GR-21590][GR-59478] Update imports
PullRequest: graalpython/3642
2 parents acc45b3 + 97936b3 commit 2aa9a4b

File tree

13 files changed

+28
-25
lines changed

13 files changed

+28
-25
lines changed

‎ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "74159503b4e58471a5eddfca77d836f348e045e1" }
1+
{ "overlay": "a2c662481228644c2e37d5adac1219bb2778eea1" }

‎graalpython/com.oracle.graal.python.test/src/tests/conftest.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,15 @@ partial_splits_individual_tests = true
2121
# on Windows, yet, add their files here.
2222
exclude_on = ['win32']
2323
selector = [
24-
"test_mmap.py", # all tests fail with PermissionError, so does the mmap test in test_memoryview and cpyext/test_abstract
2524
"test_multiprocessing_graalpy.py", # import _winapi
2625
"test_patched_pip.py",
2726
"test_pathlib.py",
2827
"test_posix.py", # import posix
2928
"test_pyio.py", # pyio imports msvcrt
3029
"test_signal.py",
3130
"test_structseq.py", # import posix
32-
"cpyext/test_abstract.py", # mmap PermissionError
3331
"cpyext/test_member.py", # Too many assumptions about long size
3432
"cpyext/test_memoryview.py", # Failure in test_memoryview_read_0dim
35-
"cpyext/test_mmap.py",
3633
"cpyext/test_shutdown.py", # Uses gcc-specific attribute
3734
"cpyext/test_wiki.py", # Assumptions about long size
3835
]

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_asyncio.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_recvfrom @ darwin
606606
test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_recvfrom_into @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
607607
test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sendto_blocking @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
608608
test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_accept @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
609-
test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_connect_racing @ darwin-x86_64,linux-aarch64,linux-x86_64
609+
test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_connect_racing @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
610610
test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_fail @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
611611
test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_ops @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
612612
test.test_asyncio.test_sock_lowlevel.SelectEventLoopTests.test_sock_client_racing @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_collections.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ test.test_collections.TestChainMap.test_missing @ darwin-arm64,darwin-x86_64,lin
2222
test.test_collections.TestChainMap.test_new_child @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2323
test.test_collections.TestChainMap.test_order_preservation @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2424
test.test_collections.TestChainMap.test_ordering @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
25+
test.test_collections.TestChainMap.test_union_operators @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2526
test.test_collections.TestCollectionABCs.test_ByteString @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2627
test.test_collections.TestCollectionABCs.test_Mapping @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2728
test.test_collections.TestCollectionABCs.test_MutableMapping @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_concurrent_futures.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ test.test_concurrent_futures.test_shutdown.ProcessPoolSpawnProcessPoolShutdownTe
7777
!test.test_concurrent_futures.test_shutdown.ProcessPoolSpawnProcessPoolShutdownTest.test_submit_after_interpreter_shutdown @ darwin-arm64,linux-aarch64,linux-x86_64
7878
test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_cancel_futures @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
7979
test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_context_manager_shutdown @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
80-
test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_del_shutdown @ darwin-x86_64
80+
!test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_del_shutdown
8181
test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_hang_gh94440 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8282
test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_hang_issue12364 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8383
test.test_concurrent_futures.test_shutdown.ThreadPoolShutdownTest.test_run_after_shutdown @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_descr.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ test.test_descr.ClassPropertiesAndMethods.test_str_of_str_subclass @ darwin-arm6
9393
test.test_descr.ClassPropertiesAndMethods.test_str_operations @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9494
test.test_descr.ClassPropertiesAndMethods.test_str_subclass_as_dict_key @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9595
test.test_descr.ClassPropertiesAndMethods.test_subclass_propagation @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
96+
test.test_descr.ClassPropertiesAndMethods.test_subclass_right_op @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9697
test.test_descr.ClassPropertiesAndMethods.test_subclassing_does_not_duplicate_dict_descriptors @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9798
test.test_descr.ClassPropertiesAndMethods.test_supers @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9899
test.test_descr.ClassPropertiesAndMethods.test_type___getattribute__ @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
test.test_mmap.LargeMmapTests.test_large_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
2-
test.test_mmap.MmapTests.test_anonymous @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
2+
test.test_mmap.MmapTests.test_anonymous @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
33
test.test_mmap.MmapTests.test_bad_file_desc @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
44
test.test_mmap.MmapTests.test_basic @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
55
test.test_mmap.MmapTests.test_concat_repeat_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
66
test.test_mmap.MmapTests.test_context_manager @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
77
test.test_mmap.MmapTests.test_context_manager_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
8-
test.test_mmap.MmapTests.test_double_close @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
9-
test.test_mmap.MmapTests.test_empty_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
10-
test.test_mmap.MmapTests.test_entire_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
11-
test.test_mmap.MmapTests.test_find_does_not_access_beyond_buffer @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
12-
test.test_mmap.MmapTests.test_find_end @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
13-
test.test_mmap.MmapTests.test_flush_return_value @ darwin-arm64,darwin-x86_64
8+
test.test_mmap.MmapTests.test_double_close @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9+
test.test_mmap.MmapTests.test_empty_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
10+
test.test_mmap.MmapTests.test_entire_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
11+
test.test_mmap.MmapTests.test_find_does_not_access_beyond_buffer @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
12+
test.test_mmap.MmapTests.test_find_end @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
13+
test.test_mmap.MmapTests.test_flush_return_value @ darwin-arm64,darwin-x86_64,win32-AMD64
1414
test.test_mmap.MmapTests.test_length_0_large_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1515
test.test_mmap.MmapTests.test_length_0_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1616
test.test_mmap.MmapTests.test_offset @ darwin-x86_64,linux-x86_64
1717
test.test_mmap.MmapTests.test_prot_readonly @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
18-
test.test_mmap.MmapTests.test_read_all @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
18+
test.test_mmap.MmapTests.test_read_all @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1919
test.test_mmap.MmapTests.test_read_invalid_arg @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2020
test.test_mmap.MmapTests.test_subclass @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2121
test.test_mmap.MmapTests.test_tougher_find @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
22-
test.test_mmap.MmapTests.test_write_returning_the_number_of_bytes_written @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
22+
test.test_mmap.MmapTests.test_write_returning_the_number_of_bytes_written @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_os.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ test.test_os.RemoveDirsTests.test_remove_nothing @ darwin-arm64,darwin-x86_64,li
114114
test.test_os.RemoveDirsTests.test_remove_partial @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
115115
test.test_os.StatAttributeTests.test_15261 @ win32-AMD64
116116
test.test_os.StatAttributeTests.test_1686475 @ win32-AMD64
117+
test.test_os.StatAttributeTests.test_access_denied @ win32-AMD64
117118
test.test_os.StatAttributeTests.test_stat_attributes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
118119
test.test_os.StatAttributeTests.test_stat_attributes_bytes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
119120
test.test_os.StatAttributeTests.test_stat_result_pickle @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_subprocess.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ test.test_subprocess.RunFuncTestCase.test_stdout_with_capture_output_arg @ darwi
174174
test.test_subprocess.RunFuncTestCase.test_timeout @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
175175
test.test_subprocess.Win32ProcessTestCase.test_call_string @ win32-AMD64
176176
test.test_subprocess.Win32ProcessTestCase.test_close_fds @ win32-AMD64
177+
test.test_subprocess.Win32ProcessTestCase.test_creationflags @ win32-AMD64
177178
test.test_subprocess.Win32ProcessTestCase.test_kill @ win32-AMD64
178179
test.test_subprocess.Win32ProcessTestCase.test_kill_dead @ win32-AMD64
179180
test.test_subprocess.Win32ProcessTestCase.test_send_signal @ win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
test.test_sys.ActiveExceptionTests.test_exc_info_no_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
22
test.test_sys.ActiveExceptionTests.test_exc_info_with_exception_instance @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
33
test.test_sys.ActiveExceptionTests.test_exc_info_with_exception_type @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
4-
test.test_sys.ActiveExceptionTests.test_sys_exception_no_exception @ linux-x86_64
5-
test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_instance @ linux-x86_64
6-
test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_type @ linux-x86_64
4+
test.test_sys.ActiveExceptionTests.test_sys_exception_no_exception @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
5+
test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_instance @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6+
test.test_sys.ActiveExceptionTests.test_sys_exception_with_exception_type @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
77
test.test_sys.DisplayHookTest.test_custom_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
88
test.test_sys.DisplayHookTest.test_lost_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
99
test.test_sys.DisplayHookTest.test_original_displayhook @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_venv.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ test.test_venv.BasicTest.test_deactivate_with_strict_bash_opts @ darwin-arm64,da
33
test.test_venv.BasicTest.test_defaults_with_pathlib_path @ win32-AMD64
44
test.test_venv.BasicTest.test_defaults_with_str_path @ win32-AMD64
55
test.test_venv.BasicTest.test_executable @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
6-
test.test_venv.BasicTest.test_executable_symlinks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
6+
test.test_venv.BasicTest.test_executable_symlinks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
77
test.test_venv.BasicTest.test_isolation @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
88
test.test_venv.BasicTest.test_macos_env @ darwin-arm64,darwin-x86_64
99
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
1414
test.test_venv.BasicTest.test_prompt @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1515
test.test_venv.BasicTest.test_symlinking @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1616
test.test_venv.BasicTest.test_sysconfig @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
17-
test.test_venv.BasicTest.test_sysconfig_symlinks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
17+
test.test_venv.BasicTest.test_sysconfig_symlinks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1818
test.test_venv.BasicTest.test_unoverwritable_fails @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1919
test.test_venv.BasicTest.test_upgrade @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2020
test.test_venv.BasicTest.test_upgrade_dependencies @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎mx.graalpython/mx_graalpython_bisect.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
22
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
#
44
# The Universal Permissive License (UPL), Version 1.0
@@ -195,6 +195,8 @@ def bound_is_valid(self, bad_result):
195195

196196
def bound_is_significant(self, bad_result, epsilon):
197197
avg = (self.value + bad_result.value) / 2
198+
if not avg:
199+
return False
198200
diff = abs(self.value - bad_result.value)
199201
return diff / avg >= epsilon
200202

‎mx.graalpython/suite.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,31 @@
4545
},
4646
{
4747
"name": "sdk",
48-
"version": "45f3c25ca22c18a67ee001c2d814881ad2a408a9",
48+
"version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
4949
"subdir": True,
5050
"urls": [
5151
{"url": "https://github.com/oracle/graal", "kind": "git"},
5252
]
5353
},
5454
{
5555
"name": "tools",
56-
"version": "45f3c25ca22c18a67ee001c2d814881ad2a408a9",
56+
"version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "sulong",
64-
"version": "45f3c25ca22c18a67ee001c2d814881ad2a408a9",
64+
"version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},
6868
]
6969
},
7070
{
7171
"name": "regex",
72-
"version": "45f3c25ca22c18a67ee001c2d814881ad2a408a9",
72+
"version": "d7d4ddbefaac211de2fbfe6e4a8ee8bbdfc2affc",
7373
"subdir": True,
7474
"urls": [
7575
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)