diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-12-16 12:54:23 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-12-16 12:54:23 -0700 |
| commit | 8f87f431e275c243d17857ba7a027102dd81cfe8 (patch) | |
| tree | 472308a19cdd4b0e2a5c49bcf7150dcb4e13304c | |
| parent | 402e3d3498b680cd6522b4c1fa55902d2e5ed57f (diff) | |
| download | numpy-8f87f431e275c243d17857ba7a027102dd81cfe8.tar.gz | |
STY: Style fixes for .travis.yml and travis-upload-wheel.sh
* shell script style fixes inspired by google shell style guide
https://google.github.io/styleguide/shell.xml
* .travis.yml longline breaking tested with
http://yaml-online-parser.appspot.com/
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | tools/travis-upload-wheel.sh | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 589d7a9e6..e0887a82a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,10 @@ matrix: - 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=" + - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9Tr\ + XrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPow\ + iFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAM\ + ahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU=" - python: 2.7 env: - PYTHONOPTIMIZE=2 diff --git a/tools/travis-upload-wheel.sh b/tools/travis-upload-wheel.sh index 60b9aa7cb..06a8f3eba 100755 --- a/tools/travis-upload-wheel.sh +++ b/tools/travis-upload-wheel.sh @@ -1,11 +1,13 @@ #!/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 +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 |