[GR-21590] Update imports

PullRequest: graalpython/4284

Author: msimacek

graalpython/com.oracle.graal.python.test/src/runner.py

@@ -546,7 +546,7 @@ def write_tags(test_file: 'TestFile', tags: typing.Iterable['Tag']):
         tag_file.unlink(missing_ok=True)
         return
     with open(tag_file, 'w') as f:
-        for tag in sorted(tags, key=lambda t: t.test_id.test_name):
+        for tag in sorted(tags, key=lambda t: (t.test_id.test_name, t.is_exclusion)):
             f.write(f'{tag}\n')
 
 
@@ -1207,6 +1207,7 @@ def collect(all_specifiers: list[TestSpecifier], *, use_tags=False, ignore=None,
             to_run.append(collected)
     return to_run
 
+
 @dataclass(frozen=True)
 class Tag:
     test_id: TestId
@@ -1231,7 +1232,6 @@ def without_keys(self, keys: set[str]) -> 'Tag | None':
                 return self
             return Tag(self.test_id, keys, is_exclusion=self.is_exclusion)
 
-
     def __str__(self):
         s = ''
         if self.is_exclusion:
@@ -1267,7 +1267,6 @@ def read_tags(test_file: TestFile, allow_exclusions=False) -> list[Tag]:
                     is_exclusion = True
                     test = test.removeprefix('!')
 
-
                 if not keys and not is_exclusion:
                     log(f'WARNING: invalid tag {test}: missing platform keys')
 

…on/lib-python/3/test/test_patched_pip.py …ython.test/src/tests/test_patched_pip.pygraalpython/lib-python/3/test/test_patched_pip.py renamed to graalpython/com.oracle.graal.python.test/src/tests/test_patched_pip.py graalpython/lib-python/3/test/test_patched_pip.py renamed to graalpython/com.oracle.graal.python.test/src/tests/test_patched_pip.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 2026, 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

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

@@ -51,9 +51,9 @@ test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_co
 test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_no_inet_pton @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_no_local_addr @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_no_ssl_server_hostname_errors @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
+test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_service_name @ darwin-arm64,linux-aarch64,linux-x86_64
 # GR-73063
 !test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_service_name @ linux-aarch64-github,linux-x86_64-github
-test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_service_name @ darwin-arm64,linux-aarch64,linux-x86_64
 test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_ssl_server_hostname_default @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_ssl_server_hostname_errors @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_asyncio.test_base_events.BaseEventLoopWithSelectorTests.test_create_connection_ssl_timeout_for_plain_socket @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github

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

@@ -10,9 +10,9 @@ test.test_bdb.BreakpointTestCase.test_ignore_count_on_disabled_bp @ darwin-arm64
 test.test_bdb.BreakpointTestCase.test_load_bps_from_previous_Bdb_instance @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.BreakpointTestCase.test_temporary_bp @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.IssuesTestCase.test_next_to_botframe @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
+test.test_bdb.IssuesTestCase.test_next_until_return_in_generator @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
 # TODO: GR-71863
 !test.test_bdb.IssuesTestCase.test_next_until_return_in_generator @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_bdb.IssuesTestCase.test_next_until_return_in_generator @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
 test.test_bdb.IssuesTestCase.test_step_at_return_with_no_trace_in_caller @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.RunTestCase.test_run_step @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_bdb.RunTestCase.test_runeval_step @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github

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

@@ -1,4 +1,4 @@
-test.test_capi.test_abstract.CAPITest.test_mapping_check @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64-github
+test.test_capi.test_abstract.CAPITest.test_mapping_check @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_capi.test_abstract.CAPITest.test_mapping_haskey @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_capi.test_abstract.CAPITest.test_mapping_haskeystring @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_capi.test_abstract.CAPITest.test_mapping_keys_valuesitems @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
@@ -231,7 +231,7 @@ test.test_capi.test_misc.Test_testcapi.test_dict_iteration @ darwin-arm64,linux-
 test.test_capi.test_misc.Test_testcapi.test_empty_argparse @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_capi.test_misc.Test_testcapi.test_from_contiguous @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_capi.test_misc.Test_testcapi.test_from_spec_metatype_inheritance @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
-test.test_capi.test_misc.Test_testcapi.test_frozenset_add_in_capi @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
+test.test_capi.test_misc.Test_testcapi.test_frozenset_add_in_capi @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_capi.test_misc.Test_testcapi.test_gc_control @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_capi.test_misc.Test_testcapi.test_gc_visit_objects_basic @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_capi.test_misc.Test_testcapi.test_gc_visit_objects_exit_early @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github

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

@@ -66,8 +66,8 @@ test.test_compile.TestSpecifics.test_unary_minus @ darwin-arm64,linux-aarch64,li
 !test.test_compile.TestStackSizeStability.test_for_break_continue_inside_try_finally_block @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
 !test.test_compile.TestStackSizeStability.test_for_break_continue_inside_with_block @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
 !test.test_compile.TestStackSizeStability.test_for_else @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
-!test.test_compile.TestStackSizeStability.test_if @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_compile.TestStackSizeStability.test_if @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
+!test.test_compile.TestStackSizeStability.test_if @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_compile.TestStackSizeStability.test_if_else @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
 !test.test_compile.TestStackSizeStability.test_if_else @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
 !test.test_compile.TestStackSizeStability.test_return_inside_async_with_block @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64

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

@@ -56,7 +56,7 @@ test.test_contextlib.TestExitStack.test_exit_exception_chaining_reference @ darw
 test.test_contextlib.TestExitStack.test_exit_exception_chaining_suppress @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_contextlib.TestExitStack.test_exit_exception_non_suppressing @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_contextlib.TestExitStack.test_exit_exception_traceback @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
-test.test_contextlib.TestExitStack.test_exit_exception_with_correct_context @ linux-aarch64-github,linux-x86_64-github,win32-AMD64-github
+test.test_contextlib.TestExitStack.test_exit_exception_with_correct_context @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_contextlib.TestExitStack.test_exit_exception_with_existing_context @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_contextlib.TestExitStack.test_exit_raise @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
 test.test_contextlib.TestExitStack.test_exit_suppress @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github

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

@@ -39,7 +39,7 @@ test.test_contextlib_async.TestAsyncExitStack.test_excessive_nesting @ darwin-ar
 test.test_contextlib_async.TestAsyncExitStack.test_exit_exception_chaining_reference @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_contextlib_async.TestAsyncExitStack.test_exit_exception_chaining_suppress @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_contextlib_async.TestAsyncExitStack.test_exit_exception_non_suppressing @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
-test.test_contextlib_async.TestAsyncExitStack.test_exit_exception_with_correct_context @ linux-aarch64-github,linux-x86_64-github
+test.test_contextlib_async.TestAsyncExitStack.test_exit_exception_with_correct_context @ darwin-arm64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_contextlib_async.TestAsyncExitStack.test_exit_exception_with_existing_context @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_contextlib_async.TestAsyncExitStack.test_exit_raise @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github
 test.test_contextlib_async.TestAsyncExitStack.test_exit_suppress @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github