Merge remote-tracking branch 'origin/master' into pr/onursatici/172

Author: lovasoa

.github/workflows/python-package.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        python_version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
 
     steps:
     - uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install --pre -e '.[dev]'
     - name: Pre-commit hooks
-      if: ${{ matrix.python_version != 'pypy3' }}
+      if: ${{ matrix.python_version != 'pypy3' && matrix.python_version != '3.6' }}
       run: pre-commit run --all-files
     - name: Test with pytest
       run: pytest

.pre-commit-config.yaml

@@ -1,27 +1,27 @@
 repos:
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.7.4
+  rev: v2.31.0 # Later versions do not support python 3.6
   hooks:
   - id: pyupgrade
     args: ["--py36-plus"]
 - repo: https://github.com/python/black
-  rev: 20.8b1
+  rev: 22.3.0
   hooks:
   - id: black
     language_version: python3
 - repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.4
+  rev: 3.9.2
   hooks:
   - id: flake8
     additional_dependencies: ['flake8-bugbear==19.8.0']
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.790
+  rev: v0.931 # Later versions do not support python 3.6
   hooks:
   - id: mypy
     additional_dependencies: [marshmallow-enum,typeguard,marshmallow]
     args: [--show-error-codes]
 - repo: https://github.com/asottile/blacken-docs
-  rev: v1.9.1
+  rev: v1.12.0 # Later versions do not support python 3.6
   hooks:
   - id: blacken-docs
     additional_dependencies: [black==19.3b0]

README.md

@@ -92,7 +92,32 @@ PersonSchema = marshmallow_dataclass.class_schema(Person)
 
 The type of your fields must be either basic 
 [types supported by marshmallow](https://marshmallow.readthedocs.io/en/stable/api_reference.html#marshmallow.Schema.TYPE_MAPPING)
-(such as `float`, `str`, `bytes`, `datetime`, ...), or other dataclasses.
+(such as `float`, `str`, `bytes`, `datetime`, ...), `Union`, or other dataclasses.
+
+### Union (de)serialization coercion 
+
+Typically the Union type; `Union[X, Y]` means—from a set theory perspective—either `X` or `Y`, i.e., an unordered set, howevever the order of the sub-types defines the precedence when attempting to ether deserialize or serialize the value per [here](https://github.com/lovasoa/marshmallow_dataclass/blob/master/marshmallow_dataclass/union_field.py). 
+
+For example, 
+
+```python
+from typing import Union
+
+from dataclasses import dataclass
+
+
+@dataclass
+class Person:
+    name: str
+    age: Union[int, float]
+
+
+PersonSchema = marshmallow_dataclass.class_schema(Person)
+PersonSchema().load({"name": "jane", "age": 50.0})
+# => Person(name="jane", age=50)
+```
+
+will first (sucessfully) try to coerce `50.0` to an `int`. If coercion is not desired the `Any` type can be used with the caveat that values will not be type checked without additional [validation](https://marshmallow.readthedocs.io/en/stable/marshmallow.validate.html).
 
 ### Customizing generated fields
 

marshmallow_dataclass/__init__.py

@@ -596,9 +596,10 @@ def field_for_schema(
     if generic_field:
         return generic_field
 
-    # typing.NewType returns a function with a __supertype__ attribute
+    # typing.NewType returns a function (in python <= 3.9) or a class (python >= 3.10) with a
+    # __supertype__ attribute
     newtype_supertype = getattr(typ, "__supertype__", None)
-    if newtype_supertype and inspect.isfunction(typ):
+    if typing_inspect.is_new_type(typ) and newtype_supertype is not None:
         return _field_by_supertype(
             typ=typ,
             default=default,

setup.py

@@ -18,8 +18,8 @@
 EXTRAS_REQUIRE = {
     "enum": ["marshmallow-enum"],
     "union": ["typeguard"],
-    ':python_version == "3.6"': ["dataclasses", "types-dataclasses"],
-    "lint": ["pre-commit~=1.18"],
+    "lint": ["pre-commit~=2.17"],
+    ':python_version == "3.6"': ["dataclasses", "types-dataclasses<0.6.4"],
     "docs": ["sphinx"],
     "tests": [
         "pytest>=5.4",