Skip to content

Commit 91beace

Browse files
committed
[GR-54383] Prepare the 24.1 release branches.
PullRequest: graalpython/3374
2 parents 4597883 + 2ec8fff commit 91beace

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "4922966e110f60c21ce0a24c1ff7557f9e4ed46a" }
1+
{ "overlay": "e8d5ccf73763d1522c237072ed831e91b811ed9f" }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ast/Validator.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2024, 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
@@ -102,9 +102,9 @@ final class Validator implements SSTreeVisitor<Void> {
102102
private Validator() {
103103
}
104104

105-
//////////////////////////////
105+
/*-
106106
// ModTy validation
107-
//////////////////////////////
107+
*/
108108

109109
// Equivalent of _PyAST_Validate - entry point of the validation
110110
static void validateMod(ModTy mod) {
@@ -137,9 +137,9 @@ public Void visit(ModTy.FunctionType node) {
137137
return null;
138138
}
139139

140-
//////////////////////////////
140+
/*-
141141
// StmtTy validation
142-
//////////////////////////////
142+
*/
143143

144144
// Equivalent of validate_stmt
145145
private void validateStmt(StmtTy stmt) {
@@ -399,9 +399,9 @@ public Void visit(StmtTy.Continue node) {
399399
return null;
400400
}
401401

402-
//////////////////////////////
402+
/*-
403403
// ExprTy validation
404-
//////////////////////////////
404+
*/
405405

406406
// Equivalent of validate_expr
407407
private void validateExpr(ExprTy expr, ExprContextTy context) {
@@ -667,9 +667,9 @@ public Void visit(ExprTy.Name node) {
667667
return null;
668668
}
669669

670-
//////////////////////////////
670+
/*-
671671
// PatternTy validation
672-
//////////////////////////////
672+
*/
673673

674674
boolean isStarPatternOk;
675675

@@ -871,9 +871,9 @@ public Void visit(MatchCaseTy node) {
871871
return null;
872872
}
873873

874-
//////////////////////////////
874+
/*-
875875
// Other visitors
876-
//////////////////////////////
876+
*/
877877

878878
@Override
879879
public Void visit(ComprehensionTy node) {
@@ -948,9 +948,9 @@ public Void visit(TypeIgnoreTy.TypeIgnore node) {
948948
return null;
949949
}
950950

951-
//////////////////////////////
951+
/*-
952952
// Validation of sequences
953-
//////////////////////////////
953+
*/
954954

955955
// Equivalent of validate_stmts
956956
private void validateStmts(StmtTy[] stmts) {
@@ -1039,9 +1039,9 @@ private void validateComprehension(ComprehensionTy[] generators) {
10391039
}
10401040
}
10411041

1042-
//////////////////////////////
1042+
/*-
10431043
// Helpers
1044-
//////////////////////////////
1044+
*/
10451045

10461046
// Equivalent of asdl_seq_LEN
10471047
private static int seqLen(Object[] seq) {

mx.graalpython/mx_graalpython.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,7 @@ def graalpython_gate_runner(args, tasks):
14051405
"*/cpyext/test_thread.py",
14061406
"*/cpyext/test_unicode.py",
14071407
"*/cpyext/test_wiki.py",
1408+
"*/cpyext/test_tp_slots.py", # Temporarily disabled due to GR-54345
14081409
]
14091410
else:
14101411
excluded_tests = []

mx.graalpython/suite.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,31 @@
4545
},
4646
{
4747
"name": "sdk",
48-
"version": "b4c2ef5c8c021d14437c77e7b3552bddf1d24725",
48+
"version": "3dbbf5f2edb064b16d653d43805768dfb8e84710",
4949
"subdir": True,
5050
"urls": [
5151
{"url": "https://github.com/oracle/graal", "kind": "git"},
5252
]
5353
},
5454
{
5555
"name": "tools",
56-
"version": "b4c2ef5c8c021d14437c77e7b3552bddf1d24725",
56+
"version": "3dbbf5f2edb064b16d653d43805768dfb8e84710",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "sulong",
64-
"version": "b4c2ef5c8c021d14437c77e7b3552bddf1d24725",
64+
"version": "3dbbf5f2edb064b16d653d43805768dfb8e84710",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},
6868
]
6969
},
7070
{
7171
"name": "regex",
72-
"version": "b4c2ef5c8c021d14437c77e7b3552bddf1d24725",
72+
"version": "3dbbf5f2edb064b16d653d43805768dfb8e84710",
7373
"subdir": True,
7474
"urls": [
7575
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)