From 0600a8cb79afa08c2c2808deb28e3e9b4a889b46 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Sat, 12 Oct 2019 13:56:55 +0800 Subject: [PATCH 1/5] adding package-2019-08 to python multiapi --- specification/web/resource-manager/readme.python.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/web/resource-manager/readme.python.md b/specification/web/resource-manager/readme.python.md index 148b1766e8dd..cabde832053c 100644 --- a/specification/web/resource-manager/readme.python.md +++ b/specification/web/resource-manager/readme.python.md @@ -23,6 +23,7 @@ Generate all API versions currently shipped for this package ```yaml $(python) && $(multiapi) batch: + - tag: package-2019-08 - tag: package-2018-11-only - tag: package-2018-02-only - tag: package-2016-09-only From 7773983f250a0918955f9f08565438150dddbd3b Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Sat, 12 Oct 2019 14:02:39 +0800 Subject: [PATCH 2/5] changes for python --- specification/web/resource-manager/readme.md | 5 +++-- specification/web/resource-manager/readme.python.md | 13 ++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index 39767fe0d766..16638534ab5d 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -39,9 +39,10 @@ tag: package-2019-08 ### Tag: package-2019-08 -These settings apply only when `--tag=package-2019-08` is specified on the command line. +These settings apply only when `--tag=package-2019-08` or `--tag=package-2019-08-only` is specified on the command line. +NOTE: Currently these tags are the same, but it will need to be split if any files from folders other than 2019-08-01 are included. -``` yaml $(tag) == 'package-2019-08' +``` yaml $(tag) == 'package-2019-08' || $(tag) == 'package-2019-08-only' input-file: - Microsoft.CertificateRegistration/stable/2019-08-01/AppServiceCertificateOrders.json diff --git a/specification/web/resource-manager/readme.python.md b/specification/web/resource-manager/readme.python.md index cabde832053c..c25f8653f3bd 100644 --- a/specification/web/resource-manager/readme.python.md +++ b/specification/web/resource-manager/readme.python.md @@ -23,7 +23,7 @@ Generate all API versions currently shipped for this package ```yaml $(python) && $(multiapi) batch: - - tag: package-2019-08 + - tag: package-2019-08-only - tag: package-2018-11-only - tag: package-2018-02-only - tag: package-2016-09-only @@ -33,6 +33,17 @@ batch: - tag: package-2015-04-only ``` +### Tag: package-2019-08-only and python + +These settings apply only when `--tag=package-2019-08-only --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2019-08-only' && $(python) +python: + namespace: azure.mgmt.web.v2019_08_01 + output-folder: $(python-sdks-folder)/appservice/azure-mgmt-web/azure/mgmt/web/v2019_08_01 +``` + ### Tag: package-2018-11-only and python These settings apply only when `--tag=package-2018-11-only --python` is specified on the command line. From d66ac4a89ddecb0323a0eca941bd620ce3c4698c Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Sat, 12 Oct 2019 15:27:08 +0800 Subject: [PATCH 3/5] try different version of autorest --- specification/web/resource-manager/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index 16638534ab5d..a2581df9036e 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -1018,6 +1018,8 @@ This is not used by Autorest itself. swagger-to-sdk: - repo: azure-sdk-for-net - repo: azure-sdk-for-python + autorest_options: + use: "@microsoft.azure/autorest.python@4.0.70" after_scripts: - python ./scripts/multiapi_init_gen.py azure-mgmt-web - repo: azure-sdk-for-java From 7d27df9f1ce2dbbe4ee0fe17a8b457a59c1fce0a Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Sat, 12 Oct 2019 15:36:51 +0800 Subject: [PATCH 4/5] added trim-aio --- specification/web/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index a2581df9036e..83fecf5d9187 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -1022,6 +1022,7 @@ swagger-to-sdk: use: "@microsoft.azure/autorest.python@4.0.70" after_scripts: - python ./scripts/multiapi_init_gen.py azure-mgmt-web + - python ./scripts/trim_aio.py ./sdk/network/azure-mgmt-web - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-node From 77d0c7d987a96bb74e419cc7a0a26757d5f16929 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Sat, 12 Oct 2019 16:54:36 +0800 Subject: [PATCH 5/5] additional fixes to multiapi generation --- specification/web/resource-manager/readme.md | 2 +- specification/web/resource-manager/readme.python.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index 83fecf5d9187..e6984a0c25c9 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -1022,7 +1022,7 @@ swagger-to-sdk: use: "@microsoft.azure/autorest.python@4.0.70" after_scripts: - python ./scripts/multiapi_init_gen.py azure-mgmt-web - - python ./scripts/trim_aio.py ./sdk/network/azure-mgmt-web + - python ./scripts/trim_aio.py ./sdk/appservice/azure-mgmt-web - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-node diff --git a/specification/web/resource-manager/readme.python.md b/specification/web/resource-manager/readme.python.md index c25f8653f3bd..6225fec349d4 100644 --- a/specification/web/resource-manager/readme.python.md +++ b/specification/web/resource-manager/readme.python.md @@ -10,7 +10,6 @@ python: azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION payload-flattening-threshold: 2 - namespace: azure.mgmt.web package-name: azure-mgmt-web package-version: 0.42.0 clear-output-folder: true