From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 14 Mar 2016 10:02:01 +0000 (+0100)
Subject: travis-ci: move python deps to 3
X-Git-Tag: 0.7.0~83^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=20d082dfed10c08a38e0728a3384908916692ccd;p=fdroidserver.git

travis-ci: move python deps to 3
---

diff --git a/.travis.yml b/.travis.yml
index b606d254..8fe55874 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,21 +22,21 @@ licenses:
 # the pip thing is a hack that can go away with trusty
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew update;
-      brew install android-sdk dash gnu-sed jpeg python;
-      sudo pip install pep8 pyflakes pylint;
-      sudo pip install -e  .;
+      brew update > /dev/null;
+      brew install android-sdk dash gnu-sed jpeg python3;
+      sudo pip3 install pep8 pyflakes pylint;
+      sudo pip3 install -e  .;
       sudo rm -rf fdroidserver.egg-info;
       echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-23.0.2;
       elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
       sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
       sudo apt-get -q update -y;
-      sudo apt-get -q install -y --no-install-recommends python
-      python-git python-imaging python-libcloud python-logilab-astng
-      python-paramiko python-pip python-pyasn1 python-pyasn1-modules
-      python-requests python-virtualenv python-yaml rsync
-      pylint pep8 dash bash ruby
-      python-dev libjpeg-dev zlib1g-dev;
+      sudo apt-get -q install -y --no-install-recommends python3 python3-dev
+      python3-git python3-pil python3-libcloud python3-logilab-astng
+      python3-paramiko python3-pip python3-pyasn1 python3-pyasn1-modules
+      python3-requests python3-virtualenv python3-yaml rsync
+      pyflakes pylint3 pep8 dash bash ruby libjpeg-dev zlib1g-dev;
+      sudo pip3 install pylint;
       fi
 
 script: