From 7b69881e76934167a3a012796376895ccebe796f Mon Sep 17 00:00:00 2001
From: alan-barzilay <alan.barzilay@gmail.com>
Date: Wed, 24 Mar 2021 16:21:56 -0300
Subject: [PATCH 1/3] Upgrade pip before running tests on travis

This should ensure that all tests use the same version of pip and this should hopefully fix the pypy build that is using pip 19
---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 324b044..bfe9a9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,12 @@ matrix:
     - python: 3.6
       env: TOX_ENV=flake8
 
+# This should ensure that all tests use the same pip version
+before_install:
+  - python -m pip install --upgrade pip
+
 # Use tox to run tests on Travis-CI to keep one unified method of running tests in any environment
-install: 
+install:
   - pip install coverage coveralls tox
 
 # Command to run tests, e.g. python setup.py test

From b1725c7409f98cc7a97b3440bb64160cc266a200 Mon Sep 17 00:00:00 2001
From: alan-barzilay <alan.barzilay@gmail.com>
Date: Wed, 24 Mar 2021 18:33:15 -0300
Subject: [PATCH 2/3] Upgrading pypy to pypy3

Maybe forcing pypy to use python 3 will solve the issue (although it works fine with python 2.7 at the moment)
---
 .travis.yml | 4 ++--
 tox.ini     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bfe9a9d..5772134 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ matrix:
       env: TOX_ENV=py34
     - python: 2.7
       env: TOX_ENV=py27
-    - python: pypy
-      env: TOX_ENV=pypy
+    - python: pypy3
+      env: TOX_ENV=pypy3
     - python: 3.6
       env: TOX_ENV=flake8
 
diff --git a/tox.ini b/tox.ini
index 28a1dfa..554b3c1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, pypy, flake8
+envlist = py27, py34, py35, py36, pypy3, flake8
 
 [testenv]
 setenv =

From b7e061f73a534dddc6d6de974c52dd58dedbcea2 Mon Sep 17 00:00:00 2001
From: alan-barzilay <alan.barzilay@gmail.com>
Date: Wed, 24 Mar 2021 18:40:30 -0300
Subject: [PATCH 3/3] Remove unecessary pip upgrade step

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5772134..7988659 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,6 @@ matrix:
     - python: 3.6
       env: TOX_ENV=flake8
 
-# This should ensure that all tests use the same pip version
-before_install:
-  - python -m pip install --upgrade pip
-
 # Use tox to run tests on Travis-CI to keep one unified method of running tests in any environment
 install:
   - pip install coverage coveralls tox