Skip to content

Commit 65190a5

Browse files
committed
Update imports
style fix disable 3 threading tests
1 parent 2531f36 commit 65190a5

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "3c66d10b6906bfac081f2477bd2c6ffaf395ea33" }
1+
{ "overlay": "2af0a1153ee54e06e6e37eac2444c9ec65a80e9d" }

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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,9 @@ def update_unittest_tags(args):
709709
'test.test_concurrent_futures.test_process_pool.ProcessPoolSpawnProcessPoolExecutorTest.test_idle_process_reuse_one',
710710
'test.test_concurrent_futures.test_process_pool.ProcessPoolSpawnProcessPoolExecutorTest.test_killed_child',
711711
'test.test_concurrent_futures.test_thread_pool.ThreadPoolExecutorTest.test_idle_thread_reuse',
712+
'graalpython.lib-python.3.test.test_threading.ThreadTests.test_join_nondaemon_on_shutdown',
713+
'graalpython.lib-python.3.test.test_threading.ThreadTests.test_import_from_another_thread',
714+
'graalpython.lib-python.3.test.test_threading.ThreadTests.test_finalization_shutdown',
712715
# Transiently times out GR-52666
713716
'test.test_concurrent_futures.test_shutdown.ProcessPoolSpawnProcessPoolShutdownTest.test_submit_after_interpreter_shutdown',
714717
'test.test_concurrent_futures.test_shutdown.ProcessPoolSpawnProcessPoolShutdownTest.test_del_shutdown',

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": "6335fa62026e7df12129abb495fddb0b0876fef3",
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": "6335fa62026e7df12129abb495fddb0b0876fef3",
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": "6335fa62026e7df12129abb495fddb0b0876fef3",
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": "6335fa62026e7df12129abb495fddb0b0876fef3",
7373
"subdir": True,
7474
"urls": [
7575
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)