Merge pull request #349 from Yelp/py313-tests

fix tests for python 3.13

Author: asottile

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
   main:
     strategy:
       matrix:
-        python: ['3.10', '3.11', '3.12']
+        python: ['3.10', '3.11', '3.12', '3.13']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

requirements-dev.txt

@@ -2,9 +2,7 @@
 
 covdefaults>=2.1
 coverage
-lxml
-pre-commit
-pylint
 pytest
+re-assert
 setuptools
 wheel

tests/NameMapper_test.py

@@ -73,11 +73,11 @@ def test_VFNS_dict(vfns):
 
 @vffns_tests
 def test_VFFNS_locals_first(vffns):
-    loc = object()
-    glob = object()
-    ns_var = object()
+    loc = mock.sentinel.loc
+    glob = mock.sentinel.glob
+    ns_var = mock.sentinel.ns_var
     # Intentionally mask builtin `int`
-    locals().update({'int': loc})
+    int = loc
     with mock.patch.dict(globals(), {'int': glob}):
         assert vffns('int', locals(), globals(), {'int': ns_var}) is loc
 

tests/compile_test.py

@@ -4,6 +4,7 @@
 import textwrap
 
 import pytest
+import re_assert
 
 from Cheetah.compile import _create_module_from_source
 from Cheetah.compile import compile_file
@@ -157,14 +158,14 @@ def test_compile_to_class_traceback():
         raise AssertionError("Should raise ZeroDivision")
 
     # The current implementation doesn't show the line of code which caused the exception:
-    import re
-    assert re.match(
+    re_assert.Matches(
         r'''Traceback \(most recent call last\):
   File ".+/tests/compile_test\.py", line \d*, in test_compile_to_class_traceback
-    ret\(\).respond\(\)
+    ret\(\).respond\(\)(?:
+ +~+\^+)?
   File "<generated cheetah module>", line \d*, in respond
-ZeroDivisionError: (integer )?division( or modulo)? by zero''', traceback,
-    )
+ZeroDivisionError: division by zero''',
+    ).assert_matches(traceback)
 
 
 def test_compile_is_deterministic():