Add support to python 3.10 and 3.11

Author: isra17

.github/workflows/ci.yml

@@ -11,21 +11,60 @@ on:
 jobs:
   ci:
     runs-on: ${{ matrix.os }}
-    container: docker://altendky/hydra:ubuntu-20.04-3-minors
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-latest
+        python:
+          - version: "3.7"
+            bin: python3.7
+            tox: py37,report,codecov
+          - version: "3.8"
+            bin: python3.8
+            tox: py38,report,codecov
+          - version: "3.9"
+            bin: python3.9
+            tox: py39,report,codecov
+          - version: "3.10"
+            bin: python3.10
+            tox: py310,report,codecov
+          - version: "3.11"
+            bin: python3.11
+            tox: py311,report,codecov
+          - version: pypy-3.7
+            bin: pypy3
+            tox: pypy3,report,codecov
+    env:
+      TOXTOOLPYTHON: "${{ matrix.python.bin }}"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python.version }}
+      - name: Install
+        run: |
+          pip install tox
+      - name: Test
+        run: |
+          tox -v -e "${{ matrix.python.tox }}"
+  linting:
+    name: Linting
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: ["3.10"]
         toxenv:
-          - py37,report,codecov
-          - py38,report,codecov
-          - py39,report,codecov
-          - pypy3,report,codecov
           - doc
           - check
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+          architecture: x64
       - name: Install
         run: |
           pip install tox
@@ -37,6 +76,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - ci
+      - linting
     steps:
       - name: This
         shell: python

changelog.d/238.changes.rst

@@ -0,0 +1 @@
+Add support to python 3.10 and 3.11.

src/desert/_make.py

@@ -298,9 +298,8 @@ def field_for_schema(
 
             field = marshmallow_union.Union(subfields)
 
-    # t.NewType returns a function with a __supertype__ attribute
-    newtype_supertype = getattr(typ, "__supertype__", None)
-    if newtype_supertype and inspect.isfunction(typ):
+    newtype_supertype = _get_newtype_supertype(typ)
+    if newtype_supertype:
         metadata.setdefault("description", typ.__name__)
         field = field_for_schema(newtype_supertype, default=default)
 
@@ -370,6 +369,19 @@ def _get_field_default(
         raise TypeError(field)
 
 
+def _get_newtype_supertype(typ: t.Any) -> t.Any:
+    newtype_supertype = getattr(typ, "__supertype__", None)
+    if newtype_supertype:
+        if (
+            # Python<3.10: t.NewType returns a function with a __supertype__ attribute
+            inspect.isfunction(typ)
+            # Python>=3.10: t.NewType is a type
+            or (isinstance(t.NewType, type) and isinstance(typ, t.NewType))
+        ):
+            return newtype_supertype
+    return None
+
+
 @attr.frozen
 class _DesertSentinel:
     pass

tox.ini

@@ -5,7 +5,7 @@ envlist =
     clean,
     check,
     doc,
-    {py37,py38,py39,pypy3},
+    {py37,py38,py39,py310,py311,pypy3},
     report
 
 [testenv]
@@ -14,7 +14,9 @@ basepython =
     py37: {env:TOXPYTHON:python3.7}
     py38: {env:TOXPYTHON:python3.8}
     py39: {env:TOXPYTHON:python3.9}
-    {doc,spell,bootstrap,clean,check,report,codecov}: {env:TOXTOOLPYTHON:python3.8}
+    py310: {env:TOXPYTHON:python3.10}
+    py311: {env:TOXPYTHON:python3.11}
+    {doc,spell,bootstrap,clean,check,report,codecov}: {env:TOXTOOLPYTHON:python3.10}
 setenv =
     PYTHONPATH={toxinidir}/tests
     PYTHONUNBUFFERED=yes