Merge pull request #359 from jacebrowning/remove-pep-563

Remove test handling for PEP 563

Author: jacebrowning

.github/workflows/main.yml

@@ -8,8 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # TODO: Add 3.12 and 3.13 when dev dependencies support it
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v2

pyproject.toml

@@ -35,6 +35,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python",
     "Topic :: Software Development",
     "Topic :: Utilities",

pytest.ini

@@ -11,6 +11,8 @@ addopts =
     --cov-report=term-missing:skip-covered
     --no-cov-on-fail
 
+xfail_strict = true
+
 cache_dir = .cache
 
 log_level = DEBUG

tests/__init__.py

@@ -1,10 +1 @@
 """Integration tests for the package."""
-
-import sys
-
-import pytest
-
-xfail_with_pep_563 = pytest.mark.xfail(
-    sys.version_info >= (3, 12),
-    reason="Postponed evaluations (PEP 563) are unable to resolve locally-defined types",
-)

tests/test_generic_converters.py

@@ -5,10 +5,7 @@
 from datafiles import Missing, converters, datafile
 from datafiles.utils import dedent
 
-from . import xfail_with_pep_563
 
-
-@xfail_with_pep_563
 def test_generic_converters(expect):
     S = TypeVar("S")
     T = TypeVar("T")

tests/test_instantiation.py

@@ -8,8 +8,6 @@
 from datafiles import Missing, datafile
 from datafiles.utils import logbreak, write
 
-from . import xfail_with_pep_563
-
 counter = 0
 
 
@@ -178,7 +176,6 @@ class Sample:
 
 
 def describe_missing_attributes():
-    @xfail_with_pep_563
     def when_dataclass(expect):
         @dataclass
         class Name:

tests/test_loading.py

@@ -9,7 +9,6 @@
 from datafiles import Missing, datafile
 from datafiles.utils import dedent, logbreak, read, write
 
-from . import xfail_with_pep_563
 from .samples import (
     Sample,
     SampleAsJSON,
@@ -279,7 +278,6 @@ def with_extra_attributes(sample, expect):
         expect(sample.nested.score) == 3.4
         expect(hasattr(sample.nested, "extra")).is_(False)
 
-    @xfail_with_pep_563
     def with_multiple_levels(expect):
         @dataclass
         class Bottom:

tests/test_orm_usage.py

@@ -8,7 +8,6 @@
 from datafiles import datafile
 from datafiles.utils import logbreak, write
 
-from . import xfail_with_pep_563
 from .samples import SampleWithNestingAndOptionals
 
 
@@ -51,7 +50,6 @@ def test_multiple_instances_are_distinct(expect):
     }
 
 
-@xfail_with_pep_563
 def test_classes_can_share_a_nested_dataclass(expect):
     @datafile
     class Nested:
@@ -117,7 +115,6 @@ def test_partial_nested_load_from_disk(expect):
     expect(items[0].nested.weight).is_(None)
 
 
-@xfail_with_pep_563
 def test_missing_optional_fields_are_loaded(expect):
     @datafile
     class Name:

tests/test_profiling.py

@@ -6,8 +6,6 @@
 from datafiles import datafile
 from datafiles.utils import logbreak
 
-from . import xfail_with_pep_563
-
 
 def get_sample():
     @dataclass
@@ -31,19 +29,16 @@ class Sample:
     return Sample("profiling", Item(2, None), None, [Item(3, None)])
 
 
-@xfail_with_pep_563
 def test_init():
     get_sample()
 
 
-@xfail_with_pep_563
 def test_load():
     sample = get_sample()
     logbreak("Loading")
     sample.datafile.load()  # pylint: disable=no-member
 
 
-@xfail_with_pep_563
 def test_save():
     sample = get_sample()
     logbreak("Saving")

tests/test_saving.py

@@ -10,7 +10,6 @@
 from datafiles import datafile
 from datafiles.utils import dedent, logbreak, read, write
 
-from . import xfail_with_pep_563
 from .samples import (
     Sample,
     SampleFrozen,
@@ -295,7 +294,6 @@ def with_nones(expect):
             """
         )
 
-    @xfail_with_pep_563
     def when_nested_dataclass_is_none(expect):
         @datafile
         class Name: