From 8bbf7778683ed91e0e706130fcb32361e655cbbd Mon Sep 17 00:00:00 2001 From: mattip Date: Thu, 14 May 2020 00:20:37 +0300 Subject: [PATCH 1/3] only rename wheels that go to scipy-wheels-nightly --- .travis.yml | 2 ++ azure/posix.yml | 6 ++++-- azure/windows.yml | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55a05d0..5014cec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,6 +108,8 @@ after_success: - if [ "$TRAVIS_BRANCH" == "master" ]; then ANACONDA_ORG="scipy-wheels-nightly"; TOKEN=${NUMPY_NIGHTLY_UPLOAD_TOKEN}; + source extra_functions.sh + for f in wheelhouse/*.whl; do rename_wheel $f; done else ANACONDA_ORG="multibuild-wheels-staging"; TOKEN=${NUMPY_STAGING_UPLOAD_TOKEN}; diff --git a/azure/posix.yml b/azure/posix.yml index a106a2f..7f77611 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -110,8 +110,10 @@ jobs: - bash: | set -e - source extra_functions.sh - for f in wheelhouse/*.whl; do rename_wheel $f; done + if [ $ANACONDA_ORG == "scipy-wheels-nightly" ]; then + source extra_functions.sh + for f in wheelhouse/*.whl; do rename_wheel $f; done + fi echo uploading wheelhouse/*.whl diff --git a/azure/windows.yml b/azure/windows.yml index 1b7ef37..e6cff80 100644 --- a/azure/windows.yml +++ b/azure/windows.yml @@ -138,8 +138,10 @@ jobs: - bash: | set -e - source extra_functions.sh - for f in numpy/dist/numpy-*.whl; do rename_wheel $f; done + if [ $ANACONDA_ORG == "scipy-wheels-nightly" ]; then + source extra_functions.sh + for f in wheelhouse/*.whl; do rename_wheel $f; done + fi echo uploading numpy/dist/numpy-*.whl From 1e2364bd881fdfe303da0082658ff7e47bd27399 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Thu, 14 May 2020 19:42:27 -0600 Subject: [PATCH 2/3] Fix anaconda upload flag. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5014cec..38a7e8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,5 +116,5 @@ after_success: fi - pip install git+https://github.com/Anaconda-Server/anaconda-client; - if [ -n "${TOKEN}" ] ;then - anaconda -t ${TOKEN} upload u ${ANACONDA_ORG} ${TRAVIS_BUILD_DIR}/wheelhouse/*.whl; + anaconda -t ${TOKEN} upload -u ${ANACONDA_ORG} ${TRAVIS_BUILD_DIR}/wheelhouse/*.whl; fi From cb18438ce952c3fe1aea7a8c95ae3df5f11068f2 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Thu, 14 May 2020 20:43:05 -0600 Subject: [PATCH 3/3] Try adding some `;` --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38a7e8f..12f25c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,16 +105,16 @@ after_success: # https://travis-ci.org/github/MacPython/numpy-wheels/settings # originally generated at # anaconda.org/scipy-wheels-nightly/settings/access - - if [ "$TRAVIS_BRANCH" == "master" ]; then + - if [ "$TRAVIS_BRANCH" == "master" ] ; then ANACONDA_ORG="scipy-wheels-nightly"; TOKEN=${NUMPY_NIGHTLY_UPLOAD_TOKEN}; - source extra_functions.sh - for f in wheelhouse/*.whl; do rename_wheel $f; done + source extra_functions.sh; + for f in wheelhouse/*.whl; do rename_wheel $f; done; else ANACONDA_ORG="multibuild-wheels-staging"; TOKEN=${NUMPY_STAGING_UPLOAD_TOKEN}; fi - pip install git+https://github.com/Anaconda-Server/anaconda-client; - - if [ -n "${TOKEN}" ] ;then + - if [ -n "${TOKEN}" ] ; then anaconda -t ${TOKEN} upload -u ${ANACONDA_ORG} ${TRAVIS_BUILD_DIR}/wheelhouse/*.whl; fi