1 files changed, 63 insertions, 45 deletions
diff --git a/.travis.yml b/.travis.yml
index 3555766..f0272ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+dist: xenial
+group: travis_latest
 sudo: false
 cache:
   directories:
@@ -7,72 +9,84 @@ language: python
 
 
 matrix:
+  fast_finish: true
+
   include:
+    # lint
+    - python: "3.7"
+      stage: lint
+      env: TOXENV=lint
+    - python: "3.7"
+      env: TOXENV=manifest
+
+    # test
     - python: "2.7"
-      env: TOXENV=py27-pyopenssl015-idna
-    - python: "2.7"
-      env: TOXENV=py27-pyopenssl015-noidna
+      stage: test
+      env: TOXENV=py27
+    - python: "3.7"
+      env: TOXENV=py37
     - python: "2.7"
       env: TOXENV=py27-pyopenssl014-idna
     - python: "2.7"
-      env: TOXENV=py27-pyopenssl014-noidna
-    - python: "3.4"
-      env: TOXENV=py34-pyopenssl015-idna
-    - python: "3.4"
-      env: TOXENV=py34-pyopenssl015-noidna
+      env: TOXENV=py27-pyopensslLatest-idna
+    - python: "2.7"
+      env: TOXENV=py27-pyopensslLatest-noidna
     - python: "3.4"
       env: TOXENV=py34-pyopenssl014-idna
     - python: "3.4"
-      env: TOXENV=py34-pyopenssl014-noidna
-    - python: "3.5"
-      env: TOXENV=py35-pyopenssl015-idna
-    - python: "3.5"
-      env: TOXENV=py35-pyopenssl015-noidna
+      env: TOXENV=py34-pyopensslLatest-idna
     - python: "3.5"
       env: TOXENV=py35-pyopenssl014-idna
     - python: "3.5"
-      env: TOXENV=py35-pyopenssl014-noidna
-    - python: "pypy"
-      env: TOXENV=pypy-pyopenssl015-idna
+      env: TOXENV=py35-pyopensslLatest-idna
+    - python: "3.6"
+      env: TOXENV=py36-pyopenssl014-idna
+    - python: "3.6"
+      env: TOXENV=py36-pyopensslLatest-idna
+    - python: "3.6"
+      env: TOXENV=py36-pyopensslLatest-noidna
+    - python: "3.7"
+      env: TOXENV=py37-pyopenssl014-idna
+    - python: "3.7"
+      env: TOXENV=py37-pyopensslLatest-idna
+    - python: "3.7"
+      env: TOXENV=py37-pyopensslLatest-noidna
     - python: "pypy"
-      env: TOXENV=pypy-pyopenssl015-noidna
+      dist: trusty
+      env: TOXENV=pypy
+    - python: "pypy3"
+      dist: trusty
+      env: TOXENV=pypy3
     - python: "pypy"
-      env: TOXENV=pypy-pyopenssl014-idna
-    - python: "pypy"
-      env: TOXENV=pypy-pyopenssl014-noidna
+      dist: trusty
+      env: TOXENV=pypy-pyopensslLatest-idna
+    - python: "pypy3"
+      dist: trusty
+      env: TOXENV=pypy3-pyopensslLatest-idna
 
-    # Meta
-    - python: "3.5"
-      env: TOXENV=flake8
-    - python: "3.5"
-      env: TOXENV=manifest
-    - python: "3.5"
+    # Prevent breakage by a new releases
+    - python: "3.6-dev"
+      env: TOXENV=py36-pyopensslLatest-idna
+    - python: "3.7-dev"
+      env: TOXENV=py37-pyopensslLatest-idna
+
+    # Docs
+    - python: "3.7"
+      stage: docs
       env: TOXENV=docs
-    - python: "3.5"
-      env: TOXENV=readme
+    - python: "3.7"
+      env: TOXENV=pypi-description
+
+  allow_failures:
+    - python: "3.6-dev"
+    - python: "3.7-dev"
 
 
 install:
-  - |
-    if [[ "${TOXENV}" = pypy* ]]; then
-        git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv
-        PYENV_ROOT="$HOME/.pyenv"
-        PATH="$PYENV_ROOT/bin:$PATH"
-        eval "$(pyenv init -)"
-        pyenv install pypy-4.0.1
-        pyenv global pypy-4.0.1
-    fi
-  - pip install tox
+  - pip install -U tox
 
 
 script:
-  - |
-    # activate the pypy env we installed via our custom pyenv in the install stage
-    if [[ "${TOXENV}" == "pypy" ]]; then
-        PYENV_ROOT="$HOME/.pyenv"
-        PATH="$PYENV_ROOT/bin:$PATH"
-        eval "$(pyenv init -)"
-    fi
   - tox
 
 
@@ -83,3 +97,7 @@ before_install:
 after_success:
   - tox -e coverage-report
   - codecov
+
+
+notifications:
+  email: false