From 63740697f68e76f420b4a7d55e796a0e75df0f8b Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Mon, 10 Jun 2019 10:24:17 -0700
Subject: [PATCH] Update travis and tox

---
 .travis.yml | 79 +++++++++++++++++++++++++++--------------------------
 tox.ini     | 30 ++++++++++----------
 2 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5c4725f..2a3968c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,58 +1,59 @@
 language: python
-sudo: required
-dist: xenial
-
-python:
-  - 2.7
-  - 3.4
-  - 3.5
-  - 3.6
-  - 3.7
-
-env:
-  matrix:
-    - DJANGO=1.11
-    - DJANGO=2.1
-    - DJANGO=2.2
-    - DJANGO=master
+cache: pip
 
 install:
-  - TOX_ENV=py${TRAVIS_PYTHON_VERSION}-django${DJANGO}
-  - pip install tox
-  - tox -e $TOX_ENV --notest
-script:
-  - tox -e $TOX_ENV
+  - pip install tox tox-travis coveralls
 
-after_success:
-  - tox -e $TOX_ENV -- pip install coveralls 
-  - tox -e $TOX_ENV -- coveralls $COVERALLS_OPTION
+script: 
+  - tox
+
+after_success: 
+  - pip install coveralls
+  - coveralls
 
 matrix:
   fast_finish: true
   include:
-  - python: 3.5
-    script: tox -e lint
-  exclude:
     - python: 2.7
+      env: DJANGO=1.11
+
+    - python: 3.5
+      env: DJANGO=1.11
+    - python: 3.5
+      env: DJANGO=2.0
+    - python: 3.5
       env: DJANGO=2.1
-    - python: 2.7
+    - python: 3.5
       env: DJANGO=2.2
-    - python: 2.7
-      env: DJANGO=master
-    - python: 3.4
-      env: DJANGO=2.1
-    - python: 3.4
-      env: DJANGO=2.2
-    - python: 3.4
-      env: DJANGO=master
     - python: 3.5
       env: DJANGO=master
-    - python: 3.7
-      env: DJANGO=1.10
+
+    - python: 3.6
+      env: DJANGO=1.11
+    - python: 3.6
+      env: DJANGO=2.0
+    - python: 3.6
+      env: DJANGO=2.1
+    - python: 3.6
+      env: DJANGO=2.2
+    - python: 3.6
+      env: DJANGO=master
+
     - python: 3.7
       env: DJANGO=1.11
-  allow_failures:
     - python: 3.7
+      env: DJANGO=2.0
+    - python: 3.7
+      env: DJANGO=2.1
+    - python: 3.7
+      env: DJANGO=2.2
+    - python: 3.7
+      env: DJANGO=master
+
+    - python: 3.7
+      env: TOXENV=lint
+
+  allow_failures:
     - env: DJANGO=master
 
 deploy:
diff --git a/tox.ini b/tox.ini
index 8e21c74..868a94e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,28 @@
 [tox]
-envlist = py{2.7,3.4,3.5,3.6,3.7,pypy,pypy3}-django{1.10,1.11,2.0,2.1,2.2,master},lint
+envlist =
+        py{27,35,36,37}-django{111,20,21,22,master},
+        lint
+
+[travis:env]
+DJANGO =
+    1.11: django111
+    2.0: django20
+    2.1: django21
+    2.2: django22
+    master: djangomaster
 
 [testenv]
 passenv = *
 usedevelop = True
-setenv = 
+setenv =
     DJANGO_SETTINGS_MODULE=django_test_settings
-basepython =
-    py2.7: python2.7
-    py3.4: python3.4
-    py3.5: python3.5
-    py3.6: python3.6
-    py3.7: python3.7
-    pypypy: pypy
-    pypypy3: pypy3
 deps =
     -e.[test]
     psycopg2
-    django1.10: Django>=1.10,<1.11
-    django1.11: Django>=1.11,<1.12
-    django2.0: Django>=2.0
-    django2.1: Django>=2.1
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<3.0
     djangomaster: https://github.com/django/django/archive/master.zip
 commands = {posargs:py.test --cov=graphene_django graphene_django examples}