diff --git a/ChangeLog.md b/ChangeLog.md index ef3e87162ae..d595f639418 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,6 @@ # Change Log -### 2022-03-xx - 5.13.1 +### 2022-03-08 - 5.14.0 | Library | Min Version | | ----------------------------------------------------------------------- | ----------- | @@ -12,7 +12,7 @@ **New Features** -- Add flag `--package-mode` to generate necessary files for package #1154 +- Add flag `--package-mode=mgmtplane|dataplane|` to generate necessary files for package #1154 **Bug Fixes** diff --git a/autorest/codegen/__init__.py b/autorest/codegen/__init__.py index f2a3db96e5a..31eac0f1f1f 100644 --- a/autorest/codegen/__init__.py +++ b/autorest/codegen/__init__.py @@ -130,7 +130,7 @@ def _build_exceptions_set(yaml_data: List[Dict[str, Any]]) -> Set[int]: @staticmethod def _build_package_dependency() -> Dict[str, str]: return { - "dependency_azure_mgmt_core": "azure-mgmt-core>=1.3.0,<2.0.0", + "dependency_azure_mgmt_core": "azure-mgmt-core<2.0.0,>=1.3.0", "dependency_azure_core": "azure-core<2.0.0,>=1.20.1", "dependency_msrest": "msrest>=0.6.21", } diff --git a/docs/samples/specification/management/generated/setup.py b/docs/samples/specification/management/generated/setup.py index 0a6c6b70f01..1127bdbdef3 100644 --- a/docs/samples/specification/management/generated/setup.py +++ b/docs/samples/specification/management/generated/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/package.json b/package.json index bfabd5c146f..e2019493235 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@autorest/python", - "version": "5.13.0", + "version": "5.14.0", "description": "The Python extension for generators in AutoRest.", "scripts": { "prepare": "node run-python3.js prepare.py", diff --git a/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/setup.py b/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/setup.py index 3749158c9d6..588c0928a33 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/AzureSpecials/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/setup.py b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/setup.py index 57ef5d093ed..36d18039da8 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/CustomPollerPager/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Long-running Operation for AutoRest. diff --git a/test/azure/legacy/Expected/AcceptanceTests/Head/setup.py b/test/azure/legacy/Expected/AcceptanceTests/Head/setup.py index 6214b085c5e..2d5c8ce521e 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Head/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Head/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/setup.py b/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/setup.py index 03877a39fb7..ca539f5fedd 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/HeadExceptions/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py b/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py index 6214b085c5e..2d5c8ce521e 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/legacy/Expected/AcceptanceTests/Lro/setup.py b/test/azure/legacy/Expected/AcceptanceTests/Lro/setup.py index 72094e6022c..a23b82574da 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/Lro/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/Lro/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Long-running Operation for AutoRest. diff --git a/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/setup.py b/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/setup.py index 66b58fddf53..0a0f9655216 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/PackageModeMgmtPlane/setup.py @@ -60,7 +60,7 @@ ), install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], python_requires=">=3.6", ) diff --git a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/setup.py b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/setup.py index f5b20e508d4..6ec8f453e89 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/StorageManagementClient/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ StorageManagementClient. diff --git a/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py b/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py index ae89cf44ecf..5f4a1e0fbf4 100644 --- a/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py +++ b/test/azure/legacy/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Some cool documentation. diff --git a/test/azure/low-level/Expected/AcceptanceTests/AzureSpecialsLowLevel/setup.py b/test/azure/low-level/Expected/AcceptanceTests/AzureSpecialsLowLevel/setup.py index 3749158c9d6..588c0928a33 100644 --- a/test/azure/low-level/Expected/AcceptanceTests/AzureSpecialsLowLevel/setup.py +++ b/test/azure/low-level/Expected/AcceptanceTests/AzureSpecialsLowLevel/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/low-level/Expected/AcceptanceTests/HeadExceptionsLowLevel/setup.py b/test/azure/low-level/Expected/AcceptanceTests/HeadExceptionsLowLevel/setup.py index 03877a39fb7..ca539f5fedd 100644 --- a/test/azure/low-level/Expected/AcceptanceTests/HeadExceptionsLowLevel/setup.py +++ b/test/azure/low-level/Expected/AcceptanceTests/HeadExceptionsLowLevel/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/low-level/Expected/AcceptanceTests/HeadLowLevel/setup.py b/test/azure/low-level/Expected/AcceptanceTests/HeadLowLevel/setup.py index 6214b085c5e..2d5c8ce521e 100644 --- a/test/azure/low-level/Expected/AcceptanceTests/HeadLowLevel/setup.py +++ b/test/azure/low-level/Expected/AcceptanceTests/HeadLowLevel/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/low-level/Expected/AcceptanceTests/LroLowLevel/setup.py b/test/azure/low-level/Expected/AcceptanceTests/LroLowLevel/setup.py index 72094e6022c..a23b82574da 100644 --- a/test/azure/low-level/Expected/AcceptanceTests/LroLowLevel/setup.py +++ b/test/azure/low-level/Expected/AcceptanceTests/LroLowLevel/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Long-running Operation for AutoRest. diff --git a/test/azure/low-level/Expected/AcceptanceTests/StorageManagementClientLowLevel/setup.py b/test/azure/low-level/Expected/AcceptanceTests/StorageManagementClientLowLevel/setup.py index f5b20e508d4..6ec8f453e89 100644 --- a/test/azure/low-level/Expected/AcceptanceTests/StorageManagementClientLowLevel/setup.py +++ b/test/azure/low-level/Expected/AcceptanceTests/StorageManagementClientLowLevel/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ StorageManagementClient. diff --git a/test/azure/low-level/Expected/AcceptanceTests/SubscriptionIdApiVersionLowLevel/setup.py b/test/azure/low-level/Expected/AcceptanceTests/SubscriptionIdApiVersionLowLevel/setup.py index ae89cf44ecf..5f4a1e0fbf4 100644 --- a/test/azure/low-level/Expected/AcceptanceTests/SubscriptionIdApiVersionLowLevel/setup.py +++ b/test/azure/low-level/Expected/AcceptanceTests/SubscriptionIdApiVersionLowLevel/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Some cool documentation. diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/setup.py b/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/setup.py index 3749158c9d6..588c0928a33 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/setup.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/AzureSpecialsVersionTolerant/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/setup.py b/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/setup.py index acacbff9836..c7878907a8c 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/setup.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/CustomPollerPagerVersionTolerant/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Long-running Operation for AutoRest. diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/setup.py b/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/setup.py index 03877a39fb7..ca539f5fedd 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/setup.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/HeadExceptionsVersionTolerant/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/setup.py b/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/setup.py index 6214b085c5e..2d5c8ce521e 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/setup.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/HeadVersionTolerant/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Test Infrastructure for AutoRest. diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/setup.py b/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/setup.py index 72094e6022c..a23b82574da 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/setup.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/LroVersionTolerant/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Long-running Operation for AutoRest. diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/setup.py b/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/setup.py index f5b20e508d4..6ec8f453e89 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/setup.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/StorageManagementClientVersionTolerant/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ StorageManagementClient. diff --git a/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/setup.py b/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/setup.py index ae89cf44ecf..5f4a1e0fbf4 100644 --- a/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/setup.py +++ b/test/azure/version-tolerant/Expected/AcceptanceTests/SubscriptionIdApiVersionVersionTolerant/setup.py @@ -22,7 +22,7 @@ include_package_data=True, install_requires=[ "msrest>=0.6.21", - "azure-mgmt-core>=1.3.0,<2.0.0", + "azure-mgmt-core<2.0.0,>=1.3.0", ], long_description="""\ Some cool documentation.