From c74a894534186c2fc6135a12775a41c8f90636e9 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 13 Aug 2015 13:40:19 -0700
Subject: [PATCH 1/2] Moving install and script YAML rules into shell files.

---
 .travis.yml        |  4 ++--
 scripts/install.sh | 19 +++++++++++++++++++
 scripts/run.sh     | 19 +++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100755 scripts/install.sh
 create mode 100755 scripts/run.sh

diff --git a/.travis.yml b/.travis.yml
index 0dbe7c90b..46f1cb6f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,9 @@ env:
   - TOX_ENV=system-tests
   - TOX_ENV=system-tests3
 install:
-- pip install tox
+- ./scripts/install.sh
 script:
-- tox -e $TOX_ENV
+- ./scripts/run.sh
 after_success:
 - if [[ "${TOX_ENV}" == "py27" ]]; then tox -e coveralls; fi
 notifications:
diff --git a/scripts/install.sh b/scripts/install.sh
new file mode 100755
index 000000000..a3ae63a33
--- /dev/null
+++ b/scripts/install.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ev
+
+pip install tox
diff --git a/scripts/run.sh b/scripts/run.sh
new file mode 100755
index 000000000..378c7ab9f
--- /dev/null
+++ b/scripts/run.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ev
+
+tox -e ${TOX_ENV}

From 3a67e9355e56b3ae60070baf70b4e41b13a2bf5d Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Thu, 13 Aug 2015 14:55:27 -0700
Subject: [PATCH 2/2] Adjusting install/run Travis scripts to use pypy-2.6.

Adapted from
https://github.com/pyca/cryptography/blob/5e885db2e77b054a6597c1ddea4e7905b8350040/.travis.yml
https://github.com/pyca/cryptography/tree/5e885db2e77b054a6597c1ddea4e7905b8350040/.travis
---
 scripts/install.sh | 8 ++++++++
 scripts/run.sh     | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/scripts/install.sh b/scripts/install.sh
index a3ae63a33..5e8a17d98 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -17,3 +17,11 @@
 set -ev
 
 pip install tox
+if [[ "${TOX_ENV}" == "pypy" ]]; then
+    git clone https://github.com/yyuu/pyenv.git ${HOME}/.pyenv
+    PYENV_ROOT="${HOME}/.pyenv"
+    PATH="${PYENV_ROOT}/bin:${PATH}"
+    eval "$(pyenv init -)"
+    pyenv install pypy-2.6.0
+    pyenv global pypy-2.6.0
+fi
diff --git a/scripts/run.sh b/scripts/run.sh
index 378c7ab9f..0b537e241 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -16,4 +16,10 @@
 
 set -ev
 
+if [[ "${TOX_ENV}" == "pypy" ]]; then
+    PYENV_ROOT="${HOME}/.pyenv"
+    PATH="${PYENV_ROOT}/bin:${PATH}"
+    eval "$(pyenv init -)"
+    pyenv global pypy-2.6.0
+fi
 tox -e ${TOX_ENV}