From dcbc911263a33b36ed630d6f8f3b5deadaf40bfc Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 9 Jan 2014 10:07:30 -0800
Subject: easy_install is awful, don't use it

---
 .travis/install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index d25ed941..8d6840f2 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -15,12 +15,14 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
     if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi
     case "${TOX_ENV}" in
         py26)
-            sudo easy_install pip
+            curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+            sudo python get-pip.py
             sudo pip install setuptools --no-use-wheel --upgrade
             sudo pip install virtualenv
             ;;
         py27)
-            sudo easy_install pip
+            curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+            sudo python get-pip.py
             sudo pip install setuptools --no-use-wheel --upgrade
             sudo pip install virtualenv
             ;;
-- 
cgit v1.2.3


From 4af88912575473a02c590680ff25402a87a3b758 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 9 Jan 2014 10:10:26 -0800
Subject: Style nit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 92ee221b..d28fef5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ install:
     - ./.travis/install.sh
 
 script:
-    - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)";fi && source ~/.venv/bin/activate && tox -e $TOX_ENV
+    - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV
 
 after_success:
     - coveralls
-- 
cgit v1.2.3