Use newer pytest, desupport Python 3.3 and 3.4, require Core 2.3

Author: Cito

.travis.yml

@@ -3,17 +3,13 @@ matrix:
   include:
     - python: "3.7"
       env: TOX_ENV=black,flake8,mypy,py37
-      dist: xenial
-      sudo: true
     - python: "3.6"
       env: TOX_ENV=py36
     - python: "3.5"
       env: TOX_ENV=py35
-    - python: "3.4"
-      env: TOX_ENV=py34
     - python: "2.7"
       env: TOX_ENV=py27
-    - python: pypy3.5
+    - python: pypy3
       env: TOX_ENV=pypy3
     - python: pypy
       env: TOX_ENV=pypy
@@ -29,9 +25,11 @@ after_success:
   - codecov
 deploy:
   provider: pypi
-  user: __token__
-  password:
-    secure: WcZf7AVMDzheXWUxNhZF/TUcyvyCdHZGyhHTakjBhUs8I8khSvlMPofaXTdN1Qn3WbHPK+IXeIPh/2NX0Le3Cdzp08Q/Tgrf9EZ4y02UrZxwSxtsUmjCVd8GaCsQnhR5t5cgrtw33OAf0O22rUnMXsFtw7xMIuCNTgFiYclNbHzYbvnJAEcY3qE8RBbP8zF5Brx+Bl49SjfVR3dJ7CBkjgC9scZjSBAo/yc64d506W59LOjfvXEiDtGUH2gxZNwNiteZtI3frMYqLRjS563SwEFlG36B8g0hBOj6FVpU+YXeImYXw3XFqC6dCvcwn1dAf/vUZ4IDiDIVf5KvFcyDx0ZwZlMSzqlkLVpSDGqPU+7Mx15NW00Yk2+Zs2ZWFMK+g5WtSehhrAWR6El3d0MRlDXKgt9QbCRyh8b2jPV/vQZN2FOBOg9V9a6IszOy/W1J81q39cLOroBhQF4mDFYTAQ5QpBVUyauAfB49QzXsmSWy2uOTsbgo+oAc+OGJ6q9vXCzNqHxhUvtDT9HIq4w5ixw9wqtpSf6n+l2F2RFl5SzHIR7Dt0m9Eg2Ig5NqSGlymz46ZcxpRjd4wVXALD4M8usqy35jGTeEXsqSTO98n3jwKTj/7Xi6GOZuBlwW+SGAjXQ0vzlWD3AEv0Jnh+4AH5UqWwBeD1skw8gtbjM4dos=
   on:
+    branch: master
     tags: true
     python: 3.7
+  skip_existing: true
+  user: __token__
+  password:
+    secure: WcZf7AVMDzheXWUxNhZF/TUcyvyCdHZGyhHTakjBhUs8I8khSvlMPofaXTdN1Qn3WbHPK+IXeIPh/2NX0Le3Cdzp08Q/Tgrf9EZ4y02UrZxwSxtsUmjCVd8GaCsQnhR5t5cgrtw33OAf0O22rUnMXsFtw7xMIuCNTgFiYclNbHzYbvnJAEcY3qE8RBbP8zF5Brx+Bl49SjfVR3dJ7CBkjgC9scZjSBAo/yc64d506W59LOjfvXEiDtGUH2gxZNwNiteZtI3frMYqLRjS563SwEFlG36B8g0hBOj6FVpU+YXeImYXw3XFqC6dCvcwn1dAf/vUZ4IDiDIVf5KvFcyDx0ZwZlMSzqlkLVpSDGqPU+7Mx15NW00Yk2+Zs2ZWFMK+g5WtSehhrAWR6El3d0MRlDXKgt9QbCRyh8b2jPV/vQZN2FOBOg9V9a6IszOy/W1J81q39cLOroBhQF4mDFYTAQ5QpBVUyauAfB49QzXsmSWy2uOTsbgo+oAc+OGJ6q9vXCzNqHxhUvtDT9HIq4w5ixw9wqtpSf6n+l2F2RFl5SzHIR7Dt0m9Eg2Ig5NqSGlymz46ZcxpRjd4wVXALD4M8usqy35jGTeEXsqSTO98n3jwKTj/7Xi6GOZuBlwW+SGAjXQ0vzlWD3AEv0Jnh+4AH5UqWwBeD1skw8gtbjM4dos=

graphql_server/__init__.py

@@ -296,7 +296,9 @@ def execute_graphql_request(
 
     try:
         return document.execute(
-            operation_name=params.operation_name, variables=params.variables, **kwargs
+            operation_name=params.operation_name,
+            variable_values=params.variables,
+            **kwargs
         )
     except Exception as e:
         return ExecutionResult(errors=[e], invalid=True)

setup.cfg

@@ -6,7 +6,7 @@ max-line-length = 88
 known_first_party=graphql_server
 
 [tool:pytest]
-norecursedirs = venv .tox .cache
+norecursedirs = venv .venv .tox .git .cache  .mypy_cache .pytest_cache
 
 [bdist_wheel]
 universal=1

setup.py

@@ -1,10 +1,11 @@
 from setuptools import setup, find_packages
 
-required_packages = ["graphql-core>=2.1,<3", "promise"]
+required_packages = ["graphql-core>=2.3,<3", "promise>=2.3,<3"]
+tests_require = ["pytest==4.6.9", "pytest-cov==2.8.1"]
 
 setup(
     name="graphql-server-core",
-    version="1.1.3",
+    version="1.2.0",
     description="GraphQL Server tools for powering your server",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
@@ -20,8 +21,6 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
@@ -32,7 +31,8 @@
     keywords="api graphql protocol rest",
     packages=find_packages(exclude=["tests"]),
     install_requires=required_packages,
-    tests_require=["pytest>=3.0,<4"],
+    tests_require=tests_require,
+    extras_require={"test": tests_require},
     include_package_data=True,
     zip_safe=False,
     platforms="any",

tests/conftest.py

@@ -0,0 +1,4 @@
+import sys
+
+if sys.version_info[:2] < (3, 4):
+    collect_ignore_glob = ["*_asyncio.py"]

tests/test_asyncio.py

@@ -1,8 +1,6 @@
-# flake8: noqa
+import asyncio
 
-import pytest
-
-asyncio = pytest.importorskip("asyncio")
+from promise import Promise
 
 from graphql.execution.executors.asyncio import AsyncioExecutor
 from graphql.type.definition import (
@@ -13,7 +11,6 @@
 from graphql.type.scalars import GraphQLString
 from graphql.type.schema import GraphQLSchema
 from graphql_server import RequestParams, run_http_query
-from promise import Promise
 
 from .utils import as_dicts
 
@@ -22,19 +19,17 @@ def resolve_error_sync(_obj, _info):
     raise ValueError("error sync")
 
 
-@asyncio.coroutine
-def resolve_error_async(_obj, _info):
-    yield from asyncio.sleep(0.001)
+async def resolve_error_async(_obj, _info):
+    await asyncio.sleep(0.001)
     raise ValueError("error async")
 
 
 def resolve_field_sync(_obj, _info):
     return "sync"
 
 
-@asyncio.coroutine
-def resolve_field_async(_obj, info):
-    yield from asyncio.sleep(0.001)
+async def resolve_field_async(_obj, info):
+    await asyncio.sleep(0.001)
     return "async"
 
 
@@ -53,7 +48,7 @@ def resolve_field_async(_obj, info):
 schema = GraphQLSchema(QueryRootType)
 
 
-def test_get_reponses_using_asyncioexecutor():
+def test_get_responses_using_asyncio_executor():
     class TestExecutor(AsyncioExecutor):
         called = False
         waited = False
@@ -75,8 +70,7 @@ def execute(self, fn, *args, **kwargs):
 
     loop = asyncio.get_event_loop()
 
-    @asyncio.coroutine
-    def get_results():
+    async def get_results():
         result_promises, params = run_http_query(
             schema,
             "get",
@@ -85,7 +79,7 @@ def get_results():
             executor=TestExecutor(loop=loop),
             return_promise=True,
         )
-        results = yield from Promise.all(result_promises)
+        results = await Promise.all(result_promises)
         return results, params
 
     results, params = loop.run_until_complete(get_results())

tox.ini

@@ -1,41 +1,38 @@
 [tox]
-envlist = black,flake8,mypy,py38,py37,py36,py35,py34,py33,py27,pypy3,pypy
+envlist = black,flake8,mypy,py{38,37,36,35,py27,py3,py}
 skipsdist = true
 
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}
 deps =
-    pytest>=3.0,<4
-    graphql-core>=2.1,<3
-    pytest-cov>=2.7
+    .[test]
 commands =
-    py{py,27}: py.test tests {posargs} --ignore=tests/test_asyncio.py
-    py{py3,33,34,35,36,37,38}: py.test tests {posargs}
+    pytest tests {posargs}
 
 [testenv:black]
 basepython=python3.7
-deps = black
+deps = black==19.10b0
 commands =
     black --check graphql_server tests
 
 [testenv:flake8]
 basepython=python3.7
-deps = flake8
+deps = flake8==3.7.9
 commands =
-    flake8 graphql_server tests
+    flake8 setup.py graphql_server tests
 
 [testenv:isort]
 basepython=python3.7
 deps =
     isort
-    graphql-core>=2.1,<3
+    graphql-core>=2.3,<3
 commands =
     isort -rc graphql_server/ tests/
 
 [testenv:mypy]
 basepython=python3.7
-deps = mypy
+deps = mypy==0.761
 commands =
     mypy graphql_server tests --ignore-missing-imports