From 21a5d1f60d3811195ea0ab383f8390326babcdc5 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 1 Dec 2021 16:53:22 -0800 Subject: [PATCH 1/3] update packaging tool --- .../azure-applicationinsights/sdk_packaging.toml | 1 + sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml | 1 - sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml | 1 - sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml | 1 - sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml | 1 - .../azure-mgmt-azurestackhci/sdk_packaging.toml | 1 - .../azure-mgmt-baremetalinfrastructure/sdk_packaging.toml | 2 -- tools/azure-sdk-tools/packaging_tools/__init__.py | 5 ++++- .../packaging_tools/templates/{LICENSE.txt => LICENSE} | 6 +++--- tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in | 2 +- tools/azure-sdk-tools/packaging_tools/templates/setup.py | 1 + 11 files changed, 10 insertions(+), 12 deletions(-) rename tools/azure-sdk-tools/packaging_tools/templates/{LICENSE.txt => LICENSE} (89%) diff --git a/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml b/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml index 63f0951e6a3..65322fc8f69 100644 --- a/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml +++ b/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml @@ -4,3 +4,4 @@ package_pprint_name = "Application Insights" package_doc_id = "" is_stable = false is_arn = false +auto_update = false diff --git a/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml b/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml index 1d7edd47be3..f2b6c449b94 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml +++ b/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml @@ -5,4 +5,3 @@ package_pprint_name = "Appplatform Management" package_doc_id = "" is_stable = false is_arm = true -need_msrestazure = true diff --git a/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml b/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml index 00288928243..0636d04fc34 100644 --- a/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml +++ b/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml @@ -5,4 +5,3 @@ package_pprint_name = "MyService Management" package_doc_id = "" is_stable = false is_arm = true -need_msrestazure = true diff --git a/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml b/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml index 0cbc63c7cc8..cdedb80cf59 100644 --- a/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml +++ b/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml @@ -5,4 +5,3 @@ package_pprint_name = "Auto Manage Management" package_doc_id = "" is_stable = false is_arm = true -need_msrestazure = true diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml b/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml index 9dc8ef5f830..ab0abb5acba 100644 --- a/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml +++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml @@ -5,4 +5,3 @@ package_pprint_name = "Azureadb2c Management" package_doc_id = "" is_stable = false is_arm = true -need_msrestazure = true diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml b/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml index a4878bb809c..80466016f66 100644 --- a/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml +++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml @@ -5,4 +5,3 @@ package_pprint_name = "AzureStackHCI Management" package_doc_id = "" is_stable = false is_arm = true -need_msrestazure = true diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml index 9d80c14d060..bcb8422d76f 100644 --- a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml +++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml @@ -5,5 +5,3 @@ package_pprint_name = "Baremetalinfrastructure Management" package_doc_id = "" is_stable = false is_arm = true -need_msrestazure = true -need_azuremgmtcore = true diff --git a/tools/azure-sdk-tools/packaging_tools/__init__.py b/tools/azure-sdk-tools/packaging_tools/__init__.py index 67e29e69bb7..1b6afe958dc 100644 --- a/tools/azure-sdk-tools/packaging_tools/__init__.py +++ b/tools/azure-sdk-tools/packaging_tools/__init__.py @@ -29,7 +29,10 @@ def build_config(config: Dict[str, Any]) -> Dict[str, str]: result["is_arm"] = result.pop("is_arm", True) # Do I need msrestazure for this package? - result["need_msrestazure"] = result.pop("need_msrestazure", True) + result["need_msrestazure"] = result.pop("need_msrestazure", False) + + # Do I need azure-mgmt-core for this package? + result["need_azuremgmtcore"] = result.pop("need_azuremgmtcore", True) # Pre-compute some Jinja variable that are complicated to do inside the templates package_parts = result["package_nspkg"][: -len("-nspkg")].split("-") diff --git a/tools/azure-sdk-tools/packaging_tools/templates/LICENSE.txt b/tools/azure-sdk-tools/packaging_tools/templates/LICENSE similarity index 89% rename from tools/azure-sdk-tools/packaging_tools/templates/LICENSE.txt rename to tools/azure-sdk-tools/packaging_tools/templates/LICENSE index 2d316374531..b2f52a2bad4 100644 --- a/tools/azure-sdk-tools/packaging_tools/templates/LICENSE.txt +++ b/tools/azure-sdk-tools/packaging_tools/templates/LICENSE @@ -1,6 +1,6 @@ -The MIT License (MIT) +Copyright (c) Microsoft Corporation. -Copyright (c) 2021 Microsoft +MIT License Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -12,7 +12,7 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER diff --git a/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in b/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in index b67a47a4280..597108650d2 100644 --- a/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in +++ b/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in @@ -3,4 +3,4 @@ include *.md {%- for init_name in init_names %} include {{ init_name }} {%- endfor %} -include LICENSE.txt +include LICENSE diff --git a/tools/azure-sdk-tools/packaging_tools/templates/setup.py b/tools/azure-sdk-tools/packaging_tools/templates/setup.py index 40f72f8b053..b7ec98cb4e9 100644 --- a/tools/azure-sdk-tools/packaging_tools/templates/setup.py +++ b/tools/azure-sdk-tools/packaging_tools/templates/setup.py @@ -70,6 +70,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License', ], zip_safe=False, From c26257576a15c549ac5fa432aacad9ada069e6d0 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 1 Dec 2021 17:07:26 -0800 Subject: [PATCH 2/3] revert toml changes --- .../azure-applicationinsights/sdk_packaging.toml | 1 - sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml | 1 + sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml | 1 + sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml | 1 + sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml | 1 + sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml | 1 + .../azure-mgmt-baremetalinfrastructure/sdk_packaging.toml | 2 ++ 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml b/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml index 65322fc8f69..63f0951e6a3 100644 --- a/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml +++ b/sdk/applicationinsights/azure-applicationinsights/sdk_packaging.toml @@ -4,4 +4,3 @@ package_pprint_name = "Application Insights" package_doc_id = "" is_stable = false is_arn = false -auto_update = false diff --git a/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml b/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml index f2b6c449b94..1d7edd47be3 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml +++ b/sdk/appplatform/azure-mgmt-appplatform/sdk_packaging.toml @@ -5,3 +5,4 @@ package_pprint_name = "Appplatform Management" package_doc_id = "" is_stable = false is_arm = true +need_msrestazure = true diff --git a/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml b/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml index 0636d04fc34..00288928243 100644 --- a/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml +++ b/sdk/attestation/azure-mgmt-attestation/sdk_packaging.toml @@ -5,3 +5,4 @@ package_pprint_name = "MyService Management" package_doc_id = "" is_stable = false is_arm = true +need_msrestazure = true diff --git a/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml b/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml index cdedb80cf59..0cbc63c7cc8 100644 --- a/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml +++ b/sdk/automanage/azure-mgmt-automanage/sdk_packaging.toml @@ -5,3 +5,4 @@ package_pprint_name = "Auto Manage Management" package_doc_id = "" is_stable = false is_arm = true +need_msrestazure = true diff --git a/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml b/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml index ab0abb5acba..9dc8ef5f830 100644 --- a/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml +++ b/sdk/azureadb2c/azure-mgmt-azureadb2c/sdk_packaging.toml @@ -5,3 +5,4 @@ package_pprint_name = "Azureadb2c Management" package_doc_id = "" is_stable = false is_arm = true +need_msrestazure = true diff --git a/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml b/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml index 80466016f66..a4878bb809c 100644 --- a/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml +++ b/sdk/azurestackhci/azure-mgmt-azurestackhci/sdk_packaging.toml @@ -5,3 +5,4 @@ package_pprint_name = "AzureStackHCI Management" package_doc_id = "" is_stable = false is_arm = true +need_msrestazure = true diff --git a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml index bcb8422d76f..9d80c14d060 100644 --- a/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml +++ b/sdk/baremetalinfrastructure/azure-mgmt-baremetalinfrastructure/sdk_packaging.toml @@ -5,3 +5,5 @@ package_pprint_name = "Baremetalinfrastructure Management" package_doc_id = "" is_stable = false is_arm = true +need_msrestazure = true +need_azuremgmtcore = true From bce777f82a01d46457b440fd40fe6a124a364480 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Wed, 1 Dec 2021 17:11:44 -0800 Subject: [PATCH 3/3] update --- tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in b/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in index 597108650d2..bb1390b9df1 100644 --- a/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in +++ b/tools/azure-sdk-tools/packaging_tools/templates/MANIFEST.in @@ -1,3 +1,4 @@ +include _meta.json recursive-include tests *.py *.yaml include *.md {%- for init_name in init_names %}