From 013c9e5077481eeb7d6c5d41bf5e78081fd7e047 Mon Sep 17 00:00:00 2001
From: Daniel Gallagher <daniellg@yelp.com>
Date: Thu, 24 May 2018 23:33:32 -0700
Subject: [PATCH 1/8] Update .travis.yml file to use tox as script for running
 tests

---
 .travis.yml | 75 ++++++++++++-----------------------------------------
 1 file changed, 17 insertions(+), 58 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1357c91..b24ba5c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,64 +1,23 @@
 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
+python: 3.6
+env:  # These should match the tox env list.
+    - TOXENV=flake8
+    - TOXENV=py27
+    - TOXENV=py33
+    - TOXENV=py34
+    - TOXENV=py35
+    - TOXENV=py36
+    - TOXENV=pypy
+    - TOXENV=pre-commit
   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: TEST_TYPE=lint
-  - python: '3.6'
-    env: TEST_TYPE=mypy
+install: pip install coveralls tox flake8 mypy
+script: tox
+after_success: coveralls
+cache:
+    directories:
+        - $HOME/.cache/pip
+        - $HOME/.cache/pre-commit
 deploy:
   provider: pypi
   user: syrusakbary

From dbb72ba06b53a8a840204cc085310d5a1c3da639 Mon Sep 17 00:00:00 2001
From: Daniel Gallagher <daniellg@yelp.com>
Date: Fri, 8 Jun 2018 21:54:24 -0700
Subject: [PATCH 2/8] Update to match graphql-core

---
 .travis.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b24ba5c4..e6e01192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,24 @@
 language: python
-python: 3.6
-env:  # These should match the tox env list.
-    - TOXENV=flake8
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py34
-    - TOXENV=py35
-    - TOXENV=py36
-    - TOXENV=pypy
-    - TOXENV=pre-commit
-  global:
-    secure: SQC0eCWCWw8bZxbLE8vQn+UjJOp3Z1m779s9SMK3lCLwJxro/VCLBZ7hj4xsrq1MtcFO2U2Kqf068symw4Hr/0amYI3HFTCFiwXAC3PAKXeURca03eNO2heku+FtnQcOjBanExTsIBQRLDXMOaUkf3MIztpLJ4LHqMfUupKmw9YSB0v40jDbSN8khBnndFykmOnVVHznFp8USoN5F0CiPpnfEvHnJkaX76lNf7Kc9XNShBTTtJsnsHMhuYQeInt0vg9HSjoIYC38Tv2hmMj1myNdzyrHF+LgRjI6ceGi50ApAnGepXC/DNRhXROfECKez+LON/ZSqBGdJhUILqC8A4WmWmIjNcwitVFp3JGBqO7LULS0BI96EtSLe8rD1rkkdTbjivajkbykM1Q0Tnmg1adzGwLxRUbTq9tJQlTTkHBCuXIkpKb1mAtb/TY7A6BqfnPi2xTc/++qEawUG7ePhscdTj0IBrUfZsUNUYZqD8E8XbSWKIuS3SHE+cZ+s/kdAsm4q+FFAlpZKOYGxIkwvgyfu4/Plfol4b7X6iAP9J3r1Kv0DgBVFst5CXEwzZs19/g0CgokQbCXf1N+xeNnUELl6/fImaR3RKP22EaABoil4z8vzl4EqxqVoH1nfhE+WlpryXsuSaF/1R+WklR7aQ1FwoCk8V8HxM2zrj4tI8k=
-install: pip install coveralls tox flake8 mypy
+matrix:
+  include:
+    -  env: TOXENV=py27
+    -  env: TOXENV=py34
+       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
+install: pip install coveralls tox mypy
 script: tox
 after_success: coveralls
 cache:
-    directories:
-        - $HOME/.cache/pip
-        - $HOME/.cache/pre-commit
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.cache/pre-commit
 deploy:
   provider: pypi
   user: syrusakbary

From 1d49df033cd02133fd9d0783ba5501aea91b6b19 Mon Sep 17 00:00:00 2001
From: Daniel Gallagher <daniellg@yelp.com>
Date: Fri, 8 Jun 2018 21:56:08 -0700
Subject: [PATCH 3/8] Explicitly run on py27

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e6e01192..519cdb7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 matrix:
   include:
     -  env: TOXENV=py27
+       python: 2.7
     -  env: TOXENV=py34
        python: 3.4
     -  env: TOXENV=py35

From 87cf3d4b80a4ac134343a21cbf23f5402e1aabc6 Mon Sep 17 00:00:00 2001
From: Daniel Gallagher <daniellg@yelp.com>
Date: Fri, 8 Jun 2018 22:00:01 -0700
Subject: [PATCH 4/8] Try installing mypy only when python version is 3.6

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 519cdb7c..3fd433b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,9 @@ matrix:
        python: pypy-5.7.1
     -  env: TOXENV=pre-commit
        python: 3.6
-install: pip install coveralls tox mypy
+install:
+  - pip install coveralls tox mypy
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then pip install mypy; fi
 script: tox
 after_success: coveralls
 cache:

From 0f3d786402c04719d3c14f864c5084cbc40c0776 Mon Sep 17 00:00:00 2001
From: Daniel Gallagher <daniellg@yelp.com>
Date: Fri, 8 Jun 2018 22:08:58 -0700
Subject: [PATCH 5/8] Run pre-commit on all files

---
 .travis.yml  | 2 +-
 docs/conf.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3fd433b6..d0eb834b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ matrix:
     -  env: TOXENV=pre-commit
        python: 3.6
 install:
-  - pip install coveralls tox mypy
+  - pip install coveralls tox
   - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then pip install mypy; fi
 script: tox
 after_success: coveralls
diff --git a/docs/conf.py b/docs/conf.py
index ccb5305d..b25a36dc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,5 @@
 import os
+
 import sphinx_graphene_theme
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'

From b5542d4426e3cf8132e4bf61e9591a19e061a561 Mon Sep 17 00:00:00 2001
From: Daniel Gallagher <daniellg@yelp.com>
Date: Fri, 8 Jun 2018 22:13:45 -0700
Subject: [PATCH 6/8] Run pre-commit autoupdate

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 085f7fa9..195d9a0d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v1.2.3
+    rev: v1.3.0
     hooks:
     -   id: autopep8-wrapper
         args:
@@ -17,7 +17,7 @@ repos:
         args:
         - --autofix
 -   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

From c8fba61a05b5309f432fcd3b2582419c8ea3004b Mon Sep 17 00:00:00 2001
From: Daniel Gallagher <daniellg@yelp.com>
Date: Fri, 8 Jun 2018 22:19:26 -0700
Subject: [PATCH 7/8] Exclude README.md from trailing-whitespace hook

---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 195d9a0d..0cbcc645 100644
--- a/.pre-commit-config.yaml
+++ b/.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

From 400a98de921cf1c8f43f66dd1b8387a9f74f9b4a Mon Sep 17 00:00:00 2001
From: Daniel Gallagher <daniellg@yelp.com>
Date: Mon, 11 Jun 2018 09:12:27 -0700
Subject: [PATCH 8/8] Add tox env for running mypy and add that to .travis.yml

---
 .travis.yml | 3 ++-
 tox.ini     | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d0eb834b..399ce134 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,10 @@ matrix:
        python: pypy-5.7.1
     -  env: TOXENV=pre-commit
        python: 3.6
+    -  env: TOXENV=mypy
+       python: 3.6
 install:
   - pip install coveralls tox
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then pip install mypy; fi
 script: tox
 after_success: coveralls
 cache:
diff --git a/tox.ini b/tox.ini
index cf538bb7..8166a5b6 100644
--- a/tox.ini
+++ b/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 =