Skip to content

Commit 5c71df0

Browse files
committed
build linux wheels in just one builder
1 parent b2525c9 commit 5c71df0

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

.travis.yml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,13 @@ env:
1111
matrix:
1212
include:
1313
- python: 2.7
14-
env:
15-
- UPLOAD_SDIST=1
16-
- python: 3.4
17-
- python: 3.5.1
18-
- python: 3.5.2
19-
- python: 3.5
20-
sudo: required
2114
services:
22-
- docker
15+
- docker
2316
env:
24-
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 BUILD_LINUX_WHEEL=1
17+
- BUILD_LINUX_WHEEL=1 UPLOAD_SDIST=1
18+
- python: 3.4
2519
- python: 3.5
26-
sudo: required
27-
services:
28-
- docker
29-
env:
30-
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 BUILD_LINUX_WHEEL=1 PRE_CMD=linux32
20+
- python: 3.6
3121
- os: osx
3222
language: generic
3323
osx_image: xcode6.4 # 6.4 is OS X 10.10.x
@@ -67,9 +57,6 @@ install:
6757
script:
6858
- bash ./travis/script.sh
6959

70-
after_success:
71-
- if [[ -n "TRAVIS_TAG" ]]; then bash travis/upload-artifact.sh; fi
72-
7360
notifications:
7461
irc:
7562
channels: irc.freenode.org#baroque-dev

travis/install.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
1616

1717
python -m virtualenv ~/.venv
1818
source ~/.venv/bin/activate
19-
else
20-
if [[ -n "TRAVIS_TAG" && "$BUILD_LINUX_WHEEL" == "1" ]]; then
21-
docker pull $DOCKER_IMAGE;
22-
fi
2319
fi
2420

2521
pip install .

travis/script.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@ py.test vmprof/ -vrs
1010
py.test jitlog/ -vrs
1111

1212
if [[ -n "TRAVIS_TAG" && "$BUILD_LINUX_WHEEL" == "1" ]]; then
13-
docker run --rm -v `pwd`:/io:Z $DOCKER_IMAGE $PRE_CMD bash /io/travis/build-wheels.sh;
13+
docker pull quay.io/pypa/manylinux1_x86_64
14+
docker pull quay.io/pypa/manylinux1_i686
15+
docker run --rm -v `pwd`:/io:Z quay.io/pypa/manylinux1_x86_64 bash /io/travis/build-wheels.sh;
16+
docker run --rm -v `pwd`:/io:Z quay.io/pypa/manylinux1_i686 linux32 bash /io/travis/build-wheels.sh;
17+
bash travis/upload-artifact.sh
1418
fi

0 commit comments

Comments
 (0)