Merge pull request #737 from dan98765/pre_commit_runs_as_part_of_continuous_integration

Update .travis.yml file to use tox as script for running tests

.pre-commit-config.yaml

@@ -13,6 +13,7 @@ repos:
     -   id: end-of-file-fixer
         exclude: ^docs/.*$
     -   id: trailing-whitespace
+        exclude: README.md
     -   id: pretty-format-json
         args:
         - --autofix
@@ -22,7 +23,7 @@ repos:
     hooks:
     -   id: pyupgrade
 -   repo: https://github.com/asottile/seed-isort-config
-    rev: v1.0.0
+    rev: v1.0.1
     hooks:
     -   id: seed-isort-config
 -   repo: https://github.com/pre-commit/mirrors-isort

.travis.yml

@@ -1,64 +1,28 @@
 language: python
-sudo: false
-python:
-- 2.7
-- 3.5
-- 3.6
-# - "pypy-5.3.1"
-before_install:
-- |
-  if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
-    export PYENV_ROOT="$HOME/.pyenv"
-    if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
-      cd "$PYENV_ROOT" && git pull
-    else
-      rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
-    fi
-    export PYPY_VERSION="4.0.1"
-    "$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
-    virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
-    source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
-  fi
-install:
-- |
-  if [ "$TEST_TYPE" = build ]; then
-    pip install -e .[test]
-    python setup.py develop
-  elif [ "$TEST_TYPE" = lint ]; then
-    pip install flake8
-  elif [ "$TEST_TYPE" = mypy ]; then
-    pip install mypy
-  fi
-script:
-- |
-  if [ "$TEST_TYPE" = lint ]; then
-    echo "Checking Python code lint."
-    flake8 graphene
-    exit
-  elif [ "$TEST_TYPE" = mypy ]; then
-    echo "Checking Python types."
-    mypy graphene
-    exit
-  elif [ "$TEST_TYPE" = build ]; then
-    py.test --cov=graphene graphene examples
-  fi
-after_success:
-- |
-  if [ "$TEST_TYPE" = build ]; then
-      coveralls
-  fi
-env:
-  matrix:
-  - TEST_TYPE=build
-  global:
-    secure: SQC0eCWCWw8bZxbLE8vQn+UjJOp3Z1m779s9SMK3lCLwJxro/VCLBZ7hj4xsrq1MtcFO2U2Kqf068symw4Hr/0amYI3HFTCFiwXAC3PAKXeURca03eNO2heku+FtnQcOjBanExTsIBQRLDXMOaUkf3MIztpLJ4LHqMfUupKmw9YSB0v40jDbSN8khBnndFykmOnVVHznFp8USoN5F0CiPpnfEvHnJkaX76lNf7Kc9XNShBTTtJsnsHMhuYQeInt0vg9HSjoIYC38Tv2hmMj1myNdzyrHF+LgRjI6ceGi50ApAnGepXC/DNRhXROfECKez+LON/ZSqBGdJhUILqC8A4WmWmIjNcwitVFp3JGBqO7LULS0BI96EtSLe8rD1rkkdTbjivajkbykM1Q0Tnmg1adzGwLxRUbTq9tJQlTTkHBCuXIkpKb1mAtb/TY7A6BqfnPi2xTc/++qEawUG7ePhscdTj0IBrUfZsUNUYZqD8E8XbSWKIuS3SHE+cZ+s/kdAsm4q+FFAlpZKOYGxIkwvgyfu4/Plfol4b7X6iAP9J3r1Kv0DgBVFst5CXEwzZs19/g0CgokQbCXf1N+xeNnUELl6/fImaR3RKP22EaABoil4z8vzl4EqxqVoH1nfhE+WlpryXsuSaF/1R+WklR7aQ1FwoCk8V8HxM2zrj4tI8k=
 matrix:
-  fast_finish: true
   include:
-  - python: '2.7'
+    -  env: TOXENV=py27
-    env: TEST_TYPE=lint
+       python: 2.7
-  - python: '3.6'
+    -  env: TOXENV=py34
-    env: TEST_TYPE=mypy
+       python: 3.4
+    -  env: TOXENV=py35
+       python: 3.5
+    -  env: TOXENV=py36
+       python: 3.6
+    -  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
+    - $HOME/.cache/pre-commit
 deploy:
   provider: pypi
   user: syrusakbary

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,py27,py33,py34,py35,py36,pre-commit,pypy
+envlist = flake8,py27,py33,py34,py35,py36,pre-commit,pypy,mypy
 skipsdist = true
 
 [testenv]
@@ -18,6 +18,13 @@ setenv =
 commands =
     pre-commit {posargs:run --all-files}
 
+[testenv:mypy]
+basepython=python3.6
+deps =
+    mypy
+commands =
+    mypy graphene
+
 [testenv:flake8]
 deps = flake8
 commands =