Update build

- Update to blobxfer 1.1.1

Author: alfpark

.travis.yml

@@ -16,6 +16,7 @@ env:
 
 install:
   - travis_retry pip install -r requirements.txt
+  - travis_retry pip install --no-deps -r req_nodeps.txt
   - travis_retry pip install flake8
 
 script:
@@ -43,15 +44,16 @@ after_success:
     fi
     echo "BATCH_SHIPYARD_CLI_ARTIFACT=$BATCH_SHIPYARD_CLI_ARTIFACT UPLOAD_PATH=$UPLOAD_PATH"
     if [[ ! -e "bin/$BATCH_SHIPYARD_CLI_ARTIFACT" ]]; then
-      travis_retry pip install --upgrade --pre blobxfer
       virtualenv -p python3 pyi
       $SHELL -c "set -e; source pyi/bin/activate; \
                  pip install pyinstaller; \
-                 pip install --no-cache-dir -r requirements.txt; \
+                 pip install --upgrade -r requirements.txt; \
+                 pip install --upgrade --no-deps -r req_nodeps.txt; \
                  pyinstaller -F -n $BATCH_SHIPYARD_CLI_ARTIFACT -p batch-shipyard --add-data schemas:schemas --add-data scripts:scripts --exclude-module future.tests --exclude-module future.backports.test --exclude-module future.moves.test --distpath bin shipyard.py; \
                  deactivate"
       chmod +x bin/$BATCH_SHIPYARD_CLI_ARTIFACT
       gzip bin/$BATCH_SHIPYARD_CLI_ARTIFACT
+      travis_retry pip install --upgrade blobxfer
       blobxfer upload --remote-path $UPLOAD_PATH --local-path bin/${BATCH_SHIPYARD_CLI_ARTIFACT}.gz --strip-components 1 --file-md5 --overwrite
     fi
 

appveyor.yml

@@ -30,6 +30,7 @@ init:
 
 install:
 - pip install -r requirements.txt
+- pip install --no-deps -r req_nodeps.txt
 - pip install flake8
 
 build: off
@@ -75,14 +76,15 @@ after_test:
     echo "Batch Shipyard CLI artifact not defined"
   ) ELSE (
     echo "Batch Shipyard CLI is %BATCH_SHIPYARD_CLI_ARITFACT% upload path %UPLOAD_PATH%" &&
-    pip install --upgrade blobxfer &&
     virtualenv -p "%PYTHON%\\python.exe" pyi &&
     pyi\\Scripts\\activate.bat &&
-    pip install --upgrade pyinstaller &&
-    pip install -r requirements.txt &&
+    pip install pyinstaller &&
+    pip install --upgrade -r requirements.txt &&
+    pip install --upgrade --no-deps -r req_nodeps.txt &&
     pyinstaller -F -n "%BATCH_SHIPYARD_CLI_ARITFACT%" -p batch-shipyard --add-data schemas;schemas --add-data scripts;scripts --exclude-module future.tests --exclude-module future.backports.test --exclude-module future.moves.test --distpath bin shipyard.py &&
     pyi\\Scripts\\deactivate.bat &&
     appveyor PushArtifact "bin\\%BATCH_SHIPYARD_CLI_ARITFACT%" &&
+    pip install --upgrade blobxfer &&
     blobxfer upload --remote-path %UPLOAD_PATH% --local-path bin\\%BATCH_SHIPYARD_CLI_ARITFACT% --strip-components 1 --file-md5 --overwrite
   )
 - ps: >-

convoy/data.py

@@ -59,7 +59,7 @@
 logger = logging.getLogger(__name__)
 util.setup_logger(logger)
 # global defines
-_BLOBXFER_VERSION = '1.1.0'
+_BLOBXFER_VERSION = '1.1.1'
 _MEGABYTE = 1048576
 _MAX_READ_BLOCKSIZE_BYTES = 4194304
 _FILE_SPLIT_PREFIX = '_shipyard-'

install.sh

@@ -233,7 +233,7 @@ if [ ! -z $VENV_NAME ]; then
         $PIP uninstall -y azure-storage
         set -e
         $PIP install --upgrade -r requirements.txt
-        $PIP install --no-deps -r req_nodeps.txt
+        $PIP install --upgrade --no-deps -r req_nodeps.txt
         deactivate
     else
         # create conda env
@@ -249,7 +249,7 @@ if [ ! -z $VENV_NAME ]; then
         $PIP uninstall -y azure-storage
         set -e
         $PIP install --upgrade -r requirements.txt
-        $PIP install --no-deps -r req_nodeps.txt
+        $PIP install --upgrade --no-deps -r req_nodeps.txt
         source deactivate $VENV_NAME
     fi
 else

requirements.txt

@@ -6,9 +6,10 @@ azure-mgmt-batch==5.0.0
 azure-mgmt-compute==3.1.0rc3
 azure-mgmt-network==1.7.1
 azure-mgmt-resource==1.2.2
+azure-storage-common==1.0.0
 azure-storage-blob==1.0.0
 azure-storage-file==1.0.0
-blobxfer==1.1.0
+blobxfer==1.1.1
 click==6.7
 future==0.16.0
 msrest==0.4.25