From e4fe05beaac8109833a89ec93747013b25c43308 Mon Sep 17 00:00:00 2001
From: Landon GB <landogbland@gmail.com>
Date: Sun, 20 Aug 2017 14:51:33 -0600
Subject: [PATCH 1/2] Attept to fix breakage with travis ci

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

diff --git a/.travis.yml b/.travis.yml
index 1d19d704..8383de6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,21 @@
 language: python
-python:
-    - "3.6"
-addons:
-  apt:
-    sources:
-      - deadsnakes
-    packages:
-      - python3.5 python3.5-dev
+matrix:
+  include:
+    - python: 3.6
+      env: TOXENV=py
+    - python: 3.5
+      env: TOXENV=py
+    - python: 3.4
+      env: TOXENV=py
+    - python: 3.3
+      env: TOXENV=py
+    - python: 2.7
+      env: TOXENV=py
+    - python: 2.6
+      env: TOXENV=py
+    - python: pypy
+      env: TOXENV=py
 sudo: false
-env:
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py34
-    - TOXENV=py35
-    - TOXENV=py36
 install:
     - pip install -U pip
     - pip install -U tox coverage coveralls

From 03e6a9a4189242b92defa768ef08a16ceb8874f8 Mon Sep 17 00:00:00 2001
From: Landon GB <landogbland@gmail.com>
Date: Sun, 20 Aug 2017 14:59:02 -0600
Subject: [PATCH 2/2] Remove 2.6 unit tests, add that we are testing against
 PyPy as well

---
 .travis.yml | 2 --
 README.md   | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8383de6c..8d2bf16b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,6 @@ matrix:
       env: TOXENV=py
     - python: 2.7
       env: TOXENV=py
-    - python: 2.6
-      env: TOXENV=py
     - python: pypy
       env: TOXENV=py
 sudo: false
diff --git a/README.md b/README.md
index 086f0ac7..c0ac5267 100644
--- a/README.md
+++ b/README.md
@@ -34,9 +34,9 @@ We are on irc! You can come chat with us in the ```#flask-jwt-extended``` channe
 
 
 ### Testing and Code Coverage
-We require 100% code coverage in our unit tests. We run all the unit tests with tox,
-which will test against python2.7, 3.3, 3.4, 3.5 and 3.6. Running tox will print out a
-code coverage report
+We require 100% code coverage in our unit tests. You can run the tests locally
+with `tox` which will print out a code coverage report. Creating a pull request
+will run the tests against python 2.7, 3.3, 3,4, 3,5, 3,6, and PyPy.
 ```
 $ tox
 ```