try fixing upload docs step (#2249)

run the upload wheels activity on our build machine -- it requires python 3.6 or greater and CI's "machine" only provides python3.5

.circleci/config.yml

@@ -7,9 +7,6 @@ executors:
   doxygen:
     docker:
       - image: hrektts/doxygen
-  python:
-    docker:
-      - image: 3.7.7-stretch
             
 
 restore-workspace: &restore-workspace
@@ -156,8 +153,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: workspace
-      - run: pyenv versions
-      # - run: pyenv global 3.6.0
       - run: ls -laR workspace
       - run: ci_scripts/ci_upload.sh workspace/py-docs workspace/wheelhouse workspace/c-docs
 
@@ -192,8 +187,8 @@ workflows:
           filters:
             branches:
               only: master
-            tags:
+            #tags:
-              only: /.*/
+            #  only: /.*/
 
       - upload_docs_wheels:
           requires:

ci_scripts/ci_upload.sh

@@ -10,9 +10,13 @@ set -xe
 PYDOCDIR=${1:?directory with python docs}
 WHEELHOUSEDIR=${2:?directory with pre-built wheels}
 DOXYDOCDIR=${3:?directory where doxygen docs to be found}
+SSHTARGET=ci@b1.delta.chat
 
+    
 export BRANCH=${CIRCLE_BRANCH:?specify branch for uploading purposes}
 
+export BUILDDIR=ci_builds/$REPONAME/$BRANCH/${CIRCLE_JOB:?jobname}/${CIRCLE_BUILD_NUM:?circle-build-number}/wheelhouse
+
 
 # python docs to py.delta.chat
 ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null delta@py.delta.chat mkdir -p build/${BRANCH}
@@ -35,23 +39,36 @@ echo upload wheels
 echo -----------------------
 
 # Bundle external shared libraries into the wheels
-pushd $WHEELHOUSEDIR
 
-pip3 install -U pip setuptools
+ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $SSHTARGET mkdir -p $BUILDDIR 
-pip3 install devpi-client
+scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ci_scripts/cleanup_devpi_indices.py $SSHTARGET:$BUILDDIR 
-devpi use https://m.devpi.net
+rsync -avz \
-devpi login dc --password $DEVPI_LOGIN
+  -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
+  $WHEELHOUSEDIR \
+  $SSHTARGET:$BUILDDIR 
 
-N_BRANCH=${BRANCH//[\/]}
+ssh $SSHTARGET <<_HERE
+    set +x -e
+    # make sure all processes exit when ssh dies
+    shopt -s huponexit
 
-devpi use dc/$N_BRANCH || {
+    # we rely on the "venv" virtualenv on the remote account to exist 
-    devpi index -c $N_BRANCH 
+    source venv/bin/activate
-    devpi use dc/$N_BRANCH
+    cd $BUILDDIR
-}
-devpi index $N_BRANCH bases=/root/pypi
-devpi upload deltachat*
 
-popd
+    devpi use https://m.devpi.net
+    devpi login dc --password $DEVPI_LOGIN
 
-# remove devpi non-master dc indices if thy are too old
+    N_BRANCH=${BRANCH//[\/]}
-python ci_scripts/cleanup_devpi_indices.py
+
+    devpi use dc/\$N_BRANCH || {
+        devpi index -c \$N_BRANCH 
+        devpi use dc/\$N_BRANCH
+    }
+    devpi index \$N_BRANCH bases=/root/pypi
+    devpi upload wheelhouse/deltachat*
+
+    # remove devpi non-master dc indices if thy are too old
+    # this script was copied above 
+    python cleanup_devpi_indices.py
+_HERE