Skip to content

Commit 6191bed

Browse files
committed
[GR-21590] Update imports.
PullRequest: graalpython/3705
2 parents 74c0157 + 4e15a8a commit 6191bed

File tree

10 files changed

+198
-186
lines changed

10 files changed

+198
-186
lines changed

ci.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "9682e88c454813f57f9104b481421538895239b5" }
1+
{ "overlay": "8dd41b33e90f2176621893827fb1431b82c865b3" }

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/CApiBuiltinsProcessor.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -70,6 +70,7 @@
7070
import javax.lang.model.type.TypeMirror;
7171
import javax.lang.model.util.AbstractAnnotationValueVisitor14;
7272
import javax.lang.model.util.ElementFilter;
73+
import javax.tools.Diagnostic.Kind;
7374
import javax.tools.StandardLocation;
7475

7576
import com.oracle.graal.python.annotations.CApiConstants;
@@ -121,8 +122,8 @@ public synchronized void init(ProcessingEnvironment pe) {
121122
try {
122123
this.trees = Trees.instance(pe);
123124
} catch (Throwable t) {
124-
// ECJ does not support this, so we skip the some processing of C API builtins
125-
pe.getMessager().printWarning("The compiler does not support source tree parsing during annotation processing. Regeneration of Python C API builtins will be incorrect.");
125+
// ECJ does not support this, so we skip the processing of C API builtins
126+
pe.getMessager().printMessage(Kind.NOTE, "The compiler does not support source tree parsing during annotation processing. Regeneration of Python C API builtins will be incorrect.");
126127
this.trees = null;
127128
}
128129
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,8 @@ test.test_asyncio.test_ssl.TestSSL.test_create_server_ssl_1 @ darwin-arm64,darwi
620620
test.test_asyncio.test_ssl.TestSSL.test_create_server_ssl_over_ssl @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
621621
test.test_asyncio.test_ssl.TestSSL.test_flush_before_shutdown @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
622622
test.test_asyncio.test_ssl.TestSSL.test_shutdown_cleanly @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
623+
# transiently fails
624+
!test.test_asyncio.test_ssl.TestSSL.test_shutdown_timeout_handler_leak
623625
test.test_asyncio.test_ssl.TestSSL.test_shutdown_timeout_handler_not_set @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
624626
test.test_asyncio.test_ssl.TestSSL.test_ssl_connect_accepted_socket @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
625627
test.test_asyncio.test_ssl.TestSSL.test_ssl_handshake_connection_lost @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64

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

+2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ test.test_capi.test_misc.CAPITest.test_heaptype_with_dict @ darwin-arm64,darwin-
7979
test.test_capi.test_misc.CAPITest.test_heaptype_with_negative_dict @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8080
test.test_capi.test_misc.CAPITest.test_heaptype_with_setattro @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8181
test.test_capi.test_misc.CAPITest.test_instancemethod @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
82+
test.test_capi.test_misc.CAPITest.test_mapping_has_key @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8283
test.test_capi.test_misc.CAPITest.test_mapping_keys_values_items @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8384
test.test_capi.test_misc.CAPITest.test_mapping_keys_values_items_bad_arg @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
8485
test.test_capi.test_misc.CAPITest.test_memoryview_from_NULL_pointer @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
@@ -125,6 +126,7 @@ test.test_capi.test_misc.Test_testcapi.test_long_as_unsigned_long_long_mask @ da
125126
test.test_capi.test_misc.Test_testcapi.test_long_long_and_overflow @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
126127
test.test_capi.test_misc.Test_testcapi.test_long_numbits @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
127128
test.test_capi.test_misc.Test_testcapi.test_longlong_api @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
129+
test.test_capi.test_misc.Test_testcapi.test_mapping_has_key_string @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
128130
test.test_capi.test_misc.Test_testcapi.test_py_is_funcs @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
129131
test.test_capi.test_misc.Test_testcapi.test_py_is_macros @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
130132
test.test_capi.test_misc.Test_testcapi.test_pymem_alloc0 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64

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

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ test.test_descr.ClassPropertiesAndMethods.test_hash_inheritance @ darwin-arm64,d
3434
test.test_descr.ClassPropertiesAndMethods.test_imul_bug @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3535
test.test_descr.ClassPropertiesAndMethods.test_init @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3636
test.test_descr.ClassPropertiesAndMethods.test_ipow @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
37+
test.test_descr.ClassPropertiesAndMethods.test_ipow_exception_text @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3738
test.test_descr.ClassPropertiesAndMethods.test_ipow_returns_not_implemented @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3839
test.test_descr.ClassPropertiesAndMethods.test_isinst_isclass @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3940
test.test_descr.ClassPropertiesAndMethods.test_keyword_arguments @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ test.test_getpass.GetpassRawinputTest.test_trims_trailing_newline @ darwin-arm64
77
test.test_getpass.GetpassRawinputTest.test_uses_stderr_as_default @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
88
test.test_getpass.GetpassRawinputTest.test_uses_stdin_as_default_input @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
99
test.test_getpass.GetpassRawinputTest.test_uses_stdin_as_different_locale @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
10+
test.test_getpass.UnixGetpassTest.test_falls_back_to_fallback_if_termios_raises @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1011
test.test_getpass.UnixGetpassTest.test_falls_back_to_stdin @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
12+
test.test_getpass.UnixGetpassTest.test_flushes_stream_after_input @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1113
test.test_getpass.UnixGetpassTest.test_resets_termios @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1214
test.test_getpass.UnixGetpassTest.test_uses_tty_directly @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64

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

+2
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ test.test_multiprocessing_spawn.test_threads.WithThreadsTestPool.test_map_chunks
199199
test.test_multiprocessing_spawn.test_threads.WithThreadsTestPool.test_map_no_failfast @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
200200
test.test_multiprocessing_spawn.test_threads.WithThreadsTestPool.test_starmap @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
201201
test.test_multiprocessing_spawn.test_threads.WithThreadsTestPool.test_starmap_async @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
202+
# transiently fails
203+
!test.test_multiprocessing_spawn.test_threads.WithThreadsTestPool.test_terminate
202204
test.test_multiprocessing_spawn.test_threads.WithThreadsTestPool.test_traceback @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
203205
test.test_multiprocessing_spawn.test_threads.WithThreadsTestProcess.test_active_children @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
204206
test.test_multiprocessing_spawn.test_threads.WithThreadsTestProcess.test_args_argument @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64

0 commit comments

Comments
 (0)