diff --git a/ChangeLog.md b/ChangeLog.md index c6d447e2d62..61446c04fc8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,13 @@ # Change Log +### 2020-xx-xx - 5.1.0-preview.7 +Autorest Core version: 3.0.6302 +Modelerfour version: 4.15.400 + +**New Features** + +- Add `azure-mgmt-core` as a dependency in the generated setup.py file #738 + ### 2020-08-04 - 5.1.0-preview.6 Autorest Core version: 3.0.6287 Modelerfour version: 4.15.378 diff --git a/autorest/codegen/templates/setup.py.jinja2 b/autorest/codegen/templates/setup.py.jinja2 index 77058c0070c..403ea0d8d19 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<2.0.0,>=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, diff --git a/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py b/test/azure/Expected/AcceptanceTests/AzureSpecials/setup.py index 0c3ab650c5c..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"] +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 a39183691a4..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"] +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 09ee006da32..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"] +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 edeb06bd7dc..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"] +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 09ee006da32..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"] +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 4232d34d1b1..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"] +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 5ab9a2d5ec8..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"] +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 92295bd3597..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"] +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 d217d0079e1..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"] +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,