Add Python 3.13 support

.github/workflows/tests.yaml

@@ -18,15 +18,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: Linux, python: "3.12", os: ubuntu-latest, tox: py312 }
-          - { name: Windows, python: "3.12", os: windows-latest, tox: py312 }
-          - { name: Mac, python: "3.12", os: macos-latest, tox: py312 }
+          - { name: Linux, python: "3.13", os: ubuntu-latest, tox: py313 }
+          - { name: Windows, python: "3.13", os: windows-latest, tox: py313 }
+          - { name: Mac, python: "3.13", os: macos-latest, tox: py313 }
+          - { name: "3.12", python: "3.12", os: ubuntu-latest, tox: py312 }
           - { name: "3.11", python: "3.11", os: ubuntu-latest, tox: py311 }
           - { name: "3.10", python: "3.10", os: ubuntu-latest, tox: py310 }
           - { name: "3.9", python: "3.9", os: ubuntu-latest, tox: py39 }
           - { name: "3.8", python: "3.8", os: ubuntu-latest, tox: py38 }
           - { name: "3.7", python: "3.7", os: ubuntu-latest, tox: py37 }
-          - { name: "PyPy3", python: "pypy-3.9", os: ubuntu-latest, tox: pypy3 }
+          - {
+              name: "PyPy3",
+              python: "pypy-3.10",
+              os: ubuntu-latest,
+              tox: pypy3,
+            }
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4

glom/test/test_error.py

@@ -59,6 +59,9 @@ def _norm_stack(formatted_stack, exc):
 
     normalized = []
     for line in formatted_stack.splitlines():
+        if set(line.strip()) <= set('^~'):
+            # python 3.13 added this error indicator which isn't really useful to test
+            continue
         if line.strip().startswith('File'):
             file_name = line.split('"')[1]
             short_file_name = os.path.split(file_name.strip('"'))[1]
@@ -68,16 +71,6 @@ def _norm_stack(formatted_stack, exc):
 
         line = line.rstrip()  # trailing whitespace shouldn't matter
 
-        # qualify python2's unqualified error type names
-        exc_type_name = exc.__class__.__name__
-        if exc_type_name in line:
-            mod_name = str(getattr(exc.__class__, '__module__', '') or '')
-            exc_type_qual_name = exc_type_name
-            if 'builtin' not in mod_name:
-                exc_type_qual_name = mod_name + '.' + exc_type_name
-            if exc_type_qual_name not in line:
-                line = line.replace(exc_type_name, exc_type_qual_name)
-
         normalized.append(line)
 
     stack = "\n".join(normalized) + '\n'

tox.ini

@@ -1,12 +1,15 @@
 [tox]
-envlist = py37,py38,py39,py310,py311,py312,pypy3,coverage-report,packaging
+python_envs = py37,py38,py39,py310,py311,py312,py313,pypy3
+envlist = {[tox]python_envs},coverage-report,packaging
 
 [testenv]
 changedir = .tox
 deps = -rrequirements.txt
 commands = coverage run --parallel --rcfile {toxinidir}/.tox-coveragerc -m pytest -vv --doctest-modules {envsitepackagesdir}/glom {posargs}
 
+
 [testenv:coverage-report]
+depends = {[tox]python_envs}
 changedir = .tox
 deps = coverage
 commands = coverage combine --rcfile {toxinidir}/.tox-coveragerc