adjust to wider exception printing in Python3.13

Author: mr-c

Makefile

@@ -29,7 +29,7 @@ EXTRAS=[pycodegen]
 PYSOURCES=$(wildcard ${MODULE}/**.py ${MODULE}/avro/*.py ${MODULE}/tests/*.py) setup.py
 DEVPKGS=-rdev-requirements.txt -rtest-requirements.txt -rmypy-requirements.txt -rlint-requirements.txt
 COVBASE=coverage run --append
-PYTEST_EXTRA ?= -rs
+PYTEST_EXTRA ?=
 
 VERSION=8.7.$(shell date +%Y%m%d%H%M%S --utc --date=`git log --first-parent \
 	--max-count=1 --format=format:%cI`)
@@ -155,7 +155,7 @@ diff-cover.html: coverage.xml
 
 ## test                   : run the schema-salad test suite
 test: $(PYSOURCES)
-	python -m pytest -rs ${PYTEST_EXTRA}
+	python -m pytest -rsfE ${PYTEST_EXTRA}
 
 ## testcov                : run the schema-salad test suite and collect coverage
 testcov: $(PYSOURCES)

mypy-stubs/cachecontrol/caches/__init__.pyi

@@ -1,3 +1,5 @@
-from cachecontrol.caches.file_cache import SeparateBodyFileCache as SeparateBodyFileCache
+from cachecontrol.caches.file_cache import (
+    SeparateBodyFileCache as SeparateBodyFileCache,
+)
 
 __all__ = ["SeparateBodyFileCache"]

mypy-stubs/cachecontrol/caches/file_cache.pyi

@@ -1,9 +1,10 @@
-from cachecontrol.cache import SeparateBodyBaseCache
 from datetime import datetime
-from filelock import BaseFileLock
 from pathlib import Path
 from typing import IO, ContextManager
 
+from cachecontrol.cache import SeparateBodyBaseCache
+from filelock import BaseFileLock
+
 class _LockClass:
     path: str
 

schema_salad/dlang_codegen.py

@@ -8,7 +8,14 @@
 
 from . import _logger, schema
 from .codegen_base import CodeGenBase, TypeDef
-from .cpp_codegen import isArray, isEnumSchema, isMapSchema, isRecordSchema, isUnionSchema, pred
+from .cpp_codegen import (
+    isArray,
+    isEnumSchema,
+    isMapSchema,
+    isRecordSchema,
+    isUnionSchema,
+    pred,
+)
 from .exceptions import SchemaException
 from .schema import shortname
 

schema_salad/tests/test_codegen_errors.py

@@ -30,8 +30,7 @@ def test_error_message1(tmp_path: Path) -> None:
 
 def test_error_message2(tmp_path: Path) -> None:
     t = "test_schema/test2.cwl"
-    match = r"""^.*test2\.cwl:2:1:\s+Field\s+`class`\s+contains\s+undefined\s+reference\s+to
-\s+`file://.+/schema_salad/tests/test_schema/xWorkflow`$"""
+    match = r"""^.*test2\.cwl:2:1:\s+Field\s+`class`\s+contains\s+undefined\s+reference\s+to\s+`file://.+/schema_salad/tests/test_schema/xWorkflow`$"""
     path = get_data("tests/" + t)
     assert path
     with pytest.raises(ValidationException, match=match):
@@ -100,8 +99,7 @@ def test_error_message8(tmp_path: Path) -> None:
 .*test8\.cwl:9:3:\s+checking\s+object\s+`.*test8\.cwl#step1`
 \s+\*\s+missing\s+required\s+field\s+`run`
 .*test8\.cwl:10:5:\s+\*\s+the\s+`scatterMethod`\s+field\s+is\s+not\s+valid\s+because:
-\s+contains\s+undefined\s+reference\s+to
-\s+`file:///.*/tests/test_schema/abc`$"""
+\s+contains\s+undefined\s+reference\s+to\s+`file:///.*/tests/test_schema/abc`$"""
     path = get_data("tests/" + t)
     assert path
     with pytest.raises(ValidationException, match=match):
@@ -144,9 +142,7 @@ def test_error_message11(tmp_path: Path) -> None:
 .*test11\.cwl:8:1:\s+the\s+`steps`\s+field\s+is\s+not\s+valid\s+because:
 \s+array\s+item\s+is\s+invalid\s+because
 .*test11\.cwl:9:3:\s+checking\s+object\s+`.*test11\.cwl#step1`
-.*test11\.cwl:10:5:\s+the\s+`run`\s+field\s+is\s+not\s+valid\s+because:
-\s+contains\s+undefined\s+reference\s+to
-\s+`file:///.*/tests/test_schema/blub\.cwl`$"""
+.*test11\.cwl:10:5:\s+the\s+`run`\s+field\s+is\s+not\s+valid\s+because:\s+contains\s+undefined\s+reference\s+to\s+`file:///.*/tests/test_schema/blub\.cwl`$"""
     path = get_data("tests/" + t)
     assert path
     with pytest.raises(ValidationException, match=match):

schema_salad/tests/test_errors.py

@@ -100,8 +100,7 @@ def test_error_message3() -> None:
     match = r"""
 ^.+test3\.cwl:6:1: checking field\s+'outputs'
 .+test3\.cwl:7:3:   checking object\s+'.+test3\.cwl#bar'
-\s+Field 'type'\s+references\s+unknown\s+identifier\s+'xstring',\s+tried
-\s+file://.+/tests/test_schema/test3\.cwl#xstring$"""[
+\s+Field 'type'\s+references\s+unknown\s+identifier\s+'xstring',\s+tried\s+file://.+/tests/test_schema/test3\.cwl#xstring$"""[  # noqa: B950
         1:
     ]
     with pytest.raises(ValidationException, match=match):
@@ -153,15 +152,15 @@ def test_error_message7() -> None:
 
     t = "test_schema/test7.cwl"
     match = (
-        r"""^.+test7\.cwl:2:1:\s+Object\s+'.+test7\.cwl'\s+is\s+not valid because
-\s+tried 'Workflow'\s+but
+        r"""^.+test7\.cwl:2:1:\s+Object\s+'.+test7\.cwl'\s+is\s+not\s+valid\s+because
+\s+tried\s+'Workflow'\s+but
 .+test7\.cwl:8:1:\s+the 'steps'\s+field\s+is\s+not\s+valid\s+because
-\s+tried array\s+of\s+<WorkflowStep>\s+but
+\s+tried\s+array\s+of\s+<WorkflowStep>\s+but
 .+test7\.cwl:9:3:\s+item is\s+invalid\s+because
 \s+\* missing\s+required\s+field\s+'run'
-.+test7\.cwl:10:5:\s+\* invalid\s+field\s+'scatter_method',\s+expected\s+one """
-        + r"""of:\s+'id',\s+'in', 'out',\s+'requirements',\s+'hints',\s+"""
-        + r"""'label',\s+'doc',\s+'run',\s+'scatter',\s+'scatterMethod'$"""
+.+test7\.cwl:10:5:\s+\* invalid\s+field\s+'scatter_method',\s+expected\s+one\s+"""
+        + r"of:\s+'id',\s+'in',\s+'out',\s+'requirements',\s+'hints',\s+"
+        + r"'label',\s+'doc',\s+'run',\s+'scatter',\s+'scatterMethod'$"
     )
     with pytest.raises(ValidationException, match=match):
         load_and_validate(document_loader, avsc_names, str(get_data("tests/" + t)), True)
@@ -254,17 +253,17 @@ def test_error_message15() -> None:
 
     t = "test_schema/test15.cwl"
     match = (
-        r"""^.+test15\.cwl:3:1:\s+Object\s+'.+test15\.cwl'\s+is not valid because
+        r"""^.+test15\.cwl:3:1:\s+Object\s+'.+test15\.cwl'\s+is\s+not\s+valid\s+because
 \s+tried\s+'CommandLineTool'\s+but
-.+test15\.cwl:6:1:\s+the 'inputs'\s+field\s+is\s+not valid\s+because
-.+test15\.cwl:7:3:\s+item is\s+invalid\s+because
+.+test15\.cwl:6:1:\s+the\s+'inputs'\s+field\s+is\s+not\s+valid\s+because
+.+test15\.cwl:7:3:\s+item\s+is\s+invalid\s+because
 .+test15\.cwl:9:5:\s+the\s+'inputBinding'\s+field\s+is\s+not\s+valid\s+because
 .+tried\s+CommandLineBinding\s+but
 .+test15\.cwl:11:7:             \*\s+invalid\s+field\s+'invalid_field',\s+expected\s+"""
         + r"""one\s+of:\s+'loadContents',\s+'position',\s+'prefix',\s+'separate',"""
         + r"""\s+'itemSeparator',\s+'valueFrom',\s+'shellQuote'
 .+test15\.cwl:12:7:             \*\s+invalid\s+field\s+'another_invalid_field',"""
-        + r"""\s+expected one\s+of:\s+'loadContents',\s+'position',\s+'prefix',"""
+        + r"""\s+expected\s+one\s+of:\s+'loadContents',\s+'position',\s+'prefix',"""
         + r"""\s+'separate',\s+'itemSeparator',\s+'valueFrom',\s+'shellQuote'$"""
     )
     with pytest.raises(ValidationException, match=match):

schema_salad/tests/test_print_oneline.py

@@ -177,7 +177,7 @@ def test_for_invalid_yaml2() -> None:
             assert (
                 msg.endswith("expected <block end>, but found ':'")
                 or msg.endswith("expected <block end>, but found u':'")
-                or re.search(r"mapping with\s+implicit\s+null key$", msg, re.M)
+                or re.search(r"mapping\s+with\s+implicit\s+null\s+key$", msg, re.M)
             )
             print("\n", e)
             raise