Update dependencies

- Update blobxfer to 1.5.3
- Resolves #243

cargo/requirements.txt

@@ -1,3 +1,3 @@
-azure-batch==5.1.0
+azure-batch==5.1.1
 msrest==0.5.5
-requests==2.19.1
+requests==2.20.0

convoy/data.py

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

federation/requirements.txt

@@ -1,10 +1,10 @@
-azure-batch==5.1.0
+azure-batch==5.1.1
 azure-cosmosdb-table==1.0.5
-azure-mgmt-compute==4.1.0
+azure-mgmt-compute==4.3.1
 azure-mgmt-resource==2.0.0
-azure-mgmt-storage==2.0.0
+azure-mgmt-storage==3.0.0
 azure-storage-blob==1.3.1
 azure-storage-queue==1.3.0
 msrestazure==0.5.0
-python-dateutil==2.7.3
-requests==2.19.1
+python-dateutil==2.7.5
+requests==2.20.0

heimdall/requirements.txt

@@ -1,8 +1,8 @@
-azure-batch==5.1.0
+azure-batch==5.1.1
 azure-cosmosdb-table==1.0.5
-azure-mgmt-compute==4.1.0
+azure-mgmt-compute==4.3.1
 azure-mgmt-network==2.2.1
 azure-mgmt-resource==2.0.0
-azure-mgmt-storage==2.0.0
+azure-mgmt-storage==3.0.0
 msrestazure==0.5.0
-requests==2.19.1
+requests==2.20.0

install.cmd

@@ -2,32 +2,32 @@
 
 REM check for argument
 IF [%1] EQU [] (
-	echo Usage: install.cmd [virtual env name] [optional: path to python.exe]
-	exit /b 1
+    echo Usage: install.cmd [virtual env name] [optional: path to python.exe]
+    exit /b 1
 )
 IF %~1 == shipyard.cmd (
-	echo "shipyard.cmd" cannot be specified as the virtual environment name.
-	exit /b 1
+    echo "shipyard.cmd" cannot be specified as the virtual environment name.
+    exit /b 1
 )
 SET VENVNAME=%~1
 
 REM set python to use
 IF [%2] NEQ [] (
-	SET PYTHON=%~2
+    SET PYTHON=%~2
 ) ELSE (
-	FOR /f %%i in ('where python.exe') do SET PYTHON="%%i"
+    FOR /f %%i in ('where python.exe') do SET PYTHON="%%i"
 )
 IF NOT DEFINED PYTHON (
-	echo Python not found. Please ensure python.exe is in your PATH.
-	exit /b 1
+    echo Python not found. Please ensure python.exe is in your PATH.
+    exit /b 1
 )
 echo Using python from %PYTHON%
 
 REM check that shipyard.py is in cwd
 SET SHIPYARDFILE="%cd%\shipyard.py"
 IF NOT EXIST %SHIPYARDFILE% (
-	echo shipyard.py does not exist in current working directory. Please run installer from Batch Shipyard root.
-	exit /b 1
+    echo shipyard.py does not exist in current working directory. Please run installer from Batch Shipyard root.
+    exit /b 1
 )
 
 REM check for anaconda
@@ -36,43 +36,47 @@ SET /P PYTHONVER=<.pyver.txt
 del .pyver.txt
 SET ANACONDA=0
 IF NOT "%PYTHONVER%"=="%PYTHONVER:anaconda=%" (
-	echo Anaconda detected.
-	SET ANACONDA=1
+    echo Anaconda detected.
+    SET ANACONDA=1
 )
 IF NOT "%PYTHONVER%"=="%PYTHONVER:continuum=%" (
-	echo Anaconda detected.
-	SET ANACONDA=1
+    echo Anaconda detected.
+    SET ANACONDA=1
 )
 IF NOT "%PYTHONVER%"=="%PYTHONVER:conda-forge=%" (
-	echo Anaconda detected.
-	SET ANACONDA=1
+    echo Anaconda detected.
+    SET ANACONDA=1
 )
 
 REM install env and requirements
 IF %ANACONDA% EQU 1 (
-	echo Performing install for Anaconda.
-	conda create --yes --name %VENVNAME%
-	cmd.exe /c "activate %VENVNAME% & conda install --yes pip & pip install --upgrade -r requirements.txt & deactivate %VENVNAME%"
+    echo Performing install for Anaconda.
+    conda create --yes --name %VENVNAME%
+    cmd.exe /c "activate %VENVNAME% & conda install --yes pip & pip install --upgrade -r requirements.txt & deactivate %VENVNAME%"
 ) ELSE (
-	echo Performing install for Python.
-	pip install --upgrade virtualenv
-	IF ERRORLEVEL 1 (
-		echo "pip install virtualenv failed"
-		exit /b 1
-	)
-	virtualenv -p %PYTHON% %VENVNAME%
-	cmd.exe /c "%VENVNAME%\Scripts\activate & pip uninstall -y azure-storage & deactivate"
-	cmd.exe /c "%VENVNAME%\Scripts\activate & pip install --upgrade -r requirements.txt & deactivate"
-	cmd.exe /c "%VENVNAME%\Scripts\activate & pip install --upgrade --no-deps -r req_nodeps.txt & deactivate"
+    echo Performing install for Python.
+    pip install --upgrade virtualenv
+    IF ERRORLEVEL 1 (
+        echo "pip install virtualenv failed"
+        exit /b 1
+    )
+    virtualenv -p %PYTHON% %VENVNAME%
+    call "%VENVNAME%\Scripts\activate.bat"
+    pip uninstall -y azure-storage
+    pip install --upgrade -r requirements.txt
+    pip install --upgrade --no-deps -r req_nodeps.txt
+    call "%VENVNAME%\Scripts\deactivate.bat"
 )
 
 REM create launcher cmd
 SET CMDFILE=shipyard.cmd
 (echo @echo off) > %CMDFILE%
 IF %ANACONDA% EQU 1 (
-	(echo activate %VENVNAME% ^& python %SHIPYARDFILE% %%* ^& deactivate %VENVNAME%) >> %CMDFILE%
+    (echo activate %VENVNAME% ^& python %SHIPYARDFILE% %%* ^& deactivate %VENVNAME%) >> %CMDFILE%
 ) ELSE (
-	(echo "%cd%\%VENVNAME%\Scripts\activate" ^& python %SHIPYARDFILE% %%* ^& deactivate) >> %CMDFILE%
+    echo call "%cd%\%VENVNAME%\Scripts\activate.bat" >> %CMDFILE%
+    echo python %SHIPYARDFILE% %%* >> %CMDFILE%
+    echo deactivate >> %CMDFILE%
 )
 
 echo Installation complete. Run Batch Shipyard as: %cd%\shipyard.cmd

req_nodeps.txt

@@ -1 +1 @@
-pykwalify==1.6.1
+pykwalify==1.7.0

requirements.txt

@@ -1,25 +1,25 @@
-adal==1.1.0
-azure-batch==5.1.0
+adal==1.2.0
+azure-batch==5.1.1
 azure-cosmosdb-table==1.0.5
 azure-keyvault==1.1.0
 azure-mgmt-authorization==0.50.0
 azure-mgmt-batch==5.0.1
-azure-mgmt-compute==4.1.0
+azure-mgmt-compute==4.3.1
 azure-mgmt-network==2.2.1
 azure-mgmt-resource==2.0.0
-azure-mgmt-storage==2.0.0
+azure-mgmt-storage==3.0.0
 azure-storage-blob==1.3.1
 azure-storage-file==1.3.1
 azure-storage-queue==1.3.0
-blobxfer==1.5.0
-click==6.7
-future==0.16.0
+blobxfer==1.5.3
+click==7.0
+future==0.17.0
 futures==3.2.0; python_version < '3'
 keyrings.alt==3.1
 msrest==0.5.5
 msrestazure==0.5.0
 pathlib2==2.3.2; python_version < '3.5'
-python-dateutil==2.7.3
-requests==2.19.1
-ruamel.yaml==0.15.66
+python-dateutil==2.7.5
+requests==2.20.0
+ruamel.yaml==0.15.75
 scandir==1.9.0; python_version < '3.5'