Merge branch 'permission-fix' into 'master'

[fdroidserver.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index bf7c479a0a1354abaf377741791f22bf9dbad7b8..abdf6d3a532029df2ac84f13ddf1ae924a8d5b11 100644 (file)
--- 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 --filter platform-tools,build-tools-23.0.2;
+      echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-23.0.3;
       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-venv python3-yaml rsync
+      pyflakes pylint3 pep8 dash bash ruby libjpeg-dev zlib1g-dev;
+      sudo pip3 install pylint;
       fi
 
 script: