Skip to content

Commit 9731d15

Browse files
JuliehzlUbuntu
Juliehzl
and
Ubuntu
authored
{0.5.1} Fix import issue (#40)
* update shell * fix new api * upgrade version Co-authored-by: Ubuntu <zunli@zuhvm.etyrgwjlsqfeplvzbzef2qjagg.cbnx.internal.cloudapp.net>
1 parent 57215af commit 9731d15

15 files changed

+35
-27
lines changed

‎README.rst

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Handles multi-API versions of Azure Storage Data Plane originally from https://g
1717

1818
Change Log
1919
----------
20+
0.5.1
21+
+++++
22+
* Fix import issue for filedatalake
23+
2024
0.5.0
2125
+++++
2226
* Add new api support for azure-multiapi-storagev2:

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/_data_lake_lease.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Union, Optional, Any,
1111
TypeVar, TYPE_CHECKING
1212
)
13-
from azure.multiapi.storagev2.blob.v2019_07_07 import BlobLeaseClient
13+
from azure.multiapi.storagev2.blob.v2020_02_10 import BlobLeaseClient
1414

1515

1616
if TYPE_CHECKING:

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/_data_lake_service_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from azure.core.paging import ItemPaged
1313

14-
from azure.multiapi.storagev2.blob.v2019_07_07 import BlobServiceClient
14+
from azure.multiapi.storagev2.blob.v2020_02_10 import BlobServiceClient
1515
from ._shared.base_client import StorageAccountHostsMixin, parse_query, parse_connection_str
1616
from ._file_system_client import FileSystemClient
1717
from ._data_lake_directory_client import DataLakeDirectoryClient

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/_file_system_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import six
1515
from azure.core.paging import ItemPaged
16-
from azure.multiapi.storagev2.blob.v2019_07_07 import ContainerClient
16+
from azure.multiapi.storagev2.blob.v2020_02_10 import ContainerClient
1717
from ._shared.base_client import StorageAccountHostsMixin, parse_query, parse_connection_str
1818
from ._serialize import convert_dfs_url_to_blob_url
1919
from ._models import LocationMode, FileSystemProperties, PublicAccess

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/_models.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
# pylint: disable=super-init-not-called, too-many-lines
88
from enum import Enum
99

10-
from azure.multiapi.storagev2.blob.v2019_07_07 import LeaseProperties as BlobLeaseProperties
11-
from azure.multiapi.storagev2.blob.v2019_07_07 import AccountSasPermissions as BlobAccountSasPermissions
12-
from azure.multiapi.storagev2.blob.v2019_07_07 import ResourceTypes as BlobResourceTypes
13-
from azure.multiapi.storagev2.blob.v2019_07_07 import UserDelegationKey as BlobUserDelegationKey
14-
from azure.multiapi.storagev2.blob.v2019_07_07 import ContentSettings as BlobContentSettings
15-
from azure.multiapi.storagev2.blob.v2019_07_07 import AccessPolicy as BlobAccessPolicy
16-
from azure.multiapi.storagev2.blob.v2019_07_07 import DelimitedTextDialect as BlobDelimitedTextDialect
17-
from azure.multiapi.storagev2.blob.v2019_07_07 import DelimitedJsonDialect as BlobDelimitedJSON
18-
from azure.multiapi.storagev2.blob.v2019_07_07 import ArrowDialect as BlobArrowDialect
19-
from azure.multiapi.storagev2.blob.v2019_07_07._models import ContainerPropertiesPaged
10+
from azure.multiapi.storagev2.blob.v2020_02_10 import LeaseProperties as BlobLeaseProperties
11+
from azure.multiapi.storagev2.blob.v2020_02_10 import AccountSasPermissions as BlobAccountSasPermissions
12+
from azure.multiapi.storagev2.blob.v2020_02_10 import ResourceTypes as BlobResourceTypes
13+
from azure.multiapi.storagev2.blob.v2020_02_10 import UserDelegationKey as BlobUserDelegationKey
14+
from azure.multiapi.storagev2.blob.v2020_02_10 import ContentSettings as BlobContentSettings
15+
from azure.multiapi.storagev2.blob.v2020_02_10 import AccessPolicy as BlobAccessPolicy
16+
from azure.multiapi.storagev2.blob.v2020_02_10 import DelimitedTextDialect as BlobDelimitedTextDialect
17+
from azure.multiapi.storagev2.blob.v2020_02_10 import DelimitedJsonDialect as BlobDelimitedJSON
18+
from azure.multiapi.storagev2.blob.v2020_02_10 import ArrowDialect as BlobArrowDialect
19+
from azure.multiapi.storagev2.blob.v2020_02_10._models import ContainerPropertiesPaged
2020
from ._shared.models import DictMixin
2121

2222

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/_path_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import six
1414

1515
from azure.core.exceptions import AzureError
16-
from azure.multiapi.storagev2.blob.v2019_07_07 import BlobClient
16+
from azure.multiapi.storagev2.blob.v2020_02_10 import BlobClient
1717
from ._data_lake_lease import DataLakeLeaseClient
1818
from ._deserialize import process_storage_error
1919
from ._generated import DataLakeStorageClient

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/_serialize.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under the MIT License. See License.txt in the project root for
44
# license information.
55
# --------------------------------------------------------------------------
6-
from azure.multiapi.storagev2.blob.v2019_07_07._serialize import _get_match_headers # pylint: disable=protected-access
6+
from azure.multiapi.storagev2.blob.v2020_02_10._serialize import _get_match_headers # pylint: disable=protected-access
77
from ._shared import encode_base64
88
from ._generated.models import ModifiedAccessConditions, PathHTTPHeaders, \
99
SourceModifiedAccessConditions, LeaseAccessConditions

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/_shared_access_signature.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# --------------------------------------------------------------------------
66
from typing import TYPE_CHECKING
77

8-
from azure.multiapi.storagev2.blob.v2019_07_07 import generate_account_sas as generate_blob_account_sas
9-
from azure.multiapi.storagev2.blob.v2019_07_07 import generate_container_sas, generate_blob_sas
8+
from azure.multiapi.storagev2.blob.v2020_02_10 import generate_account_sas as generate_blob_account_sas
9+
from azure.multiapi.storagev2.blob.v2020_02_10 import generate_container_sas, generate_blob_sas
1010
if TYPE_CHECKING:
1111
import datetime
1212
from ._models import AccountSasPermissions, FileSystemSasPermissions, FileSasPermissions, ResourceTypes, \

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/aio/_data_lake_lease_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Union, Optional, Any,
1010
TypeVar, TYPE_CHECKING
1111
)
12-
from azure.multiapi.storagev2.blob.v2019_07_07.aio import BlobLeaseClient
12+
from azure.multiapi.storagev2.blob.v2020_02_10.aio import BlobLeaseClient
1313
from .._data_lake_lease import DataLakeLeaseClient as DataLakeLeaseClientBase
1414

1515

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/aio/_data_lake_service_client_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from azure.core.paging import ItemPaged
99

10-
from azure.multiapi.storagev2.blob.v2019_07_07.aio import BlobServiceClient
10+
from azure.multiapi.storagev2.blob.v2020_02_10.aio import BlobServiceClient
1111
from .._generated.aio import DataLakeStorageClient
1212
from .._shared.base_client_async import AsyncStorageAccountHostsMixin
1313
from ._file_system_client_async import FileSystemClient

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/aio/_file_system_client_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from azure.core.async_paging import AsyncItemPaged
1717

1818
from azure.core.tracing.decorator_async import distributed_trace_async
19-
from azure.multiapi.storagev2.blob.v2019_07_07.aio import ContainerClient
19+
from azure.multiapi.storagev2.blob.v2020_02_10.aio import ContainerClient
2020

2121
from ._data_lake_file_client_async import DataLakeFileClient
2222
from ._data_lake_directory_client_async import DataLakeDirectoryClient

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/aio/_models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# pylint: disable=too-few-public-methods, too-many-instance-attributes
77
# pylint: disable=super-init-not-called, too-many-lines
88
from azure.core.async_paging import AsyncPageIterator
9-
from azure.multiapi.storagev2.blob.v2019_07_07.aio._models import ContainerPropertiesPaged
9+
from azure.multiapi.storagev2.blob.v2020_02_10.aio._models import ContainerPropertiesPaged
1010

1111
from .._deserialize import return_headers_and_deserialized_path_list, process_storage_error
1212
from .._generated.models import StorageErrorException, Path

‎azure/multiapi/storagev2/filedatalake/v2020_02_10/aio/_path_client_async.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# --------------------------------------------------------------------------
66
# pylint: disable=invalid-overridden-method
77
from azure.core.exceptions import AzureError
8-
from azure.multiapi.storagev2.blob.v2019_07_07.aio import BlobClient
8+
from azure.multiapi.storagev2.blob.v2020_02_10.aio import BlobClient
99
from .._shared.base_client_async import AsyncStorageAccountHostsMixin
1010
from .._path_client import PathClient as PathClientBase
1111
from .._models import DirectoryProperties, AccessControlChangeResult, AccessControlChangeFailure, \

‎scripts/updatev2_1.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cd $workdir
88
if [ ! -d venv ]; then
99
python -m virtualenv venv
1010
. venv/bin/activate
11-
pip install azure-storage-file-datalake azure-storage-blob azure-storage-file-share azure-storage-queue -U
11+
pip install azure-storage-file-datalake==12.2.0b1 azure-storage-blob==12.6.0b1 azure-storage-file-share azure-storage-queue -U
1212
fi
1313

1414

@@ -34,9 +34,13 @@ for service in blob fileshare filedatalake queue; do
3434

3535
if [ "$service" = "filedatalake" ]; then
3636
echo "filedatalake"
37-
38-
sed -i "s/from azure.storage.blob import/from azure.multiapi.storagev2.blob.v2019_07_07 import/g" $f
39-
sed -i "s/from azure.storage.blob./from azure.multiapi.storagev2.blob.v2019_07_07./g" $f
37+
default="2019_07_07"
38+
if [[ "$ver" > "$default" ]]; then
39+
default=$ver
40+
fi
41+
42+
sed -i "s/from azure.storage.blob import/from azure.multiapi.storagev2.blob.v$default import/g" $f
43+
sed -i "s/from azure.storage.blob./from azure.multiapi.storagev2.blob.v$default./g" $f
4044
fi
4145

4246
namespace=azure.storage.$service

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
setup(
3737
name='azure-multiapi-storage',
38-
version='0.5.0',
38+
version='0.5.1',
3939
description='Microsoft Azure Storage Client Library for Python with multi API version support.',
4040
long_description=open('README.rst', 'r').read(),
4141
license='MIT',

0 commit comments

Comments
 (0)