Update dependencies

- Update blobxfer to 1.5.0

cargo/requirements.txt

@@ -1,3 +1,3 @@
 azure-batch==4.1.3
-msrest==0.5.4
+msrest==0.5.5
 requests==2.19.1

cascade/requirements.txt

@@ -1,2 +1,2 @@
-azure-cosmosdb-table==1.0.4
+azure-cosmosdb-table==1.0.5
 azure-storage-blob==1.3.1

convoy/data.py

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

convoy/util.py

@@ -211,8 +211,6 @@ def merge_dict(dict1, dict2):
     :rtype: dict
     :return: merged dictionary
     """
-    if not isinstance(dict1, dict) or not isinstance(dict2, dict):
-        raise ValueError('dict1 or dict2 is not a dictionary')
     result = copy.deepcopy(dict1)
     for k, v in dict2.items():
         if k in result and isinstance(result[k], dict):

federation/requirements.txt

@@ -1,6 +1,6 @@
 azure-batch==4.1.3
-azure-cosmosdb-table==1.0.4
+azure-cosmosdb-table==1.0.5
-azure-mgmt-compute==4.0.1
+azure-mgmt-compute==4.1.0
 azure-mgmt-resource==2.0.0
 azure-mgmt-storage==2.0.0
 azure-storage-blob==1.3.1

heimdall/requirements.txt

@@ -1,7 +1,7 @@
 azure-batch==4.1.3
-azure-cosmosdb-table==1.0.4
+azure-cosmosdb-table==1.0.5
-azure-mgmt-compute==4.0.1
+azure-mgmt-compute==4.1.0
-azure-mgmt-network==2.0.0
+azure-mgmt-network==2.2.1
 azure-mgmt-resource==2.0.0
 azure-mgmt-storage==2.0.0
 msrestazure==0.5.0

requirements.txt

@@ -1,25 +1,25 @@
-adal==1.0.2
+adal==1.1.0
 azure-batch==4.1.3
-azure-cosmosdb-table==1.0.4
+azure-cosmosdb-table==1.0.5
-azure-keyvault==1.0.0
+azure-keyvault==1.1.0
 azure-mgmt-authorization==0.50.0
 azure-mgmt-batch==5.0.1
-azure-mgmt-compute==4.0.1
+azure-mgmt-compute==4.1.0
-azure-mgmt-network==2.0.0
+azure-mgmt-network==2.2.1
 azure-mgmt-resource==2.0.0
 azure-mgmt-storage==2.0.0
 azure-storage-blob==1.3.1
 azure-storage-file==1.3.1
 azure-storage-queue==1.3.0
-blobxfer==1.4.0
+blobxfer==1.5.0
 click==6.7
 future==0.16.0
 futures==3.2.0; python_version < '3'
 keyrings.alt==3.1
-msrest==0.5.4
+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.50
+ruamel.yaml==0.15.66
-scandir==1.8; python_version < '3.5'
+scandir==1.9.0; python_version < '3.5'

scripts/shipyard_nodeprep.sh

@@ -1192,7 +1192,7 @@ install_cascade_dependencies() {
     rm -f get-pip.py
     pip3 install --no-cache-dir --upgrade wheel setuptools
     pip3 install --no-cache-dir \
-        azure-cosmosdb-table==1.0.4 azure-storage-blob==1.3.1
+        azure-cosmosdb-table==1.0.5 azure-storage-blob==1.3.1
     # install cascade dependencies
     if [ $p2penabled -eq 1 ]; then
         install_packages python3-libtorrent pigz