ref: Simplify travis setup (#1303)

* ref: Simplify travis setup

* ref: Remove python 3.8 again

* ref: Use Python 3.6 for linting (no sudo!)

* ref: Only run flake8 in CI

3 files changed, 48 insertions, 137 deletions

diff --git a/.travis.yml b/.travis.yml
index f9a2c14..ebcca66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,23 @@
 language: python
+python:
+  - "2.7"
+  - "pypy"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
+matrix:
+  include:
+    - python: "3.7"
+      dist: xenial
+      sudo: true
+
+    - name: Flake8
+      python: "3.6"
+      install:
+        - pip install tox
+      script: tox -e flake8
+
 sudo: false
 addons:
   apt:
@@ -17,123 +36,7 @@ jobs:
 #    - python: 3.5
 #      env: TOXENV=py35-django-dev-fix
 
-  include:
-    - stage: core
-      python: 2.7
-      env: TOXENV=py27
-    - stage: core
-      python: 3.4
-      env: TOXENV=py34
-    - stage: core
-      python: 3.5
-      env: TOXENV=py35
-    - stage: core
-      python: 3.6
-      env: TOXENV=py36
-    - stage: core
-      python: pypy
-      env: TOXENV=pypy
-    - stage: core
-      python: 3.5
-      env: TOXENV=flake8
-
-
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-django-16
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-django-17
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-django-18
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-django-19
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-django-110
-
-    - stage: contrib
-      python: 3.4
-      env: TOXENV=py34-django-17
-    - stage: contrib
-      python: 3.4
-      env: TOXENV=py34-django-18
-    - stage: contrib
-      python: 3.4
-      env: TOXENV=py34-django-19
-    - stage: contrib
-      python: 3.4
-      env: TOXENV=py34-django-110
-
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-django-18
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-django-19
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-django-110
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-django-111
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-django-200
-#    - stage: contrib
-#      python: 3.5
-#      env: TOXENV=py35-django-dev-fix
-
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-flask-10
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-flask-11
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-flask-10
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-flask-11
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-flask-12
-
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-celery-3
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-celery-4
-
-    - stage: contrib
-      python: 2.7
-      env: TOXENV=py27-lambda
-
-    - stage: contrib
-      python: 3.6
-      env: TOXENV=py36-lambda
-
-    - stage: contrib
-      python: 3.5
-      env: TOXENV=py35-sanic-07
-
-    - stage: contrib
-      python: 3.6
-      env: TOXENV=py36-sanic-07
-
-      #- stage: deploy
-      # script: ./setup.py sdist --formats=gztar bdist_wheel
-      #if: branch = master
-      #python: 2.7
-      #after_success:
-      #  - npm install -g @zeus-ci/cli
-      #  - zeus upload -t "application/zip+wheel" dist/*
-
-script: tox
+script: sh ci/runtox.sh
 install:
   - make
   - pip install codecov
diff --git a/ci/runtox.sh b/ci/runtox.sh
new file mode 100644
index 0000000..a8368f8
--- /dev/null
+++ b/ci/runtox.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [ -z "$1" ]; then
+    searchstring="$(echo py$TRAVIS_PYTHON_VERSION | tr -d . | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
+else
+    searchstring="$1"
+fi
+
+exec tox -e $(tox -l | grep $searchstring | tr '\n' ',')
diff --git a/tox.ini b/tox.ini
index 3d66daa..6bcee83 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,24 +6,23 @@
 [tox]
 envlist =
     # core
-    py{27,34,35,36}
+    py{27,34,35,36,37}
     pypy
     flake8
     # contrib
-    {py35,py36}-django-dev
-    {py35,py36}-django-{200}
+    {py35,py36,py37}-django-dev
+    {py35,py36,py37}-django-{200}
     {py27,py35}-django-111
-    {py27,py34,py35}-django-{18,19,110}
-    {py27,py34,py35}-django-18
+    {py27,py34,py35,py36}-django-{18,19,110}
+    {py27,py34,py35,py36}-django-18
     {py27,py34}-django-17
     py27-django-16
-    {py27,py35}-flask-{10,11}
-    py35-flask-12
-    py35-flask-dev
+    {py27,py35,py36,py37}-flask-{10,11}
+    py37-flask-12
+    py37-flask-dev
     py27-celery-{3,4}
-    py{27,36}-lambda
-    py{35,36}-sanic-07
-
+    py{27,37}-lambda
+    py{35,36,37}-sanic-07
 
 [testenv]
 deps =
@@ -66,6 +65,7 @@ basepython =
     py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
     pypy: pypy
 
 commands =
@@ -80,7 +80,7 @@ commands:
 
 
 [testenv:flake8]
-basepython = python3.5
+basepython = python3.6
 skip_install = true
 deps =
     flake8
@@ -90,7 +90,7 @@ commands =
     flake8 raven/ setup.py
 
 [testenv:pylint]
-basepython = python3.5
+basepython = python3.6
 skip_install = true
 deps =
     pyflakes
@@ -100,7 +100,7 @@ commands =
 
 
 [testenv:bandit]
-basepython = python3.5
+basepython = python3.6
 skip_install = true
 deps =
     bandit
@@ -108,7 +108,7 @@ commands =
     bandit -r raven/ -c .bandit.yml
 
 [testenv:linters]
-basepython = python3.5
+basepython = python3.6
 skip_install = true
 deps =
     {[testenv:flake8]deps}
@@ -122,7 +122,7 @@ commands =
     {[testenv:bandit]commands}
 
 [testenv:readme]
-basepython = python3.5
+basepython = python3.6
 deps =
     readme_renderer
 commands =
@@ -130,7 +130,7 @@ commands =
 
 # Release tooling
 [testenv:build]
-basepython = python3.5
+basepython = python3.6
 skip_install = true
 deps =
     wheel
@@ -139,7 +139,7 @@ commands =
     python setup.py -q sdist bdist_wheel
 
 [testenv:release]
-basepython = python3.5
+basepython = python3.6
 skip_install = true
 deps =
     bumpversion
@@ -147,7 +147,7 @@ commands =
     bumpversion --tag --commit {posargs} release
 
 [testenv:minor]
-basepython = python3.5
+basepython = python3.6
 skip_install = true
 deps =
     bumpversion
@@ -155,7 +155,7 @@ commands =
     bumpversion --commit {posargs} minor
 
 [testenv:dev]
-basepython = python3.5
+basepython = python3.6
 skip_install = true
 deps =
     bumpversion