Update Tox, Add MyPy, .pre-commit configurations

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+omit = */tests/*

.editorconfig

@@ -0,0 +1,13 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{py,rst,ini}]
+indent_style = space
+indent_size = 4

.isort.cfg

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

.pre-commit-config.yaml

@@ -0,0 +1,29 @@
+repos:
+-   repo: git://github.com/pre-commit/pre-commit-hooks
+    rev: v2.1.0
+    hooks:
+    -   id: check-merge-conflict
+    -   id: check-json
+    -   id: check-yaml
+    -   id: debug-statements
+    -   id: end-of-file-fixer
+        exclude: ^docs/.*$
+    -   id: pretty-format-json
+        args:
+        - --autofix
+    -   id: trailing-whitespace
+        exclude: README.md
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v1.12.0
+    hooks:
+    -   id: pyupgrade
+-   repo: https://github.com/ambv/black
+    rev: 18.9b0
+    hooks:
+    - id: black
+      language_version: python3
+-   repo: https://github.com/PyCQA/flake8
+    rev: 3.7.7
+    hooks:
+    -   id: flake8
+        exclude: tests/schema.py

.travis.yml

@@ -1,27 +1,32 @@
 language: python
-sudo: false
 matrix:
   include:
-  - python: pypy
-    env: TOX_ENV=pypy
-  - python: '2.7'
-    env: TOX_ENV=py27
-  - python: '3.4'
-    env: TOX_ENV=py34
-  - python: '3.5'
-    env: TOX_ENV=py35
-  - python: '3.6'
-    env: TOX_ENV=py36,import-order,flake8,mypy
+    - env: TOXENV=py27
+      python: 2.7
+    - env: TOXENV=py34
+      python: 3.4
+    - 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
+      python: 3.6
+install:
+  - pip install coveralls tox
+script: tox
+after_success: coveralls
 cache:
   directories:
-  - $HOME/.cache/pip
-  - $TRAVIS_BUILD_DIR/.tox
-install:
-- pip install tox coveralls
-script:
-- tox -e $TOX_ENV -- --cov=graphql_server
-after_success:
-- coveralls
+    - $HOME/.cache/pip
+    - $HOME/.cache/pre-commit
 deploy:
   provider: pypi
   user: syrusakbary

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

mypy.ini

@@ -0,0 +1,5 @@
+[mypy]
+ignore_missing_imports = True
+
+[mypy-tests.*]
+ignore_errors = True

setup.cfg

@@ -5,8 +5,8 @@ max-line-length = 160
 [isort]
 known_first_party=graphql_server
 
-[pytest]
-norecursedirs = venv .tox .cache
+[coverage:run]
+omit = */tests/*
 
 [bdist_wheel]
 universal=1

setup.py

@@ -1,6 +1,19 @@
 from setuptools import setup, find_packages
 
 required_packages = ["graphql-core>=2.1", "promise"]
+tests_require = [
+    "pytest",
+    "pytest-benchmark",
+    "pytest-cov",
+    "pytest-mock",
+    "snapshottest",
+    "coveralls",
+    "promise",
+    "six",
+    "mock",
+    "pytz",
+    "iso8601",
+]
 
 setup(
     name="graphql-server-core",
@@ -22,13 +35,14 @@
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: Implementation :: PyPy",
         "License :: OSI Approved :: MIT License",
     ],
-    keywords="api graphql protocol rest",
+    keywords="api graphql protocol rest python graphene",
     packages=find_packages(exclude=["tests"]),
     install_requires=required_packages,
-    tests_require=["pytest>=2.7.3"],
+    tests_require=tests_require,
     include_package_data=True,
     zip_safe=False,
     platforms="any",

tests/schema.py

@@ -1,4 +1,9 @@
-from graphql.type.definition import GraphQLArgument, GraphQLField, GraphQLNonNull, GraphQLObjectType
+from graphql.type.definition import (
+    GraphQLArgument,
+    GraphQLField,
+    GraphQLNonNull,
+    GraphQLObjectType,
+)
 from graphql.type.scalars import GraphQLString
 from graphql.type.schema import GraphQLSchema
 
@@ -8,31 +13,29 @@ def resolve_raises(*_):
 
 
 QueryRootType = GraphQLObjectType(
-    name='QueryRoot',
+    name="QueryRoot",
     fields={
-        'thrower': GraphQLField(GraphQLNonNull(GraphQLString), resolver=resolve_raises),
-        'request': GraphQLField(GraphQLNonNull(GraphQLString),
-                                resolver=lambda obj, info: context.args.get('q')),
-        'context': GraphQLField(GraphQLNonNull(GraphQLString),
-                                resolver=lambda obj, info: context),
-        'test': GraphQLField(
+        "thrower": GraphQLField(GraphQLNonNull(GraphQLString), resolver=resolve_raises),
+        "request": GraphQLField(
+            GraphQLNonNull(GraphQLString),
+            resolver=lambda obj, info: context.args.get("q"),
+        ),  # noqa: F821
+        "context": GraphQLField(
+            GraphQLNonNull(GraphQLString), resolver=lambda obj, info: context
+        ),  # noqa
+        "test": GraphQLField(
             type=GraphQLString,
-            args={
-                'who': GraphQLArgument(GraphQLString)
-            },
-            resolver=lambda obj, info, who='World': 'Hello %s' % who
-        )
-    }
+            args={"who": GraphQLArgument(GraphQLString)},
+            resolver=lambda obj, info, who="World": "Hello %s" % who,
+        ),
+    },
 )
 
 MutationRootType = GraphQLObjectType(
-    name='MutationRoot',
+    name="MutationRoot",
     fields={
-        'writeTest': GraphQLField(
-            type=QueryRootType,
-            resolver=lambda *_: QueryRootType
-        )
-    }
+        "writeTest": GraphQLField(type=QueryRootType, resolver=lambda *_: QueryRootType)
+    },
 )
 
 schema = GraphQLSchema(QueryRootType, MutationRootType)