From bc30af2218406215af34b14ae253620d50f07d1b Mon Sep 17 00:00:00 2001 From: "Yan Zhang (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 5 Mar 2021 14:59:19 +0800 Subject: [PATCH 1/6] add a version in readmepython --- .../network/resource-manager/readme.python.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/specification/network/resource-manager/readme.python.md b/specification/network/resource-manager/readme.python.md index 7a0a78bfa463..9e92925928f6 100644 --- a/specification/network/resource-manager/readme.python.md +++ b/specification/network/resource-manager/readme.python.md @@ -16,6 +16,7 @@ Generate all API versions currently shipped for this package ```yaml $(multiapi) clear-output-folder: true batch: + - tag: package-2020-11 - tag: package-2020-08 - tag: package-2020-07 - tag: package-2020-06 @@ -57,6 +58,16 @@ clear-output-folder: false perform-load: false ``` +### Tag: package-2020-11 and python + +These settings apply only when `--tag=package-2020-11 --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2020-11' +namespace: azure.mgmt.network.v2020_11_01 +output-folder: $(python-sdks-folder)/network/azure-mgmt-network/azure/mgmt/network/v2020_11_01 +``` + ### Tag: package-2020-08 and python These settings apply only when `--tag=package-2020-08 --python` is specified on the command line. From a7e73da72f1ff288c3f16d0c33d7ce07897a72e3 Mon Sep 17 00:00:00 2001 From: "Yan Zhang (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 9 Mar 2021 10:39:10 +0800 Subject: [PATCH 2/6] track2 configure --- .../datafactory/resource-manager/readme.md | 2 +- .../resource-manager/readme.python.md | 32 ++++++++----------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/specification/datafactory/resource-manager/readme.md b/specification/datafactory/resource-manager/readme.md index eb66b97b8020..e041a02a8075 100644 --- a/specification/datafactory/resource-manager/readme.md +++ b/specification/datafactory/resource-manager/readme.md @@ -67,7 +67,7 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-net - - repo: azure-sdk-for-python + - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-js diff --git a/specification/datafactory/resource-manager/readme.python.md b/specification/datafactory/resource-manager/readme.python.md index 51f2c51d2ce3..5bf74321818e 100644 --- a/specification/datafactory/resource-manager/readme.python.md +++ b/specification/datafactory/resource-manager/readme.python.md @@ -4,24 +4,20 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. -``` yaml $(python) -python-mode: create -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: azure.mgmt.datafactory - package-name: azure-mgmt-datafactory - package-version: 1.0.0 - clear-output-folder: true +``` yaml $(python) && $(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +payload-flattening-threshold: 2 +namespace: azure.mgmt.datafactory +package-name: azure-mgmt-datafactory +package-version: 1.0.0 +clear-output-folder: true ``` -``` yaml $(python) && $(python-mode) == 'update' -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory +``` yaml $(python) && $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory ``` -``` yaml $(python) && $(python-mode) == 'create' -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory +``` yaml $(python) && $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory ``` From cb13ffe32fa1245a77a2bdbfa5ce67afec57fbd6 Mon Sep 17 00:00:00 2001 From: "Yan Zhang (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 9 Mar 2021 10:57:52 +0800 Subject: [PATCH 3/6] more track2 configure --- .../datafactory/resource-manager/readme.md | 1 + .../resource-manager/readme.python.md | 27 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/readme.md b/specification/datafactory/resource-manager/readme.md index e041a02a8075..5026d37a004c 100644 --- a/specification/datafactory/resource-manager/readme.md +++ b/specification/datafactory/resource-manager/readme.md @@ -67,6 +67,7 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-net + - repo: azure-sdk-for-python - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go diff --git a/specification/datafactory/resource-manager/readme.python.md b/specification/datafactory/resource-manager/readme.python.md index 5bf74321818e..099a4edf58bc 100644 --- a/specification/datafactory/resource-manager/readme.python.md +++ b/specification/datafactory/resource-manager/readme.python.md @@ -4,19 +4,44 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. +``` yaml $(python) && !$(track2) +python-mode: create +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + namespace: azure.mgmt.datafactory + package-name: azure-mgmt-datafactory + package-version: 1.0.0 + clear-output-folder: true +``` + ``` yaml $(python) && $(track2) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION -payload-flattening-threshold: 2 namespace: azure.mgmt.datafactory package-name: azure-mgmt-datafactory package-version: 1.0.0 clear-output-folder: true ``` + +``` yaml $(python) && $(python-mode) == 'update' && !$(track2) +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory +``` + ``` yaml $(python) && $(python-mode) == 'update' && $(track2) no-namespace-folders: true output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory ``` + +``` yaml $(python) && $(python-mode) == 'create' && !$(track2) +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory +``` + ``` yaml $(python) && $(python-mode) == 'create' && $(track2) basic-setup-py: true output-folder: $(python-sdks-folder)/datafactory/azure-mgmt-datafactory From d5304727068f2656072834578024508335720146 Mon Sep 17 00:00:00 2001 From: "Yan Zhang (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 9 Mar 2021 13:46:49 +0800 Subject: [PATCH 4/6] add parameter --- specification/datafactory/resource-manager/readme.python.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/datafactory/resource-manager/readme.python.md b/specification/datafactory/resource-manager/readme.python.md index 099a4edf58bc..292f548ba49b 100644 --- a/specification/datafactory/resource-manager/readme.python.md +++ b/specification/datafactory/resource-manager/readme.python.md @@ -23,6 +23,8 @@ namespace: azure.mgmt.datafactory package-name: azure-mgmt-datafactory package-version: 1.0.0 clear-output-folder: true +modelerfour: + lenient-model-deduplication: true ``` ``` yaml $(python) && $(python-mode) == 'update' && !$(track2) From f6c1c7b8ec50dea1a29902d66aecd285fde4358c Mon Sep 17 00:00:00 2001 From: "Yan Zhang (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 9 Mar 2021 15:37:20 +0800 Subject: [PATCH 5/6] fifth modification --- specification/network/resource-manager/readme.python.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/network/resource-manager/readme.python.md b/specification/network/resource-manager/readme.python.md index 9e92925928f6..d8fbd511f6b7 100644 --- a/specification/network/resource-manager/readme.python.md +++ b/specification/network/resource-manager/readme.python.md @@ -16,7 +16,6 @@ Generate all API versions currently shipped for this package ```yaml $(multiapi) clear-output-folder: true batch: - - tag: package-2020-11 - tag: package-2020-08 - tag: package-2020-07 - tag: package-2020-06 From 469f0446b472d490c79a7e8ac2104756eec95eed Mon Sep 17 00:00:00 2001 From: "Yan Zhang (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 9 Mar 2021 15:51:07 +0800 Subject: [PATCH 6/6] sixth modification --- .../network/resource-manager/readme.python.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/specification/network/resource-manager/readme.python.md b/specification/network/resource-manager/readme.python.md index d8fbd511f6b7..7a0a78bfa463 100644 --- a/specification/network/resource-manager/readme.python.md +++ b/specification/network/resource-manager/readme.python.md @@ -57,16 +57,6 @@ clear-output-folder: false perform-load: false ``` -### Tag: package-2020-11 and python - -These settings apply only when `--tag=package-2020-11 --python` is specified on the command line. -Please also specify `--python-sdks-folder=`. - -``` yaml $(tag) == 'package-2020-11' -namespace: azure.mgmt.network.v2020_11_01 -output-folder: $(python-sdks-folder)/network/azure-mgmt-network/azure/mgmt/network/v2020_11_01 -``` - ### Tag: package-2020-08 and python These settings apply only when `--tag=package-2020-08 --python` is specified on the command line.