Update storage sdk from 0.33.0 to 1.1.0 (#439)

Azure · Mar 22, 2018 · f2eb1a4 · f2eb1a4
1 parent 8aa1843
commit f2eb1a4
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 5 deletions.
diff --git a/aztk/__init__.py b/aztk/__init__.py
@@ -1 +1,4 @@
+import logging
 
+# Azure storage is logging error in the console which make the CLI quite confusing
+logging.getLogger("azure.storage").setLevel(logging.CRITICAL)
diff --git a/aztk/utils/azure_api.py b/aztk/utils/azure_api.py
@@ -7,7 +7,7 @@
 from azure.common.credentials import ServicePrincipalCredentials
 from azure.mgmt.batch import BatchManagementClient
 from azure.mgmt.storage import StorageManagementClient
-from azure.storage import CloudStorageAccount
+from azure.storage.common import CloudStorageAccount
 from typing import Optional
 
 

diff --git a/node_scripts/core/config.py b/node_scripts/core/config.py
@@ -7,7 +7,7 @@
 from azure.common.credentials import ServicePrincipalCredentials
 from azure.mgmt.batch import BatchManagementClient
 from azure.mgmt.storage import StorageManagementClient
-from azure.storage import CloudStorageAccount
+from azure.storage.common import CloudStorageAccount
 
 
 

diff --git a/node_scripts/requirements.txt b/node_scripts/requirements.txt
@@ -1,5 +1,5 @@
 azure-batch==3.0.0
-azure-storage==0.33.0
+azure-storage-blob==1.1.0
 azure-mgmt-storage==1.5.0
 azure-mgmt-batch==5.0.0
 pyyaml==3.12

diff --git a/node_scripts/submit.py b/node_scripts/submit.py
@@ -1,5 +1,6 @@
 import sys
 import os
+import logging
 import yaml
 import subprocess
 import datetime
@@ -9,6 +10,8 @@
 from command_builder import CommandBuilder
 from core import config
 
+# limit azure.storage logging
+logging.getLogger("azure.storage").setLevel(logging.CRITICAL)
 
 '''
 Submit helper methods

diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,7 @@
 azure-batch==3.0.0
 azure-mgmt-batch==5.0.0
 azure-mgmt-storage==1.5.0
-azure-storage==0.33.0
+azure-storage-blob==1.1.0
 pyyaml==3.12
 pycryptodome==3.4.7
 paramiko==2.4.0

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@ def find_package_files(root, directory, dest=""):
         "azure-batch==3.0.0",
         "azure-mgmt-batch==5.0.0",
         "azure-mgmt-storage==1.5.0",
-        "azure-storage==0.33.0",
+        "azure-storage-blob==1.1.0",
         "pyyaml>=3.12",
         "pycryptodome>=3.4",
         "paramiko>=2.4",