Skip to content

Commit 17b3e20

Browse files
authored
Restrict marshmallow dependency to >=3.5,<4.0.0 for compatibility (#40574)
* Restrict marshmallow dependency to >=3.5,<4.0.0 for compatibility * puting upper restrictions * changed changelog * managing license * removing licensing line * revert this change * disabling pylint error * suppressing warnings pylint * updating changelog
1 parent e8ab016 commit 17b3e20

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

sdk/ml/azure-ai-ml/azure/ai/ml/_internal/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# ---------------------------------------------------------
22
# Copyright (c) Microsoft Corporation. All rights reserved.
33
# ---------------------------------------------------------
4+
# pylint:disable=unreachable
45

56
from ._setup import enable_internal_components_in_pipeline
67
from .entities import (
@@ -50,4 +51,4 @@
5051
"Pipeline",
5152
"Hemera",
5253
"InternalInput",
53-
]
54+
] # pylint: disable=unreachable

sdk/ml/azure-ai-ml/azure/ai/ml/_utils/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) Microsoft Corporation. All rights reserved.
33
# ---------------------------------------------------------
44

5-
# pylint: disable=protected-access,too-many-lines
5+
# pylint: disable=protected-access,too-many-lines,unreachable
66
import copy
77
import decimal
88
import hashlib
@@ -1083,7 +1083,7 @@ def try_enable_internal_components(*, force=False) -> bool:
10831083

10841084
enable_internal_components_in_pipeline(force=force)
10851085

1086-
return True
1086+
return True # pylint: disable=unreachable
10871087
return False
10881088

10891089

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_autogen_entities/_model_base.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Licensed under the MIT License. See License.txt in the project root for
55
# license information.
66
# --------------------------------------------------------------------------
7-
# pylint: disable=protected-access, broad-except
7+
# pylint: disable=protected-access, broad-except, no-member
88

99
import calendar
1010
import decimal
@@ -516,7 +516,7 @@ def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self:
516516
annotations = {
517517
k: v
518518
for mro_class in mros
519-
if hasattr(mro_class, "__annotations__")
519+
if hasattr(mro_class, "__annotations__") # pylint: disable=no-member
520520
for k, v in mro_class.__annotations__.items()
521521
}
522522
for attr, rf in attr_to_rest_field.items():
@@ -543,7 +543,7 @@ def _get_discriminator(cls, exist_discriminators) -> typing.Optional[str]:
543543

544544
@classmethod
545545
def _deserialize(cls, data, exist_discriminators):
546-
if not hasattr(cls, "__mapping__"):
546+
if not hasattr(cls, "__mapping__"): # pylint: disable=no-member
547547
return cls(data)
548548
discriminator = cls._get_discriminator(exist_discriminators)
549549
exist_discriminators.append(discriminator)

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_registry/registry_support_classes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ---------------------------------------------------------
22
# Copyright (c) Microsoft Corporation. All rights reserved.
33
# ---------------------------------------------------------
4-
# pylint:disable=protected-access,no-else-return
4+
# pylint:disable=protected-access,no-else-return,unreachable
55

66
from copy import deepcopy
77
from functools import reduce
@@ -270,4 +270,4 @@ def _storage_config_from_rest_object(
270270
error_type=ValidationErrorType.INVALID_VALUE,
271271
)
272272
log_and_raise_error(err)
273-
return None
273+
return None # pylint: disable=unreachable

sdk/ml/azure-ai-ml/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"msrest>=0.6.18",
7373
"azure-core>=1.23.0",
7474
"azure-mgmt-core>=1.3.0",
75-
"marshmallow>=3.5",
75+
"marshmallow>=3.5,<4.0.0",
7676
"jsonschema>=4.0.0",
7777
"tqdm",
7878
# Used for PR 825138

0 commit comments

Comments
 (0)