Skip to content

Commit 9053479

Browse files
qunaibitqunaibit
committed
[GR-21590] Update imports
PullRequest: graalpython/3895
2 parents fd6d176 + 342ca30 commit 9053479

File tree

11 files changed

+383
-371
lines changed

11 files changed

+383
-371
lines changed

‎ci/graal/ci/common.jsonnet

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ local common_json = import "../common.json";
5757
for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
5858
} + {
5959
'oraclejdk24': jdk_base + common_json.jdks["oraclejdk24"] + { jdk_version:: 24 },
60+
} + {
61+
[name]: jdk_base + common_json.jdks[name] + { jdk_version:: 25 }
62+
for name in ["oraclejdk25"] + variants("labsjdk-ce-25") + variants("labsjdk-ee-25")
6063
} + {
6164
[name]: jdk_base + common_json.jdks[name] + { jdk_version:: parse_labsjdk_version(self), jdk_name:: "jdk-latest"}
6265
for name in ["oraclejdk-latest"] + variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")
@@ -274,9 +277,10 @@ local common_json = import "../common.json";
274277

275278
graalpy:: self.gradle + self.cmake + {
276279
packages+: if (self.os == "linux") then {
277-
libffi: '>=3.2.1',
278-
bzip2: '>=1.0.6',
279-
maven: ">=3.3.9",
280+
libffi: '==3.2.1',
281+
bzip2: '==1.0.6',
282+
zlib: '==1.2.11',
283+
maven: "==3.6.3",
280284
} else {},
281285
},
282286

‎ci/graal/common.json

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.57.1",
7+
"mx_version": "7.58.5",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+2-83", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+5-361", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,21 @@
4545

4646
"oraclejdk24": {"name": "jpg-jdk", "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+3", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+3-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+3-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk25": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+26", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-25": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-25Debug": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-25-llvm": {"name": "labsjdk", "version": "ce-25+26-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-25": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-sulong", "platformspecific": true },
55+
56+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+5", "platformspecific": true, "extrabundles": ["static-libs"]},
57+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01", "platformspecific": true },
58+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01-debug", "platformspecific": true },
59+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-26+5-jvmci-b01-sulong", "platformspecific": true },
60+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01", "platformspecific": true },
61+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01-debug", "platformspecific": true },
62+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01-sulong", "platformspecific": true }
5563
},
5664

5765
"eclipse": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
test.test_cprofile.CProfileTest.test_output_file_when_changing_directory @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
22
test.test_cprofile.CProfileTest.test_run_profile_as_module @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3-
test.test_cprofile.CProfileTest.test_throw @ darwin-arm64,darwin-x86_64,win32-AMD64
3+
test.test_cprofile.CProfileTest.test_throw @ darwin-arm64,darwin-x86_64,linux-x86_64,win32-AMD64
44
test.test_cprofile.TestCommandLine.test_sort @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
55
test.test_profile.ProfileTest.test_calling_conventions @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
66
test.test_profile.ProfileTest.test_cprofile @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test.test_posix.PosixTester.test_environ @ darwin-arm64,darwin-x86_64,linux-aarc
1212
test.test_posix.PosixTester.test_fchown @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1313
test.test_posix.PosixTester.test_fs_holes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1414
test.test_posix.PosixTester.test_fstat @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
15-
test.test_posix.PosixTester.test_fstatvfs @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
15+
test.test_posix.PosixTester.test_fstatvfs @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1616
test.test_posix.PosixTester.test_ftruncate @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1717
test.test_posix.PosixTester.test_getcwd_long_pathnames @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1818
test.test_posix.PosixTester.test_getgroups @ linux-aarch64,linux-x86_64
@@ -32,7 +32,7 @@ test.test_posix.PosixTester.test_pipe @ darwin-arm64,darwin-x86_64,linux-aarch64
3232
test.test_posix.PosixTester.test_putenv @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3333
test.test_posix.PosixTester.test_rtld_constants @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
3434
test.test_posix.PosixTester.test_stat @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
35-
test.test_posix.PosixTester.test_statvfs @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
35+
test.test_posix.PosixTester.test_statvfs @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3636
test.test_posix.PosixTester.test_strerror @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3737
test.test_posix.PosixTester.test_truncate @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3838
test.test_posix.PosixTester.test_umask @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
test.test_re.ExternalTests.test_re_benchmarks @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
22
test.test_re.ExternalTests.test_re_tests @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3+
test.test_re.ImplementationTest.test_deprecated_modules @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
34
test.test_re.ImplementationTest.test_overlap_table @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
45
test.test_re.ImplementationTest.test_signedness @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
56
test.test_re.PatternReprTests.test_bytes @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ test.test_shutil.TestGetTerminalSize.test_bad_environ @ darwin-arm64,darwin-x86_
6767
test.test_shutil.TestGetTerminalSize.test_does_not_crash @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
6868
test.test_shutil.TestGetTerminalSize.test_fallback @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
6969
test.test_shutil.TestGetTerminalSize.test_os_environ_first @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
70-
test.test_shutil.TestMisc.test_disk_usage @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
70+
test.test_shutil.TestMisc.test_disk_usage @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7171
test.test_shutil.TestMove.test_destinsrc_false_negative @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7272
test.test_shutil.TestMove.test_destinsrc_false_positive @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7373
test.test_shutil.TestMove.test_dont_move_dir_in_itself @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

0 commit comments

Comments
 (0)