Skip to content

Commit

Permalink
Remove azure.storage.blob in import (#123)
Browse files Browse the repository at this point in the history
* remove storage import

* remove old python

* update extension version
  • Loading branch information
Juliehzl authored Jun 2, 2020
1 parent 14913ee commit 9c9e762
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 10 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
sudo: false
language: python
python:
- '2.7'
- '3.5'
- '3.6'
env:
- AZURE_EXTENSION_DIR=./.azure/devcliextensions
Expand Down
2 changes: 1 addition & 1 deletion azext/batch/_file_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from six.moves.urllib.parse import urlsplit # pylint: disable=import-error,relative-import
from six.moves.urllib.parse import quote # pylint: disable=import-error,no-name-in-module,relative-import

from azure.storage.blob import BlobPermissions, BlockBlobService
from azure.multiapi.storage.v2018_11_09.blob import BlobPermissions, BlockBlobService
from . import models

def construct_sas_url(blob, uri):
Expand Down
2 changes: 1 addition & 1 deletion azext/batch/batch_extensions_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from azure.batch import BatchServiceClient
from azure.mgmt.batch import BatchManagementClient
from azure.mgmt.storage import StorageManagementClient
from azure.storage.blob import BlockBlobService
from azure.multiapi.storage.v2018_11_09.blob import BlockBlobService
from azure.common.credentials import get_cli_profile

from .version import VERSION
Expand Down
2 changes: 1 addition & 1 deletion azext/batch/operations/file_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import os

from azure.batch.operations._file_operations import FileOperations
from azure.storage.blob.models import Include
from azure.multiapi.storage.v2018_11_09.blob.models import Include

from .. import _file_utils as file_utils

Expand Down
2 changes: 1 addition & 1 deletion batch-cli-extensions/azext_batch/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

VERSION = "5.0.1"
VERSION = "5.0.2"
4 changes: 2 additions & 2 deletions tests/test_extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
from msrest import Serializer, Deserializer
from azure.batch.operations._task_operations import TaskOperations
from azure.batch.operations._pool_operations import PoolOperations
from azure.storage.common import CloudStorageAccount
from azure.storage.blob.blockblobservice import BlockBlobService
from azure.multiapi.storage.v2018_11_09.common import CloudStorageAccount
from azure.multiapi.storage.v2018_11_09.blob.blockblobservice import BlockBlobService
from azure.batch.batch_auth import SharedKeyCredentials
from azure.batch.models import BatchErrorException, BatchError, TaskAddCollectionResult, TaskAddResult, TaskAddStatus
from azure.batch import models as base_sdk_models
Expand Down
4 changes: 2 additions & 2 deletions tests/test_live.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import azext.batch as batch
from tests.vcr_test_base import VCRTestBase
from azure.common import AzureMissingResourceHttpError
from azure.storage.common import CloudStorageAccount
from azure.storage.blob import BlobPermissions
from azure.multiapi.storage.v2018_11_09.common import CloudStorageAccount
from azure.multiapi.storage.v2018_11_09.blob import BlobPermissions

class TestFileUpload(VCRTestBase):
def __init__(self, test_method):
Expand Down

0 comments on commit 9c9e762

Please sign in to comment.