Merge pull request #88 from necaris/update-test-matrix

Add Python 3.11 to test matrix

Author: necaris

.github/workflows/tests.yaml

@@ -6,27 +6,24 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v3
-      with:
-        python-version: 3.8
-    - uses: pre-commit/[email protected]
-  pytest:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+      - uses: pre-commit/[email protected]
+  tests:
     name: pytest
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Ensure poetry
-        uses: abatilo/[email protected]
-      - name: Install dependencies
-        run: poetry install
-      - name: Run matrix of tests with Tox
-        run: poetry run tox
+      - uses: abatilo/actions-poetry@v2
+      - run: poetry install
+      - run: poetry run nox --non-interactive

.pre-commit-config.yaml

@@ -1,24 +1,25 @@
-default_language_version:
-    python: python3.8
 fail_fast: true
 repos:
-  - repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.0.0
     hooks:
-    - id: check-merge-conflict
-    - id: check-yaml
-    - id: debug-statements
-    - id: end-of-file-fixer
-      exclude: ^docs/.*$
-    - id: trailing-whitespace
-      exclude: README.md
-    - id: flake8
+      - id: check-merge-conflict
+      - id: check-yaml
+      - id: debug-statements
+      - id: end-of-file-fixer
+        exclude: ^docs/.*$
+      - id: trailing-whitespace
+        exclude: README.md
+  - repo: https://github.com/pycqa/flake8
+    rev: "6.1.0"
+    hooks:
+      - id: flake8
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.812
+    rev: v1.4.1
     hooks:
       - id: mypy
         args: [--ignore-missing-imports, --no-strict-optional]
-  - repo: https://github.com/python/black
-    rev: 20.8b1
+  - repo: https://github.com/psf/black
+    rev: 23.7.0
     hooks:
       - id: black

graphene_pydantic/converters.py

@@ -137,17 +137,16 @@ def convert_pydantic_field(
     field_type = field_kwargs.pop("type", field_kwargs.pop("type_", None))
     if field_type is None:
         raise ValueError("No field type could be determined.")
-        
-    resolver_function = getattr(parent_type,
-                                "resolve_" + field.name,
-                                None)
+
+    resolver_function = getattr(parent_type, "resolve_" + field.name, None)
     if resolver_function and callable(resolver_function):
         field_resolver = resolver_function
     else:
         field_resolver = get_attr_resolver(field.name)
 
     return Field(field_type, resolver=field_resolver, **field_kwargs)
 
+
 def convert_pydantic_type(
     type_: T.Type,
     field: ModelField,
@@ -293,19 +292,15 @@ def convert_generic_python_type(
         return convert_literal_type(
             type_, field, registry, parent_type=parent_type, model=model
         )
-    elif (
-        origin
-        in (
-            T.Tuple,
-            T.List,
-            T.Set,
-            T.Collection,
-            T.Iterable,
-            list,
-            set,
-        )
-        or issubclass(origin, collections.abc.Sequence)
-    ):
+    elif origin in (
+        T.Tuple,
+        T.List,
+        T.Set,
+        T.Collection,
+        T.Iterable,
+        list,
+        set,
+    ) or issubclass(origin, collections.abc.Sequence):
         # TODO: find a better way of divining that the origin is sequence-like
         inner_types = getattr(type_, "__args__", [])
         if not inner_types:  # pragma: no cover  # this really should be impossible

noxfile.py

@@ -0,0 +1,17 @@
+import sys
+from nox import parametrize, session
+
+
+@session
+@parametrize(
+    "pydantic",
+    ("1.9", "1.10", "1.7", "1.8"),
+)
+def tests(session, pydantic):
+    if sys.version_info > (3, 10) and pydantic in ("1.7", "1.8"):
+        return session.skip()
+    session.install(f"pydantic=={pydantic}")
+    session.install("pytest", "pytest-cov", ".")
+    session.run(
+        "pytest", "-v", "tests/", "--cov-report=term-missing", "--cov=graphene_pydantic"
+    )

poetry.lock

@@ -5,7 +5,8 @@ description = "Graphene Pydantic integration"
 readme = "README.md"
 repository = "https://github.com/graphql-python/graphene-pydantic"
 authors = [
-  "Rami Chowdhury <[email protected]>"
+  "Rami Chowdhury <[email protected]>",
+  "Dan Riggs <[email protected]>",
 ]
 license = "Apache-2.0"
 classifiers = [
@@ -23,21 +24,20 @@ keywords = ["api", "graphql", "protocol", "rest", "relay", "graphene", "pydantic
 
 [tool.poetry.dependencies]
 python = "^3.7"
-# To keep things simple, we only support newer versions of Graphene & Pydantic
-graphene = ">=2.1.8"
+graphene = ">=3.0"
 pydantic = [
-    { version = ">=1.0,<2.0", python = ">3.6,<3.10" },
+    { version = ">=1.0,<2.0", python = ">3.6,<3.12" },
     { version = ">=1.9,<2.0", python = ">=3.10" }
 ]
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 pytest = "~6.2"
 pytest-cov = "~2.7.1"
-tox = "~3.12.0"  # sync with tox.ini
-mypy = "0.901"
-black = "21.12b0"
-pre-commit = "~1.17.0"
+mypy = "^1.4.1"
+black = "23.3"
+pre-commit = "^2.9.2"
+nox = "^2023.4.22"
 
 [build-system]
-requires = ["poetry>=1.0"]
+requires = ["poetry>=1.5"]
 build-backend = "poetry.masonry.api"

pyproject.toml

@@ -76,8 +76,9 @@ def test_union():
     assert field.type.of_type.__name__.startswith("UnionOf")
 
 
-if sys.version_info >= (3, 8):
-    # Python < 3.8 does not support typing.Literal
+if sys.version_info >= (3, 10):
+    # Python < 3.10 does not support typing.Literal except as a
+    # _SpecialGenericAlias, which Pydantic doesn't like
 
     def test_literal():
         field = _convert_field_from_spec(