From 29ea3a5b48ef86623093a6ceb90d86cf1c323eae Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Fri, 9 Nov 2018 12:21:27 -0200
Subject: [PATCH 1/4] Use xenial build image on Travis [skip appveyor]

Now we can use Python 3.7 without sudo

https://blog.travis-ci.com/2018-11-08-xenial-release
---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00abca0b2f0..4f0dbb1640b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 sudo: false
 language: python
+dist: xenial
 stages:
 - baseline
 - name: test
@@ -33,8 +34,6 @@ jobs:
       python: '3.6'
     - env: TOXENV=py37
       python: '3.7'
-      sudo: required
-      dist: xenial
     - &test-macos
       language: generic
       os: osx
@@ -53,8 +52,11 @@ jobs:
 
     - stage: baseline
       env: TOXENV=py27
+      python: '2.7'
     - env: TOXENV=py34
+      python: '3.4'
     - env: TOXENV=py36
+      python: '3.6'
     - env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1
 
     - stage: deploy

From cd77881c036a2b0307cba797628ee46169f1e2e7 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 10 Nov 2018 11:44:00 -0200
Subject: [PATCH 2/4] COMMENT OTHER ENVIRONMENTS FOR TESTING, DO NOT MERGE

---
 .travis.yml | 82 ++++++++++++++++++++++++++---------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4f0dbb1640b..82cc0d4d077 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,53 +11,53 @@ python:
   - '3.6'
 install:
   - pip install --upgrade --pre tox
-env:
-  matrix:
-    # Specialized factors for py27.
-    - TOXENV=py27-pexpect,py27-trial,py27-numpy
-    - TOXENV=py27-nobyte
-    - TOXENV=py27-xdist
-    - TOXENV=py27-pluggymaster PYTEST_NO_COVERAGE=1
-    # Specialized factors for py36.
-    - TOXENV=py36-pexpect,py36-trial,py36-numpy
-    - TOXENV=py36-xdist
-    - TOXENV=py36-pluggymaster PYTEST_NO_COVERAGE=1
+#env:
+#  matrix:
+#    # Specialized factors for py27.
+#    - TOXENV=py27-pexpect,py27-trial,py27-numpy
+#    - TOXENV=py27-nobyte
+#    - TOXENV=py27-xdist
+#    - TOXENV=py27-pluggymaster PYTEST_NO_COVERAGE=1
+#    # Specialized factors for py36.
+#    - TOXENV=py36-pexpect,py36-trial,py36-numpy
+#    - TOXENV=py36-xdist
+#    - TOXENV=py36-pluggymaster PYTEST_NO_COVERAGE=1
 
 jobs:
   include:
     # Coverage tracking is slow with pypy, skip it.
     - env: TOXENV=pypy PYTEST_NO_COVERAGE=1
       python: 'pypy-5.4'
-    - env: TOXENV=py35
-      python: '3.5'
-    - env: TOXENV=py36-freeze PYTEST_NO_COVERAGE=1
-      python: '3.6'
-    - env: TOXENV=py37
-      python: '3.7'
-    - &test-macos
-      language: generic
-      os: osx
-      osx_image: xcode9.4
-      sudo: required
-      install:
-        - python -m pip install --pre tox
-      env: TOXENV=py27
-    - <<: *test-macos
-      env: TOXENV=py37
-      before_install:
-        - brew update
-        - brew upgrade python
-        - brew unlink python
-        - brew link python
-
-    - stage: baseline
-      env: TOXENV=py27
-      python: '2.7'
-    - env: TOXENV=py34
-      python: '3.4'
-    - env: TOXENV=py36
-      python: '3.6'
-    - env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1
+#    - env: TOXENV=py35
+#      python: '3.5'
+#    - env: TOXENV=py36-freeze PYTEST_NO_COVERAGE=1
+#      python: '3.6'
+#    - env: TOXENV=py37
+#      python: '3.7'
+#    - &test-macos
+#      language: generic
+#      os: osx
+#      osx_image: xcode9.4
+#      sudo: required
+#      install:
+#        - python -m pip install --pre tox
+#      env: TOXENV=py27
+#    - <<: *test-macos
+#      env: TOXENV=py37
+#      before_install:
+#        - brew update
+#        - brew upgrade python
+#        - brew unlink python
+#        - brew link python
+#
+#    - stage: baseline
+#      env: TOXENV=py27
+#      python: '2.7'
+#    - env: TOXENV=py34
+#      python: '3.4'
+#    - env: TOXENV=py36
+#      python: '3.6'
+#    - env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1
 
     - stage: deploy
       python: '3.6'

From 9fa02add62781375c0c8de789c87337f99d308bb Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 10 Nov 2018 11:44:19 -0200
Subject: [PATCH 3/4] Test pypy

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

diff --git a/.travis.yml b/.travis.yml
index 82cc0d4d077..31f91eaafa5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ jobs:
   include:
     # Coverage tracking is slow with pypy, skip it.
     - env: TOXENV=pypy PYTEST_NO_COVERAGE=1
-      python: 'pypy-5.4'
+      python: 'pypy'
 #    - env: TOXENV=py35
 #      python: '3.5'
 #    - env: TOXENV=py36-freeze PYTEST_NO_COVERAGE=1

From 870c6addc2d0cb42e6cb7a8405d32e117e4c08c3 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 10 Nov 2018 11:53:38 -0200
Subject: [PATCH 4/4] Use tusty [skip appveyor]

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

diff --git a/.travis.yml b/.travis.yml
index 31f91eaafa5..c6282519ffe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ jobs:
     # Coverage tracking is slow with pypy, skip it.
     - env: TOXENV=pypy PYTEST_NO_COVERAGE=1
       python: 'pypy'
+      dist: trusty
 #    - env: TOXENV=py35
 #      python: '3.5'
 #    - env: TOXENV=py36-freeze PYTEST_NO_COVERAGE=1