fixes for Python 3.13

BerkeleyLearnVerify · Oct 24, 2024 · 461822e · 461822e
1 parent 0abbbcd
commit 461822e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,9 +32,9 @@ dependencies = [
 	"dotmap ~= 1.3",
 	"mapbox_earcut >= 0.12.10",
 	"matplotlib ~= 3.2",
-	"manifold3d == 2.3.0",
+	"manifold3d == 2.5.1",
 	"networkx >= 2.6",
-	"numpy ~= 1.24",
+	"numpy >= 1.24",
 	"opencv-python ~= 4.5",
 	"pegen >= 0.3.0",
 	"pillow >= 9.1",

diff --git a/src/scenic/syntax/scenic.gram b/src/scenic/syntax/scenic.gram
@@ -2891,7 +2891,7 @@ invalid_while_stmt[NoReturn]:
         )
      }
 invalid_for_stmt[NoReturn]:
-    | [ASYNC] 'for' star_targets 'in' star_expressions NEWLINE { self.raise_syntax_error("expected ':'") }
+    | ['async'] 'for' star_targets 'in' star_expressions NEWLINE { self.raise_syntax_error("expected ':'") }
     | ['async'] a='for' star_targets 'in' star_expressions ':' NEWLINE !INDENT {
         self.raise_indentation_error(
             f"expected an indented block after 'for' statement on line {a.start[0]}"

diff --git a/tests/syntax/test_errors.py b/tests/syntax/test_errors.py
@@ -374,7 +374,10 @@ def checkException(e, lines, program, bug, path, output, topLevel=True):
     chained = bool(e.__cause__ or (e.__context__ and not e.__suppress_context__))
     assert bool(remainingLines) == chained
     if remainingLines:
-        mid = loc - 5 if topLevel else loc - 2
+        if topLevel:
+            mid = loc - 6 if sys.version_info >= (3, 13) else loc - 5
+        else:
+            mid = loc - 2
         assert len(output) >= -(mid - 1)
     if e.__cause__:
         assert (