aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2013-10-18 15:31:16 -0700
committerDonald Stufft <donald@stufft.io>2013-10-18 15:31:16 -0700
commit4e542de6f58b55b1324e70c213c0d43f9aee319c (patch)
treeb3baacbc0ecad51323488f947b937c5e603d2c2a
parent8fc770af915637410596e122e13f6c23aef00d83 (diff)
parentf6130951cef9cb66dba0e145335a0a68aa7f95b7 (diff)
downloadcryptography-4e542de6f58b55b1324e70c213c0d43f9aee319c.tar.gz
cryptography-4e542de6f58b55b1324e70c213c0d43f9aee319c.tar.bz2
cryptography-4e542de6f58b55b1324e70c213c0d43f9aee319c.zip
Merge pull request #120 from alex/fix-mongo-right-way
Fix this in the right way
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 6d164863..89f0b101 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,12 @@ env:
- TOX_ENV=docs
- TOX_ENV=pep8
+before_install:
+ - sudo rm /etc/apt/sources.list.d/mongodb.list
+
install:
- "[[ ${TOX_ENV} == pypy ]] && sudo add-apt-repository -y ppa:pypy/ppa || true"
- - "[[ ${TOX_ENV} == pypy ]] && (sudo apt-get -y update || true) && sudo apt-get -y install pypy || true"
+ - "[[ ${TOX_ENV} == pypy ]] && sudo apt-get -y update && sudo apt-get -y install pypy || true"
# This is required because we need to get rid of the Travis installed PyPy
# or it'll take precedence over the PPA installed one.
- "[[ ${TOX_ENV} == pypy ]] && sudo rm -rf /usr/local/pypy/bin || true"