Graphene v3 following v3 graphql-core

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
     hooks:
     -   id: pyupgrade
 -   repo: https://github.com/ambv/black
-    rev: 18.9b0
+    rev: 19.3b0
     hooks:
     - id: black
       language_version: python3

.travis.yml

@@ -1,18 +1,12 @@
 language: python
 matrix:
   include:
-    - env: TOXENV=py27
-      python: 2.7
-    - env: TOXENV=py35
-      python: 3.5
     - env: TOXENV=py36
       python: 3.6
     - env: TOXENV=py37
       python: 3.7
       dist: xenial
       sudo: true
-    - env: TOXENV=pypy
-      python: pypy-5.7.1
     - env: TOXENV=pre-commit
       python: 3.6
     - env: TOXENV=mypy

graphene/__init__.py

@@ -43,7 +43,7 @@
 from .utils.module_loading import lazy_import
 
 
-VERSION = (2, 1, 5, "final", 0)
+VERSION = (3, 0, 0, "alpha", 0)
 
 __version__ = get_version(VERSION)
 

graphene/pyutils/compat.py

@@ -1,21 +1,8 @@
 from __future__ import absolute_import
 
-import six
-
 from graphql.pyutils.compat import Enum
 
 try:
     from inspect import signature
 except ImportError:
     from .signature import signature
-
-if six.PY2:
-
-    def func_name(func):
-        return func.func_name
-
-
-else:
-
-    def func_name(func):
-        return func.__name__

graphene/test/__init__.py

@@ -1,5 +1,4 @@
 from promise import Promise, is_thenable
-import six
 from graphql.error import format_error as format_graphql_error
 from graphql.error import GraphQLError
 
@@ -10,7 +9,7 @@ def default_format_error(error):
     if isinstance(error, GraphQLError):
         return format_graphql_error(error)
 
-    return {"message": six.text_type(error)}
+    return {"message": str(error)}
 
 
 def format_execution_result(execution_result, format_error):

graphene/types/base.py

@@ -1,9 +1,7 @@
+from typing import Type
+
 from ..utils.subclass_with_meta import SubclassWithMeta
 from ..utils.trim_docstring import trim_docstring
-import six
-
-if six.PY3:
-    from typing import Type
 
 
 class BaseOptions(object):

graphene/types/datetime.py

@@ -4,7 +4,6 @@
 
 from aniso8601 import parse_date, parse_datetime, parse_time
 from graphql.language import ast
-from six import string_types
 
 from .scalars import Scalar
 
@@ -35,7 +34,7 @@ def parse_value(value):
         try:
             if isinstance(value, datetime.date):
                 return value
-            elif isinstance(value, string_types):
+            elif isinstance(value, str):
                 return parse_date(value)
         except ValueError:
             return None
@@ -65,7 +64,7 @@ def parse_value(value):
         try:
             if isinstance(value, datetime.datetime):
                 return value
-            elif isinstance(value, string_types):
+            elif isinstance(value, str):
                 return parse_datetime(value)
         except ValueError:
             return None
@@ -95,7 +94,7 @@ def parse_value(cls, value):
         try:
             if isinstance(value, datetime.time):
                 return value
-            elif isinstance(value, string_types):
+            elif isinstance(value, str):
                 return parse_time(value)
         except ValueError:
             return None

graphene/types/enum.py

@@ -1,7 +1,4 @@
 from collections import OrderedDict
-
-import six
-
 from graphene.utils.subclass_with_meta import SubclassWithMeta_Meta
 
 from ..pyutils.compat import Enum as PyEnum
@@ -66,7 +63,7 @@ def from_enum(cls, enum, description=None, deprecation_reason=None):  # noqa: N8
         return type(meta_class.enum.__name__, (Enum,), {"Meta": meta_class})
 
 
-class Enum(six.with_metaclass(EnumMeta, UnmountedType, BaseType)):
+class Enum(UnmountedType, BaseType, metaclass=EnumMeta):
     @classmethod
     def __init_subclass_with_meta__(cls, enum=None, _meta=None, **options):
         if not _meta:

graphene/types/scalars.py

@@ -1,12 +1,10 @@
-import six
+from typing import Any
+
 from graphql.language.ast import BooleanValue, FloatValue, IntValue, StringValue
 
 from .base import BaseOptions, BaseType
 from .unmountedtype import UnmountedType
 
-if six.PY3:
-    from typing import Any
-
 
 class ScalarOptions(BaseOptions):
     pass
@@ -114,7 +112,7 @@ class String(Scalar):
     def coerce_string(value):
         if isinstance(value, bool):
             return u"true" if value else u"false"
-        return six.text_type(value)
+        return str(value)
 
     serialize = coerce_string
     parse_value = coerce_string

graphene/types/tests/test_enum.py

@@ -1,5 +1,3 @@
-import six
-
 from ..argument import Argument
 from ..enum import Enum, PyEnum
 from ..field import Field
@@ -115,9 +113,6 @@ class Query(ObjectType):
 
 
 def test_enum_from_python3_enum_uses_enum_doc():
-    if not six.PY3:
-        return
-
     from enum import Enum as PyEnum
 
     class Color(PyEnum):

graphene/types/tests/test_objecttype.py

@@ -265,3 +265,17 @@ class Meta:
         field = MyScalar()
 
     assert str(MyObjectType) == "MyObjectType"
+
+
+def test_objecttype_meta_with_annotations():
+    class Query(ObjectType):
+        class Meta:
+            name: str = "oops"
+
+        hello = String()
+
+        def resolve_hello(self, info):
+            return "Hello"
+
+    schema = Schema(query=Query)
+    assert schema is not None

graphene/types/utils.py

@@ -2,8 +2,6 @@
 from collections import OrderedDict
 from functools import partial
 
-from six import string_types
-
 from ..utils.module_loading import import_string
 from .mountedtype import MountedType
 from .unmountedtype import UnmountedType
@@ -39,7 +37,7 @@ def yank_fields_from_attrs(attrs, _as=None, sort=True):
 
 
 def get_type(_type):
-    if isinstance(_type, string_types):
+    if isinstance(_type, str):
         return import_string(_type)
     if inspect.isfunction(_type) or isinstance(_type, partial):
         return _type()

graphene/types/uuid.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-import six
 from uuid import UUID as _UUID
 
 from graphql.language import ast
@@ -12,7 +11,7 @@ class UUID(Scalar):
 
     @staticmethod
     def serialize(uuid):
-        if isinstance(uuid, six.string_types):
+        if isinstance(uuid, str):
             uuid = _UUID(uuid)
 
         assert isinstance(uuid, _UUID), "Expected UUID instance, received {}".format(

graphene/utils/subclass_with_meta.py

@@ -1,7 +1,5 @@
 from inspect import isclass
 
-import six
-
 from ..pyutils.init_subclass import InitSubclassMeta
 from .props import props
 
@@ -18,7 +16,7 @@ def __repr__(cls):
         return "<{} meta={}>".format(cls.__name__, repr(cls._meta))
 
 
-class SubclassWithMeta(six.with_metaclass(SubclassWithMeta_Meta)):
+class SubclassWithMeta(metaclass=SubclassWithMeta_Meta):
     """This class improves __init_subclass__ to receive automatically the options from meta"""
 
     # We will only have the metaclass in Python 2

setup.py

@@ -49,6 +49,7 @@ def run_tests(self):
     "pytest-benchmark",
     "pytest-cov",
     "pytest-mock",
+    "pytest-asyncio",
     "snapshottest",
     "coveralls",
     "promise",
@@ -73,18 +74,12 @@ def run_tests(self):
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "Topic :: Software Development :: Libraries",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: Implementation :: PyPy",
     ],
     keywords="api graphql protocol rest relay graphene",
     packages=find_packages(exclude=["tests", "tests.*", "examples"]),
     install_requires=[
-        "six>=1.10.0,<2",
         "graphql-core>=2.1,<3",
         "graphql-relay>=0.4.5,<1",
         "aniso8601>=3,<=6.0.*",

tox.ini

@@ -1,17 +1,14 @@
 [tox]
-envlist = flake8,py27,py34,py35,py36,py37,pre-commit,pypy,mypy
+envlist = flake8,py36,py37,pre-commit,mypy
 skipsdist = true
 
 [testenv]
 deps =
     .[test]
-    py{35,36,37}: pytest-asyncio
 setenv =
      PYTHONPATH = .:{envdir}
 commands =
-    py{27,py}: py.test --cov=graphene graphene examples {posargs}
-    py{35}: py.test --cov=graphene graphene examples tests_asyncio {posargs}
-    py{36,37}: py.test --cov=graphene graphene examples tests_asyncio tests_py36 {posargs}
+    py{36,37}: py.test --cov=graphene graphene examples tests_asyncio {posargs}
 
 [testenv:pre-commit]
 basepython=python3.6