Reorganize Tests (#985)

We no longer need a dedicated folder for Python3.6+ tests
We no longer need to check six.PY3 in tests

Author: ekampf

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/scalars.py

@@ -1,12 +1,11 @@
 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

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/utils/annotate.py

@@ -9,7 +9,7 @@ deps =
 setenv =
      PYTHONPATH = .:{envdir}
 commands =
-    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