Add python 3.13

Author: mvanderlee

.github/workflows/python-package.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.10"]
+        python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.10"]
 
     runs-on: ${{ matrix.os }}
     steps:

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
   - id: flake8
     additional_dependencies: ['flake8-bugbear==22.10.27']
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.1.1
+  rev: v1.13.0
   hooks:
   - id: mypy
     additional_dependencies: [typeguard,marshmallow]

marshmallow_dataclass/generic_resolver.py

@@ -236,14 +236,15 @@ def get_generic_dataclass_fields(clazz: type) -> Tuple[dataclasses.Field, ...]:
                 # Either the first time we see this field, or it got overridden
                 # If it's a class we handle it later as a Nested. Nothing to resolve now.
                 new_field = field
-                if not inspect.isclass(field.type) and may_contain_typevars(field.type):
+                field_type: type = field.type  # type: ignore[assignment]
+                if not inspect.isclass(field_type) and may_contain_typevars(field_type):
                     new_field = copy.copy(field)
                     new_field.type = _replace_typevars(
-                        field.type, resolved_typevars[subclass]
+                        field_type, resolved_typevars[subclass]
                     )
-                elif isinstance(field.type, TypeVar):
+                elif isinstance(field_type, TypeVar):
                     new_field = copy.copy(field)
-                    new_field.type = resolved_typevars[subclass][field.type].result()
+                    new_field.type = resolved_typevars[subclass][field_type].result()
 
                 fields[field.name] = (field, new_field)
             except InvalidStateError:

setup.py

@@ -13,6 +13,7 @@
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
 ]
 

tests/test_generics.py

@@ -210,15 +210,16 @@ class TestClass(typing.Generic[T, U, V]):
             override: int
 
         # Don't only override typevar, but switch order to further confuse things
+        # Ignoring 'override' Because I want to test that it works, even if incompatible types
         @dataclasses.dataclass
-        class TestClass2(TestClass[str, W, U]):
-            override: str  # type: ignore  # Want to test that it works, even if incompatible types
+        class TestClass2(TestClass[str, W, U]):  # type: ignore[override]
+            override: str  # type: ignore[override, assignment]
 
-        TestAlias = TestClass2[int, T]
+        TestAlias = TestClass2[int, T]  # type: ignore[override]
 
         # inherit from alias
         @dataclasses.dataclass
-        class TestClass3(TestAlias[typing.List[int]]):
+        class TestClass3(TestAlias[typing.List[int]]):  # type: ignore[override]
             pass
 
         test_schema = class_schema(TestClass3)()
@@ -430,10 +431,11 @@ class TestClass(typing.Generic[T, U, V]):
 
         # Don't only override typevar, but switch order to further confuse things
         @dataclasses.dataclass
-        class TestClass2(TestClass[str, W, U]):
-            override: str  # type: ignore  # Want to test that it works, even if incompatible types
+        class TestClass2(TestClass[str, W, U]):  # type: ignore[override]
+            # Want to test that it works, even if incompatible types
+            override: str  # type: ignore[override, assignment]
 
-        TestAlias = TestClass2[int, T]
+        TestAlias = TestClass2[int, T]  # type: ignore[override]
         test_schema2 = class_schema(TestClass2)()
         assert list(test_schema2.fields) == ["pairs", "gen", "override"]
         assert isinstance(test_schema2.fields["pairs"], marshmallow.fields.List)
@@ -452,7 +454,7 @@ class TestClass2(TestClass[str, W, U]):
 
         # inherit from alias
         @dataclasses.dataclass
-        class TestClass3(TestAlias[typing.List[int]]):
+        class TestClass3(TestAlias[typing.List[int]]):  # type: ignore[override]
             pass
 
         test_schema3 = class_schema(TestClass3)()

tox.ini

@@ -0,0 +1,31 @@
+[tox]
+requires =
+    tox>=4
+    virtualenv-pyenv
+env_list =
+    py{38,39,310,311,312,313}
+    cover-report
+set_env =
+  VIRTUALENV_DISCOVERY = pyenv
+
+[testenv]
+deps =
+    coverage
+    pytest
+commands = coverage run -p -m pytest tests
+extras = dev
+set_env =
+  VIRTUALENV_DISCOVERY = pyenv
+depends =
+  cover-report: py{38,39,310,311,312,313}
+
+[testenv:cover-report]
+skip_install = true
+deps = coverage
+commands =
+    coverage combine
+    coverage html
+    coverage report
+
+    
+# - You can also run `tox` from the command line to test in all supported python versions. Note that this will require you to have all supported python versions installed.