diff options
| author | Nathaniel J. Smith <njs@pobox.com> | 2015-12-11 00:54:24 +0000 |
|---|---|---|
| committer | Nathaniel J. Smith <njs@pobox.com> | 2015-12-11 00:54:24 +0000 |
| commit | 582f1fd8447321451197c2d47bad13d039f5964a (patch) | |
| tree | 6a909c7bf5efcc1f1499f3b04c76092fba88a24b | |
| parent | e914ef2e5968de337e2f81dcdc1baa379b2145de (diff) | |
| parent | 27abfb4923a3ff0433bb7f5dd08a42603641b519 (diff) | |
| download | numpy-582f1fd8447321451197c2d47bad13d039f5964a.tar.gz | |
Merge pull request #6768 from ogrisel/travis-wheels
Deploy dev wheels to rackspace from travis
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 8 | ||||
| -rwxr-xr-x | tools/travis-upload-wheel.sh | 11 |
3 files changed, 26 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 2447360f5..314fd18d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,13 @@ matrix: - python3-nose - python: 2.7 env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1 - - python: 2.7 - env: USE_WHEEL=1 + - python: 3.5 + env: + - USE_WHEEL=1 + - WHEELHOUSE_UPLOADER_USERNAME=travis.numpy + # The following is generated with the command: + # travis encrypt -r numpy/numpy WHEELHOUSE_UPLOADER_SECRET=tH3AP1KeY + - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9TrXrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPowiFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAMahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU=" - python: 2.7 env: PYTHONOPTIMIZE=2 before_install: @@ -73,3 +78,6 @@ before_install: script: - ./tools/travis-test.sh + +after_success: + - ./tools/travis-upload-wheel.sh diff --git a/tools/travis-test.sh b/tools/travis-test.sh index 795915d0b..af151f434 100755 --- a/tools/travis-test.sh +++ b/tools/travis-test.sh @@ -94,14 +94,16 @@ export PIP if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then # Build wheel $PIP install wheel + # ensure that the pip / setuptools versions deployed inside the venv are recent enough + $PIP install -U virtualenv $PYTHON setup.py bdist_wheel # Make another virtualenv to install into - virtualenv --python=python venv-for-wheel + virtualenv --python=`which $PYTHON` venv-for-wheel . venv-for-wheel/bin/activate # Move out of source directory to avoid finding local numpy pushd dist - $PIP install --pre --no-index --upgrade --find-links=. numpy - $PIP install nose + pip install --pre --no-index --upgrade --find-links=. numpy + pip install nose popd run_test elif [ "$USE_CHROOT" != "1" ]; then diff --git a/tools/travis-upload-wheel.sh b/tools/travis-upload-wheel.sh new file mode 100755 index 000000000..60b9aa7cb --- /dev/null +++ b/tools/travis-upload-wheel.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -ex + +export CLOUD_CONTAINER_NAME=travis-dev-wheels + +if [[ ( $USE_WHEEL == 1 ) && \ + ( "$TRAVIS_BRANCH" == "master" ) && \ + ( "$TRAVIS_PULL_REQUEST" == "false" ) ]]; then + pip install wheelhouse_uploader + python -m wheelhouse_uploader upload --local-folder $TRAVIS_BUILD_DIR/dist/ $CLOUD_CONTAINER_NAME +fi |