From 3833b2d66a210173ebec229c57b2a4c542348d5c Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 3 Aug 2020 16:50:50 -0400 Subject: [PATCH 1/4] add azure-mgmt-core dependency in setup.py if azure-arm is true --- autorest/codegen/templates/setup.py.jinja2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autorest/codegen/templates/setup.py.jinja2 b/autorest/codegen/templates/setup.py.jinja2 index 77058c0070c..bcc6aef88b8 100644 --- a/autorest/codegen/templates/setup.py.jinja2 +++ b/autorest/codegen/templates/setup.py.jinja2 @@ -1,4 +1,5 @@ {% set name = code_model.options["package_name"] or code_model.class_name %} +{% set azure_mgmt_core_import = ', "azure-mgmt-core>=1.2.0"' if code_model.options["azure_arm"] else "" %} # coding=utf-8 {{ code_model.options['license_header'] }} # coding: utf-8 @@ -15,7 +16,7 @@ VERSION = "{{ code_model.options.get('package_version', '0.0.0') }}" # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"{{ azure_mgmt_core_import }}] setup( name=NAME, From e901730c37714705f9d3e7e2b3d830e349afd275 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 3 Aug 2020 16:50:58 -0400 Subject: [PATCH 2/4] regenerate --- test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py | 2 +- test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py | 2 +- test/azure/Expected/AcceptanceTests/Head/setup.py | 2 +- test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py | 2 +- .../AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py | 2 +- test/azure/Expected/AcceptanceTests/Lro/setup.py | 2 +- test/azure/Expected/AcceptanceTests/Paging/setup.py | 2 +- .../Expected/AcceptanceTests/StorageManagementClient/setup.py | 2 +- .../Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py index 0c3ab650c5c..5f13a7e81c5 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py index a39183691a4..f106695df3d 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/Head/setup.py b/test/azure/Expected/AcceptanceTests/Head/setup.py index 09ee006da32..6a0f39bf81c 100644 --- a/test/azure/Expected/AcceptanceTests/Head/setup.py +++ b/test/azure/Expected/AcceptanceTests/Head/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py index edeb06bd7dc..2d50f469659 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py index 09ee006da32..6a0f39bf81c 100644 --- a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/Lro/setup.py b/test/azure/Expected/AcceptanceTests/Lro/setup.py index 4232d34d1b1..3b31bfabc9f 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/setup.py +++ b/test/azure/Expected/AcceptanceTests/Lro/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/Paging/setup.py b/test/azure/Expected/AcceptanceTests/Paging/setup.py index 5ab9a2d5ec8..c91184f742c 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/setup.py +++ b/test/azure/Expected/AcceptanceTests/Paging/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/setup.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/setup.py index 92295bd3597..3e4b7b1d3ad 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/setup.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py index d217d0079e1..293aa9ccb8c 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] setup( name=NAME, From 260b6ad4df1a23b85998aeff399fbb147c7b2a3d Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 3 Aug 2020 16:53:57 -0400 Subject: [PATCH 3/4] update changelog --- ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.md b/ChangeLog.md index b39aee89faa..bd7dc7b51c9 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -7,6 +7,7 @@ Modelerfour version: 4.15.378 **New Features** - Add support for `x-ms-text` XML extension #722 +- Add `azure-mgmt-core` as a dependency in the generated setup.py file #738 **Bug Fixes** From 9c5bc36559d36cdab0222e52ec261e54b1e51276 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 5 Aug 2020 10:40:42 -0400 Subject: [PATCH 4/4] add upper limit for azure-mgmt-core dependency --- autorest/codegen/templates/setup.py.jinja2 | 2 +- test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py | 2 +- test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py | 2 +- test/azure/Expected/AcceptanceTests/Head/setup.py | 2 +- test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py | 2 +- .../AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py | 2 +- test/azure/Expected/AcceptanceTests/Lro/setup.py | 2 +- test/azure/Expected/AcceptanceTests/Paging/setup.py | 2 +- .../Expected/AcceptanceTests/StorageManagementClient/setup.py | 2 +- .../Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/autorest/codegen/templates/setup.py.jinja2 b/autorest/codegen/templates/setup.py.jinja2 index bcc6aef88b8..403ea0d8d19 100644 --- a/autorest/codegen/templates/setup.py.jinja2 +++ b/autorest/codegen/templates/setup.py.jinja2 @@ -1,5 +1,5 @@ {% set name = code_model.options["package_name"] or code_model.class_name %} -{% set azure_mgmt_core_import = ', "azure-mgmt-core>=1.2.0"' if code_model.options["azure_arm"] else "" %} +{% set azure_mgmt_core_import = ', "azure-mgmt-core<2.0.0,>=1.2.0"' if code_model.options["azure_arm"] else "" %} # coding=utf-8 {{ code_model.options['license_header'] }} # coding: utf-8 diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py index 5f13a7e81c5..7bcbe17f2d2 100644 --- a/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py +++ b/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py index f106695df3d..c93f1c36b1d 100644 --- a/test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py +++ b/test/azure/Expected/AcceptanceTests/CustomUrlPaging/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/Head/setup.py b/test/azure/Expected/AcceptanceTests/Head/setup.py index 6a0f39bf81c..144696cbbff 100644 --- a/test/azure/Expected/AcceptanceTests/Head/setup.py +++ b/test/azure/Expected/AcceptanceTests/Head/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py b/test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py index 2d50f469659..458ee98f8b2 100644 --- a/test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py +++ b/test/azure/Expected/AcceptanceTests/HeadExceptions/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py index 6a0f39bf81c..144696cbbff 100644 --- a/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py +++ b/test/azure/Expected/AcceptanceTests/HeadWithAzureKeyCredentialPolicy/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/Lro/setup.py b/test/azure/Expected/AcceptanceTests/Lro/setup.py index 3b31bfabc9f..3c2114d060d 100644 --- a/test/azure/Expected/AcceptanceTests/Lro/setup.py +++ b/test/azure/Expected/AcceptanceTests/Lro/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/Paging/setup.py b/test/azure/Expected/AcceptanceTests/Paging/setup.py index c91184f742c..6a56419b6cf 100644 --- a/test/azure/Expected/AcceptanceTests/Paging/setup.py +++ b/test/azure/Expected/AcceptanceTests/Paging/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/StorageManagementClient/setup.py b/test/azure/Expected/AcceptanceTests/StorageManagementClient/setup.py index 3e4b7b1d3ad..ad52e680371 100644 --- a/test/azure/Expected/AcceptanceTests/StorageManagementClient/setup.py +++ b/test/azure/Expected/AcceptanceTests/StorageManagementClient/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME, diff --git a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py index 293aa9ccb8c..a47e41e1b54 100644 --- a/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py +++ b/test/azure/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py @@ -19,7 +19,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools -REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core>=1.2.0"] +REQUIRES = ["msrest>=0.6.0", "azure-core<2.0.0,>=1.2.0", "azure-mgmt-core<2.0.0,>=1.2.0"] setup( name=NAME,