Skip to content

Commit 94d2752

Browse files
sthagensthagen
authored
Merge branch 'RustPython:main' into main
2 parents e1f8be7 + d9c4c95 commit 94d2752

13 files changed

Lines changed: 939 additions & 154 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88

99
name: CI
1010

11+
permissions:
12+
contents: read
13+
1114
# Cancel previous workflows if they are the same workflow on same ref (branch/tags)
1215
# with the same event (push/pull_request) even they are in progress.
1316
# This setting will help reduce the number of duplicated workflows.

‎Lib/test/test_monitoring.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,6 @@ def func2():
12611261
('instruction', 'func2', 46),
12621262
('line', 'get_events', 11)])
12631263

1264-
@unittest.expectedFailure # TODO: RUSTPYTHON; - instruction offsets differ from CPython
12651264
def test_try_except(self):
12661265

12671266
def func3():

‎Lib/test/test_scope.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,6 @@ def dec(self):
692692
self.assertEqual(c.dec(), 1)
693693
self.assertEqual(c.dec(), 0)
694694

695-
@unittest.expectedFailure # TODO: RUSTPYTHON; figure out how to communicate that `y = 9` should be stored as a global rather than a STORE_NAME, even when the `global y` is in a nested subscope
696695
def testGlobalInParallelNestedFunctions(self):
697696
# A symbol table bug leaked the global statement from one
698697
# function to other nested functions in the same block.

0 commit comments

Comments
 (0)