Skip to content

Commit d186b0b

Browse files
committed
Use travis-ci provided python3 on Linux
1 parent 57cdb87 commit d186b0b

File tree

1 file changed

+11
-25
lines changed

1 file changed

+11
-25
lines changed

.travis.yml

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,28 @@ matrix:
55
# Linux Python 2
66
- sudo: required
77
language: python
8-
services:
9-
- docker
10-
env:
11-
- "PYTHON=python2"
8+
python: 2.7
9+
services: docker
10+
env: PYTHON=python
1211

1312
# Linux Python 3
1413
- sudo: required
1514
language: python
16-
services:
17-
- docker
18-
env:
19-
- "PYTHON=python3"
20-
before_install:
21-
- sudo apt-get -qq update
22-
- sudo apt-get install -y python3-pip
15+
python: 3.4
16+
services: docker
17+
env: PYTHON=python
2318

2419
# macOS Python 2
2520
- os: osx
26-
env:
27-
- "PYTHON=python2"
21+
env: PYTHON=python2
2822

2923
# macOS Python 3
3024
- os: osx
31-
env:
32-
- "PYTHON=python3"
25+
env: PYTHON=python3
3326
before_install:
3427
- brew update
3528
- brew outdated python || brew upgrade python
3629

37-
script:
38-
- |
39-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
40-
$PYTHON -m pip install -r requirements-dev.txt
41-
$PYTHON ./bin/run_tests.py
42-
else
43-
# linux test requires root to clean up the wheelhouse (docker runs as root)
44-
sudo $PYTHON -m pip install -r requirements-dev.txt
45-
sudo $PYTHON ./bin/run_tests.py
46-
fi
30+
install: $PYTHON -m pip install -r requirements-dev.txt
31+
32+
script: $PYTHON ./bin/run_tests.py

0 commit comments

Comments
 (0)