fix uploading

Author: mattip

.github/workflows/posix.yml

@@ -147,3 +147,4 @@ jobs:
         # Pin urllib3<2 due to github.com/Anaconda-Platform/anaconda-client/issues/654
         conda install -y anaconda-client 'urllib3<2.0.0'
         source tools/upload_to_anaconda_staging.sh
+        upload_wheels

.github/workflows/windows.yml

@@ -152,9 +152,11 @@ jobs:
         activate-environment: upload
 
     - name: Upload
+      shell: bash
       env:
        ANACONDA_SCIENTIFIC_PYTHON_UPLOAD: ${{ secrets.ANACONDA_SCIENTIFIC_PYTHON_UPLOAD }}
       run: |
         # Pin urllib3<2 due to github.com/Anaconda-Platform/anaconda-client/issues/654
-        conda install "urllib3<2" anaconda-client
-        & $env:BASH_PATH -lc tools/upload_to_anaconda_staging.sh
+        conda install -y anaconda-client 'urllib3<2.0.0'
+        source tools/upload_to_anaconda_staging.sh
+        upload_wheels

.travis.yml

@@ -94,5 +94,8 @@ script:
         /bin/bash -xe /openblas/tools/build_wheel.sh
 
 after_success:
+    - sudo chmod -R a+w /home/travis/.cache
+    - pip install -q git+https://github.com/Anaconda-Platform/[email protected]
     # Upload libraries to the shared staging area on anaconda.org
     - source tools/upload_to_anaconda_staging.sh
+    - upload_wheels

tools/upload_to_anaconda_staging.sh

@@ -1,30 +1,31 @@
 #!/bin/bash
 # Upload tar.gz and wheels to ananconda.org
 
-set -e
+upload_wheels() {
+    set -e
+    if [[ "$(uname -s)" == CYGWIN* ]]; then
+        our_wd=$(cygpath "$START_DIR")
+        cd $our_wd
+    fi
 
-if [[ "$(uname -s)" == CYGWIN* ]]; then 
-    our_wd=$(cygpath "$START_DIR")
-    cd $our_wd
-fi
+    pushd OpenBLAS
+    VERSION=$(git describe --tags --abbrev=8)
+    popd
 
-pushd OpenBLAS
-VERSION=$(git describe --tags --abbrev=8)
-popd
+    if [ "$ANACONDA_SCIENTIFIC_PYTHON_UPLOAD" == "" ]; then
+        echo "ANACONDA_SCIENTIFIC_PYTHON_UPLOAD is not defined: skipping."
+    else
+        echo "Uploading OpenBLAS $VERSION to anaconda.org staging:"
 
-if [ "$ANACONDA_SCIENTIFIC_PYTHON_UPLOAD" == "" ]; then
-    echo "ANACONDA_SCIENTIFIC_PYTHON_UPLOAD is not defined: skipping."
-else
-    echo "Uploading OpenBLAS $VERSION to anaconda.org staging:"
+        anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
+                --no-progress --force -u scientific-python-nightly-wheels \
+                -t file -p "openblas-libs" -v "$VERSION" \
+                -d "OpenBLAS for multibuild wheels" \
+                -s "OpenBLAS for multibuild wheels" \
+                builds/openblas*.zip libs/openblas*.tar.gz
 
-    anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
-            --no-progress --force -u scientific-python-nightly-wheels \
-            -t file -p "openblas-libs" -v "$VERSION" \
-            -d "OpenBLAS for multibuild wheels" \
-            -s "OpenBLAS for multibuild wheels" \
-            builds/openblas*.zip libs/openblas*.tar.gz
-
-    anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
-            --no-progress --force -u scientific-python-nightly-wheels \
-            dist/scipy_openblas*.whl
-fi
+        anaconda -t $ANACONDA_SCIENTIFIC_PYTHON_UPLOAD upload \
+                --no-progress --force -u scientific-python-nightly-wheels \
+                dist/scipy_openblas*.whl
+    fi
+}