From 6427dc0d9187b8bfb5fb8fa166bec60ba11569a2 Mon Sep 17 00:00:00 2001
From: Jeremy Low <jeremylow@gmail.com>
Date: Thu, 4 Aug 2016 21:11:54 -0400
Subject: [PATCH 1/5] update makefile for use with pypy and 64 bit linux.

---
 Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 09291496..f13b7db3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,10 @@
 
+ifeq ($(shell uname -m),x86_64)
+PYPY53 = pypy-5.3-src
+else
+PYPY53 = pypy-5.3
+endif
+
 help:
 	@echo "  env         install all production dependencies"
 	@echo "  dev         install all dev and production dependencies (virtualenv is assumed)"
@@ -15,8 +21,8 @@ dev: env
 	pip install -Ur requirements.testing.txt
 	pyenv install -s 2.7.11
 	pyenv install -s 3.5.2
-	pyenv install -s pypy-5.3
-	pyenv local 2.7.11 3.5.2 pypy-5.3
+	pyenv install -s $(PYPY53)
+	pyenv local 2.7.11 3.5.2 $(PYPY53)
 
 info:
 	@python --version

From 5884ece2b7b280a573306519470f8fb868e0a399 Mon Sep 17 00:00:00 2001
From: Jeremy Low <jeremylow@gmail.com>
Date: Thu, 4 Aug 2016 21:45:27 -0400
Subject: [PATCH 2/5] additionally check to make sure system is "Linux"

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index f13b7db3..e72a3696 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,11 @@
 
 ifeq ($(shell uname -m),x86_64)
+ifeq ($(shell uname -s),Linux)
 PYPY53 = pypy-5.3-src
 else
 PYPY53 = pypy-5.3
 endif
+endif
 
 help:
 	@echo "  env         install all production dependencies"

From d11f7d9c9cebb906dead089a4c3b09ba61f16910 Mon Sep 17 00:00:00 2001
From: Jeremy Low <jeremylow@gmail.com>
Date: Tue, 13 Sep 2016 13:20:17 -0400
Subject: [PATCH 3/5] upgrade to pypy5.4 & add installs for pypy3-2.4.0

---
 Makefile | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index e72a3696..466cd021 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,4 @@
 
-ifeq ($(shell uname -m),x86_64)
-ifeq ($(shell uname -s),Linux)
-PYPY53 = pypy-5.3-src
-else
-PYPY53 = pypy-5.3
-endif
-endif
-
 help:
 	@echo "  env         install all production dependencies"
 	@echo "  dev         install all dev and production dependencies (virtualenv is assumed)"
@@ -20,11 +12,12 @@ env:
 	pip install -Ur requirements.txt
 
 dev: env
-	pip install -Ur requirements.testing.txt
 	pyenv install -s 2.7.11
 	pyenv install -s 3.5.2
-	pyenv install -s $(PYPY53)
-	pyenv local 2.7.11 3.5.2 $(PYPY53)
+	pyenv install -s pypy-5.4
+	pyenv install -s pypy3-2.4.0
+	pyenv local 2.7.11 3.5.2 pypy-5.4 pypy3-2.4.0
+	pip install -Ur requirements.testing.txt
 
 info:
 	@python --version
@@ -55,7 +48,8 @@ coverage: clean
 	coverage html
 	coverage report
 
-ci: tox coverage
+ci: dev
+	tox
 	CODECOV_TOKEN=`cat .codecov-token` codecov
 
 build: clean

From 5b4a0107f0e731e07eda2ebbe0b4790b267e2e5e Mon Sep 17 00:00:00 2001
From: Jeremy Low <jeremylow@gmail.com>
Date: Tue, 13 Sep 2016 13:28:33 -0400
Subject: [PATCH 4/5] rollback to pypy5.3 for the ci builds

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 466cd021..83671bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,13 @@ coverage: clean
 	coverage html
 	coverage report
 
-ci: dev
+ci:
+	pyenv install -s 2.7.11
+	pyenv install -s 3.5.1
+	pyenv install -s pypy-5.3
+	pyenv install -s pypy3-2.4.0
+	pyenv local 2.7.11 3.5.2 pypy-5.3 pypy3-2.4.0
+	pip install -Ur requirements.testing.txt
 	tox
 	CODECOV_TOKEN=`cat .codecov-token` codecov
 

From 7f8d2f0ac2e1d9290d73a6776af56055dac6083b Mon Sep 17 00:00:00 2001
From: Jeremy Low <jeremylow@gmail.com>
Date: Tue, 13 Sep 2016 17:39:56 -0400
Subject: [PATCH 5/5] use versions of python supported by circleci

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 83671bc2..08153cfe 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,10 @@ env:
 
 dev: env
 	pyenv install -s 2.7.11
-	pyenv install -s 3.5.2
-	pyenv install -s pypy-5.4
+	pyenv install -s 3.5.1
+	pyenv install -s pypy-5.3.1
 	pyenv install -s pypy3-2.4.0
-	pyenv local 2.7.11 3.5.2 pypy-5.4 pypy3-2.4.0
+	pyenv local 2.7.11 3.5.1 pypy-5.3.1 pypy3-2.4.0
 	pip install -Ur requirements.testing.txt
 
 info:
@@ -51,9 +51,9 @@ coverage: clean
 ci:
 	pyenv install -s 2.7.11
 	pyenv install -s 3.5.1
-	pyenv install -s pypy-5.3
+	pyenv install -s pypy-5.3.1
 	pyenv install -s pypy3-2.4.0
-	pyenv local 2.7.11 3.5.2 pypy-5.3 pypy3-2.4.0
+	pyenv local 2.7.11 3.5.1 pypy-5.3.1 pypy3-2.4.0
 	pip install -Ur requirements.testing.txt
 	tox
 	CODECOV_TOKEN=`cat .codecov-token` codecov