travis: remove 3.5.0b4, cython and py.test issues, cosmetic changes

borgbackup · Aug 7, 2015 · a9e8516 · a9e8516
1 parent 57df001
commit a9e8516
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,9 +17,6 @@ matrix:
         - python: 3.4
           os: linux
           env: TOXENV=py34
-        - python: 3.5.0b4
-          os: linux
-          env: TOXENV=py35
         - language: generic
           os: osx
           osx_image: beta-xcode6.3

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -14,26 +14,24 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
         eval "$(pyenv init -)"
     fi
 
+    brew outdated pyenv || brew upgrade pyenv
+
     case "${TOXENV}" in
         py32)
-            brew outdated pyenv || brew upgrade pyenv
             pyenv install 3.2.6
             pyenv global 3.2.6
             ;;
         py33)
-            brew outdated pyenv || brew upgrade pyenv
             pyenv install 3.3.6
             pyenv global 3.3.6
             ;;
         py34)
-            brew outdated pyenv || brew upgrade pyenv
             pyenv install 3.4.3
             pyenv global 3.4.3
             ;;
     esac
     pyenv rehash
     python -m pip install --user virtualenv
-    # ??? brew outdated libacl1-dev || brew upgrade libacl1-dev
 else
     pip install virtualenv
     sudo apt-get install -y libacl1-dev

diff --git a/.travis/run.sh b/.travis/run.sh
@@ -12,7 +12,9 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
         export CFLAGS="-I/usr/local/opt/openssl/include"
     fi
 fi
+
 source ~/.venv/bin/activate
+
 if [[ "$(uname -s)" == "Darwin" ]]; then
     # no fakeroot on OS X
     sudo tox -e $TOXENV