From 034cd182c0939689c7720bfbdeab2bccda66cf58 Mon Sep 17 00:00:00 2001 From: 00Kai0 Date: Wed, 15 Apr 2020 13:38:19 +0800 Subject: [PATCH 1/3] fix config in compute --- .../compute/resource-manager/readme.python.md | 124 ++++++++---------- 1 file changed, 53 insertions(+), 71 deletions(-) diff --git a/specification/compute/resource-manager/readme.python.md b/specification/compute/resource-manager/readme.python.md index ec6ae4115274..6410e99adb80 100644 --- a/specification/compute/resource-manager/readme.python.md +++ b/specification/compute/resource-manager/readme.python.md @@ -2,14 +2,12 @@ These settings apply only when `--python` is specified on the command line. -``` yaml $(python) && !$(track2) -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - package-name: azure-mgmt-compute - no-namespace-folders: true - clear-output-folder: true +``` yaml !$(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-mgmt-compute +no-namespace-folders: true +clear-output-folder: true directive: # dynamically add a DummyOrchestrationServiceName value to the enum @@ -34,7 +32,6 @@ These settings apply only when `--track2` is specified on the command line. ``` yaml $(track2) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION -payload-flattening-threshold: 2 package-name: azure-mgmt-compute no-namespace-folders: true ``` @@ -43,7 +40,7 @@ no-namespace-folders: true Generate all API versions currently shipped for this package -```yaml $(python) && $(multiapi) && !$(track2) +```yaml $(multiapi) && !$(track2) batch: - tag: package-2019-12-01-only - tag: package-2019-11-01-only @@ -84,7 +81,7 @@ batch: ``` ``` yaml $(multiapiscript) -output-folder: $(python-sdks-folder)/$(package-top-folder)/azure-mgmt-compute/azure/mgmt/compute/ +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/ clear-output-folder: false perform-load: false ``` @@ -94,10 +91,9 @@ perform-load: false These settings apply only when `--tag=package-2019-12-01-only --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-2019-12-01-only' && $(python) -python: - namespace: azure.mgmt.compute.v2019_12_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_12_01 +``` yaml $(tag) == 'package-2019-12-01-only' +namespace: azure.mgmt.compute.v2019_12_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_12_01 ``` ### Tag: package-2019-11-01-only and python @@ -105,10 +101,9 @@ python: These settings apply only when `--tag=package-2019-11-01-only --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-2019-11-01-only' && $(python) -python: - namespace: azure.mgmt.compute.v2019_11_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_11_01 +``` yaml $(tag) == 'package-2019-11-01-only' +namespace: azure.mgmt.compute.v2019_11_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_11_01 ``` ### Tag: package-2019-07-01-only and python @@ -116,10 +111,9 @@ python: These settings apply only when `--tag=package-2019-07-01-only --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-2019-07-01-only' && $(python) -python: - namespace: azure.mgmt.compute.v2019_07_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_07_01 +``` yaml $(tag) == 'package-2019-07-01-only' +namespace: azure.mgmt.compute.v2019_07_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_07_01 ``` ### Tag: package-2019-04-01-only and python @@ -127,10 +121,9 @@ python: These settings apply only when `--tag=package-2019-04-01-only --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-2019-04-01-only' && $(python) -python: - namespace: azure.mgmt.compute.v2019_04_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_04_01 +``` yaml $(tag) == 'package-2019-04-01-only' +namespace: azure.mgmt.compute.v2019_04_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_04_01 ``` ### Tag: package-2019-03-01-only and python @@ -138,10 +131,9 @@ python: These settings apply only when `--tag=package-2019-03-01-only --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-2019-03-01-only' && $(python) -python: - namespace: azure.mgmt.compute.v2019_03_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01 +``` yaml $(tag) == 'package-2019-03-01-only' +namespace: azure.mgmt.compute.v2019_03_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01 ``` ### Tag: package-2018-10-01-only and python @@ -149,10 +141,9 @@ python: These settings apply only when `--tag=package-2018-10-01-only --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-2018-10-01-only' && $(python) -python: - namespace: azure.mgmt.compute.v2018_10_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01 +``` yaml $(tag) == 'package-2018-10-01-only' +namespace: azure.mgmt.compute.v2018_10_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2018_10_01 ``` ### Tag: package-2018-09-30-only and python @@ -160,10 +151,9 @@ python: These settings apply only when `--tag=package-2018-09-30-only --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-2018-09-30-only' && $(python) -python: - namespace: azure.mgmt.compute.v2018_09_30 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30 +``` yaml $(tag) == 'package-2018-09-30-only' +namespace: azure.mgmt.compute.v2018_09_30 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30 ``` ### Tag: package-compute-only-2018-06 and python @@ -171,10 +161,9 @@ python: These settings apply only when `--tag=package-compute-only-2018-06 --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-compute-only-2018-06' && $(python) -python: - namespace: azure.mgmt.compute.v2018_06_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01 +``` yaml $(tag) == 'package-compute-only-2018-06' +namespace: azure.mgmt.compute.v2018_06_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01 ``` ### Tag: package-compute-2018-04 and python @@ -182,10 +171,9 @@ python: These settings apply only when `--tag=package-compute-2018-04 --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-compute-2018-04' && $(python) -python: - namespace: azure.mgmt.compute.v2018_04_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01 +``` yaml $(tag) == 'package-compute-2018-04' +namespace: azure.mgmt.compute.v2018_04_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01 ``` ### Tag: package-compute-only-2017-12 and python @@ -193,10 +181,9 @@ python: These settings apply only when `--tag=package-compute-only-2017-12 --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-compute-only-2017-12' && $(python) -python: - namespace: azure.mgmt.compute.v2017_12_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01 +``` yaml $(tag) == 'package-compute-only-2017-12' +namespace: azure.mgmt.compute.v2017_12_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01 ``` ### Tag: package-skus-2017-09 and python @@ -204,10 +191,9 @@ python: These settings apply only when `--tag=package-skus-2017-09 --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-skus-2017-09' && $(python) -python: - namespace: azure.mgmt.compute.v2017_09_01 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01 +``` yaml $(tag) == 'package-skus-2017-09' +namespace: azure.mgmt.compute.v2017_09_01 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01 ``` ### Tag: package-compute-2017-03 and python @@ -215,10 +201,9 @@ python: These settings apply only when `--tag=package-compute-2017-03 --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-compute-2017-03' && $(python) -python: - namespace: azure.mgmt.compute.v2017_03_30 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30 +``` yaml $(tag) == 'package-compute-2017-03' +namespace: azure.mgmt.compute.v2017_03_30 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30 ``` ### Tag: package-compute-2016-04-preview and python @@ -226,10 +211,9 @@ python: These settings apply only when `--tag=package-compute-2016-04-preview --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-compute-2016-04-preview' && $(python) -python: - namespace: azure.mgmt.compute.v2016_04_30_preview - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview +``` yaml $(tag) == 'package-compute-2016-04-preview' +namespace: azure.mgmt.compute.v2016_04_30_preview +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview ``` ### Tag: package-compute-2016-03 and python @@ -237,10 +221,9 @@ python: These settings apply only when `--tag=package-compute-2016-03 --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-compute-2016-03' && $(python) -python: - namespace: azure.mgmt.compute.v2016_03_30 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30 +``` yaml $(tag) == 'package-compute-2016-03' +namespace: azure.mgmt.compute.v2016_03_30 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30 ``` ### Tag: package-compute-2015-06 and python @@ -248,8 +231,7 @@ python: These settings apply only when `--tag=package-compute-2015-06 --python` is specified on the command line. Please also specify `--python-sdks-folder=`. -``` yaml $(tag) == 'package-compute-2015-06' && $(python) -python: - namespace: azure.mgmt.compute.v2015_06_15 - output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15 +``` yaml $(tag) == 'package-compute-2015-06' +namespace: azure.mgmt.compute.v2015_06_15 +output-folder: $(python-sdks-folder)/compute/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15 ``` From f72c33fac014ffc959a3182915908b84b5e935d7 Mon Sep 17 00:00:00 2001 From: 00Kai0 Date: Wed, 15 Apr 2020 17:50:30 +0800 Subject: [PATCH 2/3] keep python: --- .../compute/resource-manager/readme.python.md | 56 +++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/specification/compute/resource-manager/readme.python.md b/specification/compute/resource-manager/readme.python.md index 6410e99adb80..f023ec471b3f 100644 --- a/specification/compute/resource-manager/readme.python.md +++ b/specification/compute/resource-manager/readme.python.md @@ -3,11 +3,12 @@ These settings apply only when `--python` is specified on the command line. ``` yaml !$(track2) -azure-arm: true -license-header: MICROSOFT_MIT_NO_VERSION -package-name: azure-mgmt-compute -no-namespace-folders: true -clear-output-folder: true +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + package-name: azure-mgmt-compute + no-namespace-folders: true + clear-output-folder: true directive: # dynamically add a DummyOrchestrationServiceName value to the enum @@ -94,6 +95,9 @@ Please also specify `--python-sdks-folder= Date: Wed, 15 Apr 2020 20:07:54 +0200 Subject: [PATCH 3/3] Update readme.python.md --- specification/compute/resource-manager/readme.python.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/compute/resource-manager/readme.python.md b/specification/compute/resource-manager/readme.python.md index f023ec471b3f..07382513e166 100644 --- a/specification/compute/resource-manager/readme.python.md +++ b/specification/compute/resource-manager/readme.python.md @@ -6,6 +6,7 @@ These settings apply only when `--python` is specified on the command line. python: azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 package-name: azure-mgmt-compute no-namespace-folders: true clear-output-folder: true