From 4e6029cd9383d0291bef88926651cfa632a540eb Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 19 Nov 2013 07:18:07 +0100
Subject: [PATCH] travis: try using --upgrade to get the py.test version
 conflict sorted

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

diff --git a/.travis.yml b/.travis.yml
index 737fc3b..681058c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ python:
     - "2.7"
     - "pypy"
 install:
-    - "pip install -e . --use-mirrors"
+    - "pip install --upgrade --use-mirrors -e ."
 env: SECRET_KEY=justfortravis
 script: "py.test --pep8"
 notifications: