8000 Merge pull request #6768 from ogrisel/travis-wheels · numpy/numpy@582f1fd · GitHub
[go: up one dir, main page]

Skip to content

Commit 582f1fd

Browse files
committed
Merge pull request #6768 from ogrisel/travis-wheels
Deploy dev wheels to rackspace from travis
2 parents e914ef2 + 27abfb4 commit 582f1fd

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,13 @@ matrix:
4848
- python3-nose
4949
- python: 2.7
5050
env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
51-
- python: 2.7
52-
env: USE_WHEEL=1
51+
- python: 3.5
52+
env:
53+
- USE_WHEEL=1
54+
- WHEELHOUSE_UPLOADER_USERNAME=travis.numpy
55+
# The following is generated with the command:
56+
# travis encrypt -r numpy/numpy WHEELHOUSE_UPLOADER_SECRET=tH3AP1KeY
57+
- secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9TrXrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPowiFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAMahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU="
5358
- python: 2.7
5459
env: PYTHONOPTIMIZE=2
5560
before_install:
@@ -73,3 +78,6 @@ before_install:
7378

7479
script:
7580
- ./tools/travis-test.sh
81+
82+
after_success:
83+
- ./tools/travis-upload-wheel.sh

tools/travis-test.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,16 @@ export PIP
9494
if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then
9595
# Build wheel
9696
$PIP install wheel
97+
# ensure that the pip / setuptools versions deployed inside the venv are recent enough
98+
$PIP install -U virtualenv
9799
$PYTHON setup.py bdist_wheel
98100
# Make another virtualenv to install into
99-
virtualenv --python=python venv-for-wheel
101+
virtualenv --python=`which $PYTHON` venv-for-wheel
100102
. venv-for-wheel/bin/activate
101103
# Move out of source directory to avoid finding local numpy
102104
pushd dist
103-
$PIP install --pre --no-index --upgrade --find-links=. numpy
104-
$PIP install nose
105+
pip install --pre --no-index --upgrade --find-links=. numpy
106+
pip install nose
105107
popd
106108
run_test
107109
elif [ "$USE_CHROOT" != "1" ]; then

tools/travis-upload-wheel.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
set -ex
3+
4+
export CLOUD_CONTAINER_NAME=travis-dev-wheels
5+
6+
if [[ ( $USE_WHEEL == 1 ) && \
7+
( "$TRAVIS_BRANCH" == "master" ) && \
8+
( "$TRAVIS_PULL_REQUEST" == "false" ) ]]; then
9+
pip install wheelhouse_uploader
10+
python -m wheelhouse_uploader upload --local-folder $TRAVIS_BUILD_DIR/dist/ $CLOUD_CONTAINER_NAME
11+
fi

0 commit comments

Comments
 (0)
0