From ad2eccc3e31e280f525a4aa71a4c3460ebd5490c Mon Sep 17 00:00:00 2001
From: AuHau <uhlir.a@gmail.com>
Date: Tue, 5 Mar 2019 10:17:54 -0800
Subject: [PATCH 1/4] Improving on multi-version tests

---
 .travis.yml | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 24088e7c..558dd98a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,16 +8,25 @@ stages:
   - name: deploy-release
     if: tag IS present
 
+language: python
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8-dev"
+  - "pypy"
+  - "pypy3"
+dist: xenial
+sudo: true
 
 jobs:
   include:
     - stage: lint
       name: "Flakes"
-      language: python
       python:
         - "3.7"
-      dist: xenial
-      sudo: true
       install:
         - pip install flake8
       script:
@@ -25,18 +34,6 @@ jobs:
 
     - stage: test
       name: "Tests"
-      language: python
-      python:
-        - "2.7"
-        - "3.4"
-        - "3.5"
-        - "3.6"
-        - "3.7"
-        - "3.8-dev"
-        - "pypy"
-        - "pypy3"
-      dist: xenial
-      sudo: true
       install:
         - pip install -r requirements-dev.txt
         - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then pip install unittest2 mock; fi
@@ -49,10 +46,7 @@ jobs:
 
     - stage: deploy-pip
       name: "Publish to PyPi"
-      language: python
       python: '3.7'
-      dist: xenial
-      sudo: true
       script:
         - pip install -r test-requirements.txt
       deploy:
@@ -83,10 +77,7 @@ jobs:
 
     - stage: deploy-release
       name: "Create release"
-      language: python
       python: '3.7'
-      dist: xenial
-      sudo: true
       script: echo 'Lets do it!'
       deploy:
         provider: releases

From 2c3d2c88d3235ef21f02d262926dcb12f7f83b2a Mon Sep 17 00:00:00 2001
From: AuHau <uhlir.a@gmail.com>
Date: Tue, 5 Mar 2019 10:29:09 -0800
Subject: [PATCH 2/4] Updating metadata on supporte Python's versions

---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index b3075806..3123be2e 100644
--- a/setup.py
+++ b/setup.py
@@ -47,9 +47,10 @@ def run_tests(self):
       classifiers=[
           'Development Status :: 5 - Production/Stable',
           'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
           'Environment :: Console',
           'Intended Audience :: Developers',
           'License :: OSI Approved :: MIT License',

From 2e8d49abb08b7cea992173ccb2ec85e489818cf8 Mon Sep 17 00:00:00 2001
From: AuHau <uhlir.a@gmail.com>
Date: Tue, 5 Mar 2019 10:29:26 -0800
Subject: [PATCH 3/4] Travis

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 558dd98a..c0ae98f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,13 @@ python:
   - "pypy3"
 dist: xenial
 sudo: true
+install:
+  - pip install -r requirements-dev.txt
+  - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then pip install unittest2 mock; fi
+  - python setup.py install
+script:
+  - make run_integration_tests
+  - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then make run_acceptance_tests; fi
 
 jobs:
   include:
@@ -34,13 +41,6 @@ jobs:
 
     - stage: test
       name: "Tests"
-      install:
-        - pip install -r requirements-dev.txt
-        - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then pip install unittest2 mock; fi
-        - python setup.py install
-      script:
-        - make run_integration_tests
-        - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then make run_acceptance_tests; fi
       after_success:
         - make coveralls
 

From 82f688004458749d2e2e12f49ad8961fd44cbd9f Mon Sep 17 00:00:00 2001
From: AuHau <uhlir.a@gmail.com>
Date: Tue, 5 Mar 2019 10:36:55 -0800
Subject: [PATCH 4/4] PyPy

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0ae98f3..df032991 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,8 @@ python:
   - "3.6"
   - "3.7"
   - "3.8-dev"
-  - "pypy"
-  - "pypy3"
+  - "pypy2.7-7.0"
+  - "pypy3.5-7.0"
 dist: xenial
 sudo: true
 install:
@@ -41,6 +41,7 @@ jobs:
 
     - stage: test
       name: "Tests"
+      language: python
       after_success:
         - make coveralls