Skip to content

Commit d815716

Browse files
horakivohorakivo
committed
[GR-21590] Update imports
PullRequest: graalpython/3911
2 parents 5bc23f7 + be647e0 commit d815716

File tree

11 files changed

+152
-141
lines changed

11 files changed

+152
-141
lines changed

‎ci/graal/ci/common.jsonnet

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,15 @@ local common_json = import "../common.json";
366366
# Job frequencies
367367
# ***************
368368
frequencies: {
369+
tier1: {
370+
targets+: ["tier1"],
371+
},
372+
tier2: {
373+
targets+: ["tier2"],
374+
},
375+
tier3: {
376+
targets+: ["tier3"],
377+
},
369378
gate: {
370379
targets+: ["gate"],
371380
},

‎ci/graal/common.json

Lines changed: 7 additions & 7 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.58.5",
7+
"mx_version": "7.58.9",
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+5-361", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+6-570", "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 },
@@ -53,12 +53,12 @@
5353
"labsjdk-ee-25Debug": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-debug", "platformspecific": true },
5454
"labsjdk-ee-25-llvm": {"name": "labsjdk", "version": "ee-25+26-jvmci-b01-sulong", "platformspecific": true },
5555

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 },
56+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+6", "platformspecific": true, "extrabundles": ["static-libs"]},
57+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-26+6-jvmci-b01", "platformspecific": true },
58+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-26+6-jvmci-b01-debug", "platformspecific": true },
5959
"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 },
60+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-26+6-jvmci-b01", "platformspecific": true },
61+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-26+6-jvmci-b01-debug", "platformspecific": true },
6262
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-26+5-jvmci-b01-sulong", "platformspecific": true }
6363
},
6464

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ test.test_capi.test_float.CAPIFloatTest.test_asdouble @ darwin-arm64,darwin-x86_
7373
test.test_capi.test_float.CAPIFloatTest.test_check @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7474
test.test_capi.test_float.CAPIFloatTest.test_checkexact @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7575
test.test_capi.test_float.CAPIFloatTest.test_fromdouble @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
76+
test.test_capi.test_float.CAPIFloatTest.test_fromstring @ darwin-arm64,linux-x86_64,win32-AMD64
7677
test.test_capi.test_float.CAPIFloatTest.test_pack @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7778
test.test_capi.test_float.CAPIFloatTest.test_pack_unpack_roundtrip @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7879
test.test_capi.test_float.CAPIFloatTest.test_unpack @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎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
@@ -71,6 +71,7 @@ test.test_descr.ClassPropertiesAndMethods.test_python_lists @ darwin-arm64,darwi
7171
test.test_descr.ClassPropertiesAndMethods.test_qualname @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7272
test.test_descr.ClassPropertiesAndMethods.test_qualname_dict @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7373
test.test_descr.ClassPropertiesAndMethods.test_recursive_call @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
74+
test.test_descr.ClassPropertiesAndMethods.test_remove_subclass @ darwin-arm64,linux-x86_64,win32-AMD64
7475
test.test_descr.ClassPropertiesAndMethods.test_repr_as_str @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7576
test.test_descr.ClassPropertiesAndMethods.test_repr_with_module_str_subclass @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
7677
test.test_descr.ClassPropertiesAndMethods.test_restored_object_new @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ test.test_json.test_pass3.TestCPass3.test_parse @ darwin-arm64,darwin-x86_64,lin
103103
test.test_json.test_pass3.TestPyPass3.test_parse @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
104104
test.test_json.test_recursion.TestCRecursion.test_defaultrecursion @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
105105
test.test_json.test_recursion.TestCRecursion.test_dictrecursion @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
106-
test.test_json.test_recursion.TestCRecursion.test_endless_recursion @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
106+
test.test_json.test_recursion.TestCRecursion.test_endless_recursion @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
107107
test.test_json.test_recursion.TestCRecursion.test_highly_nested_objects_decoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
108108
test.test_json.test_recursion.TestCRecursion.test_highly_nested_objects_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
109109
test.test_json.test_recursion.TestCRecursion.test_listrecursion @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
110110
test.test_json.test_recursion.TestPyRecursion.test_defaultrecursion @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
111111
test.test_json.test_recursion.TestPyRecursion.test_dictrecursion @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
112-
test.test_json.test_recursion.TestPyRecursion.test_endless_recursion @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
112+
test.test_json.test_recursion.TestPyRecursion.test_endless_recursion @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
113113
test.test_json.test_recursion.TestPyRecursion.test_highly_nested_objects_decoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
114114
test.test_json.test_recursion.TestPyRecursion.test_highly_nested_objects_encoding @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
115115
test.test_json.test_recursion.TestPyRecursion.test_listrecursion @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

0 commit comments

Comments
 (0)