Use travis-ci provided python3 on Linux

This commit is contained in:
mayeut
2018-05-06 15:44:27 +02:00
parent 57cdb8711c
commit d186b0bbb7
+11 -25
View File
@@ -5,42 +5,28 @@ matrix:
# Linux Python 2 # Linux Python 2
- sudo: required - sudo: required
language: python language: python
services: python: 2.7
- docker services: docker
env: env: PYTHON=python
- "PYTHON=python2"
# Linux Python 3 # Linux Python 3
- sudo: required - sudo: required
language: python language: python
services: python: 3.4
- docker services: docker
env: env: PYTHON=python
- "PYTHON=python3"
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y python3-pip
# macOS Python 2 # macOS Python 2
- os: osx - os: osx
env: env: PYTHON=python2
- "PYTHON=python2"
# macOS Python 3 # macOS Python 3
- os: osx - os: osx
env: env: PYTHON=python3
- "PYTHON=python3"
before_install: before_install:
- brew update - brew update
- brew outdated python || brew upgrade python - brew outdated python || brew upgrade python
script: install: $PYTHON -m pip install -r requirements-dev.txt
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then script: $PYTHON ./bin/run_tests.py
$PYTHON -m pip install -r requirements-dev.txt
$PYTHON ./bin/run_tests.py
else
# linux test requires root to clean up the wheelhouse (docker runs as root)
sudo $PYTHON -m pip install -r requirements-dev.txt
sudo $PYTHON ./bin/run_tests.py
fi