Merge branch 'master' into pytest-8

.github/workflows/tests.yml

@@ -25,6 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - {name: '3.12', python: '3.12', os: ubuntu-latest, tox: py312}
           - {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311}
           - {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310}
           - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
@@ -42,14 +43,12 @@ jobs:
 
       - name: get pip cache dir
         id: pip-cache
-        run: echo "::set-output name=dir::$(pip cache dir)"
-
+        run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
       - name: cache pip dependencies
         uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: pip|${{ runner.os }}|${{ matrix.python }}|${{ hashFiles('setup.py') }}
-
       - run: pip install tox
       - run: tox -e ${{ matrix.tox }}
       - name: Upload coverage.xml

.isort.cfg

@@ -1,2 +1,2 @@
 [settings]
-known_third_party = aniso8601,graphql,graphql_relay,promise,pytest,pyutils,setuptools,snapshottest,sphinx_graphene_theme
+known_third_party = graphql,graphql_relay,promise,pytest,pyutils,setuptools,snapshottest,sphinx_graphene_theme

SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+Support for security issues is currently provided for Graphene 3.0 and above. Support on earlier versions cannot be guaranteed by the maintainers of this library, but community PRs may be accepted in critical cases. 
+The preferred mitigation strategy is via an upgrade to Graphene 3.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 3.x     | :white_check_mark: |
+| <3.x    | :x:                |
+
+## Reporting a Vulnerability
+
+Please use responsible disclosure by contacting a core maintainer via Discord or E-Mail.

docs/quickstart.rst

@@ -59,7 +59,7 @@ When we send a **Query** requesting only one **Field**, ``hello``, and specify a
 Requirements
 ~~~~~~~~~~~~
 
--  Python (3.8, 3.9, 3.10, 3.11, pypy)
+-  Python (3.8, 3.9, 3.10, 3.11, 3.12, pypy)
 -  Graphene (3.0)
 
 Project setup

examples/starwars/tests/snapshots/snap_test_query.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # snapshottest: v1 - https://goo.gl/zC4yUc
-from __future__ import unicode_literals
-
 from snapshottest import Snapshot
 
 snapshots = Snapshot()

examples/starwars_relay/tests/snapshots/snap_test_connections.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # snapshottest: v1 - https://goo.gl/zC4yUc
-from __future__ import unicode_literals
-
 from snapshottest import Snapshot
 
 snapshots = Snapshot()

examples/starwars_relay/tests/snapshots/snap_test_mutation.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # snapshottest: v1 - https://goo.gl/zC4yUc
-from __future__ import unicode_literals
-
 from snapshottest import Snapshot
 
 snapshots = Snapshot()

examples/starwars_relay/tests/snapshots/snap_test_objectidentification.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # snapshottest: v1 - https://goo.gl/zC4yUc
-from __future__ import unicode_literals
-
 from snapshottest import Snapshot
 
 

graphene/pyutils/version.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import os
 import subprocess

graphene/relay/tests/test_custom_global_id.py

@@ -9,7 +9,7 @@ from ...types import Int, ObjectType, Schema, String
 
 
 class TestUUIDGlobalID:
-    def setup(self):
+    def setup_method(self):
         self.user_list = [
             {"id": uuid4(), "name": "First"},
             {"id": uuid4(), "name": "Second"},
@@ -77,7 +77,7 @@ class TestUUIDGlobalID:
 
 
 class TestSimpleGlobalID:
-    def setup(self):
+    def setup_method(self):
         self.user_list = [
             {"id": "my global primary key in clear 1", "name": "First"},
             {"id": "my global primary key in clear 2", "name": "Second"},
@@ -140,7 +140,7 @@ class TestSimpleGlobalID:
 
 
 class TestCustomGlobalID:
-    def setup(self):
+    def setup_method(self):
         self.user_list = [
             {"id": 1, "name": "First"},
             {"id": 2, "name": "Second"},
@@ -219,7 +219,7 @@ class TestCustomGlobalID:
 
 
 class TestIncompleteCustomGlobalID:
-    def setup(self):
+    def setup_method(self):
         self.user_list = [
             {"id": 1, "name": "First"},
             {"id": 2, "name": "Second"},

graphene/types/datetime.py

@@ -1,8 +1,5 @@
-from __future__ import absolute_import
-
 import datetime
 
-from aniso8601 import parse_date, parse_datetime, parse_time
 from graphql.error import GraphQLError
 from graphql.language import StringValueNode, print_ast
 
@@ -39,7 +36,7 @@ class Date(Scalar):
         if not isinstance(value, str):
             raise GraphQLError(f"Date cannot represent non-string value: {repr(value)}")
         try:
-            return parse_date(value)
+            return datetime.date.fromisoformat(value)
         except ValueError:
             raise GraphQLError(f"Date cannot represent value: {repr(value)}")
 
@@ -74,7 +71,7 @@ class DateTime(Scalar):
                 f"DateTime cannot represent non-string value: {repr(value)}"
             )
         try:
-            return parse_datetime(value)
+            return datetime.datetime.fromisoformat(value)
         except ValueError:
             raise GraphQLError(f"DateTime cannot represent value: {repr(value)}")
 
@@ -107,6 +104,6 @@ class Time(Scalar):
         if not isinstance(value, str):
             raise GraphQLError(f"Time cannot represent non-string value: {repr(value)}")
         try:
-            return parse_time(value)
+            return datetime.time.fromisoformat(value)
         except ValueError:
             raise GraphQLError(f"Time cannot represent value: {repr(value)}")

graphene/types/decimal.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from decimal import Decimal as _Decimal
 
 from graphql import Undefined

graphene/types/generic.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from graphql.language.ast import (
     BooleanValueNode,
     FloatValueNode,

graphene/types/json.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import json
 
 from graphql import Undefined

graphene/types/uuid.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from uuid import UUID as _UUID
 
 from graphql.language.ast import StringValueNode

setup.py

@@ -52,8 +52,6 @@ tests_require = [
     "pytest-asyncio>=0.16,<2",
     "snapshottest>=0.6,<1",
     "coveralls>=3.3,<4",
-    "mock>=4,<5",
-    "iso8601>=1,<2",
 ]
 
 dev_requires = ["black==22.3.0", "flake8>=4,<5"] + tests_require
@@ -77,13 +75,13 @@ setup(
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     keywords="api graphql protocol rest relay graphene",
     packages=find_packages(exclude=["examples*"]),
     install_requires=[
         "graphql-core>=3.1,<3.3",
         "graphql-relay>=3.1,<3.3",
-        "aniso8601>=8,<10",
     ],
     tests_require=tests_require,
     extras_require={"test": tests_require, "dev": dev_requires},

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{8,9,10,11}, mypy, pre-commit
+envlist = py3{8,9,10,11,12}, mypy, pre-commit
 skipsdist = true
 
 [testenv]
@@ -8,7 +8,7 @@ deps =
 setenv =
      PYTHONPATH = .:{envdir}
 commands =
-    py{38,39,310,311}: pytest --cov=graphene graphene --cov-report=term --cov-report=xml examples {posargs}
+    py{38,39,310,311,12}: pytest --cov=graphene graphene --cov-report=term --cov-report=xml examples {posargs}
 
 [testenv:pre-commit]
 basepython = python3.10