Skip to content

Commit 139e632

Browse files
committed
[GR-21590] Update imports
PullRequest: graalpython/3978
2 parents a2241c1 + 90ecb36 commit 139e632

24 files changed

+146
-139
lines changed

ci/graal/common.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
"labsjdk-ee-25": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01", "platformspecific": true },
5353
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
5454
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
55-
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "33", "platformspecific": true },
55+
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "35", "platformspecific": true },
5656

57-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+11", "platformspecific": true, "extrabundles": ["static-libs"]},
58-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+11-jvmci-b01", "platformspecific": true },
59-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+11-jvmci-b01-debug", "platformspecific": true },
60-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+11-jvmci-b01-sulong", "platformspecific": true },
61-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+11-jvmci-b01", "platformspecific": true },
62-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+11-jvmci-b01-debug", "platformspecific": true },
63-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+11-jvmci-b01-sulong", "platformspecific": true }
57+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+12", "platformspecific": true, "extrabundles": ["static-libs"]},
58+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01", "platformspecific": true },
59+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01-debug", "platformspecific": true },
60+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+12-jvmci-b01-sulong", "platformspecific": true },
61+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01", "platformspecific": true },
62+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01-debug", "platformspecific": true },
63+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+12-jvmci-b01-sulong", "platformspecific": true }
6464
},
6565

6666
"eclipse": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ test.test_bz2.CompressDecompressTest.testDecompressToEmptyString @ darwin-arm64,
8989
test.test_bz2.CompressDecompressTest.testDecompressTrailingJunk @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9090
test.test_bz2.OpenTest.test_bad_params @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9191
test.test_bz2.OpenTest.test_binary_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
92-
test.test_bz2.OpenTest.test_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
92+
test.test_bz2.OpenTest.test_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9393
test.test_bz2.OpenTest.test_encoding_error_handler @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9494
test.test_bz2.OpenTest.test_fileobj @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9595
test.test_bz2.OpenTest.test_implicit_binary_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9696
test.test_bz2.OpenTest.test_newline @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
97-
test.test_bz2.OpenTest.test_text_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
97+
test.test_bz2.OpenTest.test_text_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
9898
test.test_bz2.OpenTest.test_x_mode @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ test.test_calendar.CommandLineTestCase.test_html_output_year_css @ darwin-arm64,
2020
test.test_calendar.CommandLineTestCase.test_html_output_year_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2121
test.test_calendar.CommandLineTestCase.test_illegal_arguments @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2222
test.test_calendar.CommandLineTestCase.test_option_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
23-
test.test_calendar.CommandLineTestCase.test_option_lines @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
23+
test.test_calendar.CommandLineTestCase.test_option_lines @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2424
test.test_calendar.CommandLineTestCase.test_option_locale @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
25-
test.test_calendar.CommandLineTestCase.test_option_months @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
25+
test.test_calendar.CommandLineTestCase.test_option_months @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2626
test.test_calendar.CommandLineTestCase.test_option_spacing @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
27-
test.test_calendar.CommandLineTestCase.test_option_type @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
27+
test.test_calendar.CommandLineTestCase.test_option_type @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2828
test.test_calendar.CommandLineTestCase.test_option_width @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2929
test.test_calendar.CommandLineTestCase.test_output_current_year @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
30-
test.test_calendar.CommandLineTestCase.test_output_month @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
31-
test.test_calendar.CommandLineTestCase.test_output_year @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
30+
test.test_calendar.CommandLineTestCase.test_output_month @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
31+
test.test_calendar.CommandLineTestCase.test_output_year @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3232
test.test_calendar.LeapdaysTestCase.test_no_leapdays @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3333
test.test_calendar.LeapdaysTestCase.test_no_leapdays_upper_boundary @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3434
test.test_calendar.LeapdaysTestCase.test_no_range @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test.test_cmd_line.CmdLineTest.test_large_PYTHONPATH @ darwin-arm64,darwin-x86_6
1010
test.test_cmd_line.CmdLineTest.test_non_ascii @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1111
test.test_cmd_line.CmdLineTest.test_optimize @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1212
test.test_cmd_line.CmdLineTest.test_osx_android_utf8 @ darwin-arm64,darwin-x86_64
13-
test.test_cmd_line.CmdLineTest.test_output_newline @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
13+
test.test_cmd_line.CmdLineTest.test_output_newline @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1414
test.test_cmd_line.CmdLineTest.test_run_code @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1515
test.test_cmd_line.CmdLineTest.test_run_module @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1616
test.test_cmd_line.CmdLineTest.test_run_module_bug1764407 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ test.test_configparser.MultilineValuesTestCase.test_case_sensitivity @ darwin-ar
247247
test.test_configparser.MultilineValuesTestCase.test_case_sensitivity_mapping_access @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
248248
test.test_configparser.MultilineValuesTestCase.test_clear @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
249249
test.test_configparser.MultilineValuesTestCase.test_default_case_sensitivity @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
250-
test.test_configparser.MultilineValuesTestCase.test_dominating_multiline_values @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
251250
# Transient failure due to tmpfile creation speed in CI
252251
!test.test_configparser.MultilineValuesTestCase.test_dominating_multiline_values @ win32-AMD64
253252
test.test_configparser.MultilineValuesTestCase.test_get_after_duplicate_option_error @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ test.test_gzip.TestGzip.test_write_seek_write @ darwin-arm64,darwin-x86_64,linux
5959
test.test_gzip.TestGzip.test_zero_padded_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6060
test.test_gzip.TestOpen.test_bad_params @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6161
test.test_gzip.TestOpen.test_binary_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
62-
test.test_gzip.TestOpen.test_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
62+
test.test_gzip.TestOpen.test_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6363
test.test_gzip.TestOpen.test_encoding_error_handler @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6464
test.test_gzip.TestOpen.test_fileobj @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6565
test.test_gzip.TestOpen.test_implicit_binary_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6666
test.test_gzip.TestOpen.test_newline @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6767
test.test_gzip.TestOpen.test_pathlike_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
68-
test.test_gzip.TestOpen.test_text_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
68+
test.test_gzip.TestOpen.test_text_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ test.test_hashlib.HashLibTestCase.test_no_unicode_blake2 @ darwin-arm64,darwin-x
5454
test.test_hashlib.HashLibTestCase.test_no_unicode_sha3 @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
5555
test.test_hashlib.HashLibTestCase.test_readonly_types @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
5656
test.test_hashlib.HashLibTestCase.test_sha256_update_over_4gb @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
57-
test.test_hashlib.HashLibTestCase.test_sha3_256_update_over_4gb @ win32-AMD64
57+
test.test_hashlib.HashLibTestCase.test_sha3_256_update_over_4gb @ darwin-arm64,win32-AMD64
5858
test.test_hashlib.HashLibTestCase.test_threaded_hashing @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
5959
test.test_hashlib.HashLibTestCase.test_unknown_hash @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6060
test.test_hashlib.HashLibTestCase.test_usedforsecurity_false @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ test.test_logging.RotatingFileHandlerTest.test_max_bytes @ darwin-arm64,darwin-x
196196
test.test_logging.RotatingFileHandlerTest.test_max_bytes_delay @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
197197
test.test_logging.RotatingFileHandlerTest.test_namer_rotator_inheritance @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
198198
test.test_logging.RotatingFileHandlerTest.test_rollover_filenames @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
199-
test.test_logging.RotatingFileHandlerTest.test_rotator @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
199+
test.test_logging.RotatingFileHandlerTest.test_rotator @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
200200
test.test_logging.RotatingFileHandlerTest.test_should_not_rollover @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
201201
test.test_logging.RotatingFileHandlerTest.test_should_not_rollover_non_file @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
202202
test.test_logging.RotatingFileHandlerTest.test_should_rollover @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ test.test_lzma.MiscellaneousTestCase.test_filter_properties_roundtrip @ darwin-a
109109
test.test_lzma.MiscellaneousTestCase.test_is_check_supported @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
110110
test.test_lzma.OpenTestCase.test_bad_params @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
111111
test.test_lzma.OpenTestCase.test_binary_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
112-
test.test_lzma.OpenTestCase.test_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
112+
test.test_lzma.OpenTestCase.test_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
113113
test.test_lzma.OpenTestCase.test_encoding_error_handler @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
114114
test.test_lzma.OpenTestCase.test_filename @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
115115
test.test_lzma.OpenTestCase.test_format_and_filters @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
116116
test.test_lzma.OpenTestCase.test_newline @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
117-
test.test_lzma.OpenTestCase.test_text_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
117+
test.test_lzma.OpenTestCase.test_text_modes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
118118
test.test_lzma.OpenTestCase.test_with_pathlike_filename @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
119119
test.test_lzma.OpenTestCase.test_x_mode @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ test.test_pathlib.PathSubclassTest.test_unlink @ darwin-arm64,darwin-x86_64,linu
6969
test.test_pathlib.PathSubclassTest.test_unlink_missing_ok @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7070
test.test_pathlib.PathSubclassTest.test_with @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7171
test.test_pathlib.PathSubclassTest.test_with_segments @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
72-
test.test_pathlib.PathSubclassTest.test_write_text_with_newlines @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
72+
test.test_pathlib.PathSubclassTest.test_write_text_with_newlines @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7373
test.test_pathlib.PathTest.test_absolute_common @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7474
test.test_pathlib.PathTest.test_chmod @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
7575
test.test_pathlib.PathTest.test_chmod_follow_symlinks_true @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
@@ -142,7 +142,7 @@ test.test_pathlib.PathTest.test_unlink_missing_ok @ darwin-arm64,darwin-x86_64,l
142142
test.test_pathlib.PathTest.test_unsupported_flavour @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
143143
test.test_pathlib.PathTest.test_with @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
144144
test.test_pathlib.PathTest.test_with_segments @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
145-
test.test_pathlib.PathTest.test_write_text_with_newlines @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
145+
test.test_pathlib.PathTest.test_write_text_with_newlines @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
146146
test.test_pathlib.PosixPathAsPureTest.test_anchor_common @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
147147
test.test_pathlib.PosixPathAsPureTest.test_as_bytes_common @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
148148
test.test_pathlib.PosixPathAsPureTest.test_as_posix_common @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
@@ -568,3 +568,4 @@ test.test_pathlib.WindowsPathTest.test_unlink @ win32-AMD64
568568
test.test_pathlib.WindowsPathTest.test_unlink_missing_ok @ win32-AMD64
569569
test.test_pathlib.WindowsPathTest.test_with @ win32-AMD64
570570
test.test_pathlib.WindowsPathTest.test_with_segments @ win32-AMD64
571+
test.test_pathlib.WindowsPathTest.test_write_text_with_newlines @ win32-AMD64

0 commit comments

Comments
 (0)