From 8138909c566f1f70ccb9e469169fc5a300029cc5 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Thu, 1 Jul 2021 16:47:25 +0800 Subject: [PATCH 1/3] python track2 config --- .../resource-manager/readme.md | 1 - .../resource-manager/readme.python.md | 29 +---- .../resource-manager/readme.md | 1 - .../resource-manager/readme.python.md | 22 +--- .../resource-manager/readme.md | 7 +- .../resource-manager/readme.python.md | 115 +----------------- .../hdinsight/resource-manager/readme.md | 1 - .../resource-manager/readme.python.md | 28 +---- .../iothub/resource-manager/readme.md | 3 - .../iothub/resource-manager/readme.python.md | 62 +--------- .../postgresqlhsc/resource-manager/readme.md | 1 - .../resource-manager/readme.python.md | 19 +-- .../redis/resource-manager/readme.md | 43 +------ .../redis/resource-manager/readme.python.md | 48 ++++++++ .../scheduler/resource-manager/readme.md | 41 +------ .../resource-manager/readme.python.md | 47 +++++++ .../signalr/resource-manager/readme.md | 1 - .../signalr/resource-manager/readme.python.md | 24 +--- 18 files changed, 119 insertions(+), 374 deletions(-) create mode 100644 specification/redis/resource-manager/readme.python.md create mode 100644 specification/scheduler/resource-manager/readme.python.md diff --git a/specification/appconfiguration/resource-manager/readme.md b/specification/appconfiguration/resource-manager/readme.md index 9ff6fa69e34d..3389cac9bafb 100644 --- a/specification/appconfiguration/resource-manager/readme.md +++ b/specification/appconfiguration/resource-manager/readme.md @@ -95,7 +95,6 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-powershell - - repo: azure-sdk-for-python - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-net diff --git a/specification/appconfiguration/resource-manager/readme.python.md b/specification/appconfiguration/resource-manager/readme.python.md index 1a125d702381..90f50f633308 100644 --- a/specification/appconfiguration/resource-manager/readme.python.md +++ b/specification/appconfiguration/resource-manager/readme.python.md @@ -1,21 +1,5 @@ ## Python -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 !$(track2) -python-mode: create -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: azure.mgmt.appconfiguration - package-name: azure-mgmt-appconfiguration - package-version: 0.1.0 - clear-output-folder: true -``` - These settings apply only when `--track2` is specified on the command line. ``` yaml $(track2) @@ -23,20 +7,15 @@ azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION package-name: azure-mgmt-appconfiguration no-namespace-folders: true -package-version: 0.1.0 +package-version: 1.0.0b1 +clear-output-folder: true ``` -``` yaml $(python-mode) == 'update' -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration +``` yaml $(python-mode) == 'update' && $(track2) no-namespace-folders: true output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration/azure/mgmt/appconfiguration ``` -``` yaml $(python-mode) == 'create' -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration +``` yaml $(python-mode) == 'create' && $(track2) basic-setup-py: true output-folder: $(python-sdks-folder)/appconfiguration/azure-mgmt-appconfiguration ``` diff --git a/specification/cognitiveservices/resource-manager/readme.md b/specification/cognitiveservices/resource-manager/readme.md index fe2aad3a95f4..846c047e0ed7 100644 --- a/specification/cognitiveservices/resource-manager/readme.md +++ b/specification/cognitiveservices/resource-manager/readme.md @@ -71,7 +71,6 @@ 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/cognitiveservices/resource-manager/readme.python.md b/specification/cognitiveservices/resource-manager/readme.python.md index 342f0b0c1455..df7348bac398 100644 --- a/specification/cognitiveservices/resource-manager/readme.python.md +++ b/specification/cognitiveservices/resource-manager/readme.python.md @@ -4,18 +4,6 @@ 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.cognitiveservices - package-name: azure-mgmt-cognitiveservices - package-version: 2.0.0 - clear-output-folder: true -``` - ``` yaml $(python) && $(track2) python-mode: create azure-arm: true @@ -26,17 +14,11 @@ package-version: 11.0.0b1 clear-output-folder: true ``` -``` yaml $(python) && $(python-mode) == 'update' +``` yaml $(python) && $(python-mode) == 'update' && $(track2) no-namespace-folders: true output-folder: $(python-sdks-folder)/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/cognitiveservices/azure-mgmt-cognitiveservices/azure/mgmt/cognitiveservices ``` -``` yaml $(python) && $(python-mode) == 'create' +``` yaml $(python) && $(python-mode) == 'create' && $(track2) basic-setup-py: true output-folder: $(python-sdks-folder)/cognitiveservices/azure-mgmt-cognitiveservices -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/cognitiveservices/azure-mgmt-cognitiveservices ``` diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index fd2e8803203a..739a12201877 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -659,9 +659,6 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - - repo: azure-sdk-for-python - after_scripts: - - python ./scripts/multiapi_init_gen.py azure-mgmt-containerservice - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go @@ -693,6 +690,10 @@ csharp: See configuration in [readme.go.md](./readme.go.md) +## Python + +See configuration in [readme.python.md](./readme.python.md) + ## Java See configuration in [readme.java.md](./readme.java.md) diff --git a/specification/containerservice/resource-manager/readme.python.md b/specification/containerservice/resource-manager/readme.python.md index 6b5fc7ba1912..7dea773f4084 100644 --- a/specification/containerservice/resource-manager/readme.python.md +++ b/specification/containerservice/resource-manager/readme.python.md @@ -2,20 +2,11 @@ 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-containerservice - clear-output-folder: true - no-namespace-folders: true -``` - ```yaml $(python) && $(track2) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION package-name: azure-mgmt-containerservice +package-verion: 1.0.0b1 clear-output-folder: true no-namespace-folders: true ``` @@ -24,35 +15,6 @@ no-namespace-folders: true Generate all API versions currently shipped for this package -```yaml $(python) && $(multiapi) && !$(track2) -batch: - - tag: package-2021-05-01-only - - tag: package-2021-03-01-only - - tag: package-2021-02-01-only - - tag: package-2020-12-01-only - - tag: package-2020-11-01-only - - tag: package-2020-09-01-only - - tag: package-2020-07-01-only - - tag: package-2020-06-01-only - - tag: package-2020-04-01-only - - tag: package-2020-03-01-only - - tag: package-2020-02-01-only - - tag: package-2020-01-01-only - - tag: package-2019-11-01-only - - tag: package-2019-10-27-preview-only - - tag: package-2019-10-01-only - - tag: package-2019-08-01-only - - tag: package-2019-06-01-only - - tag: package-2019-04-30-only - - tag: package-2019-04-01-only - - tag: package-2019-02-only - - tag: package-2018-09-preview-only - - tag: package-2019-09-preview-only - - tag: package-2018-08-preview-only - - tag: package-2018-03-only - - tag: package-2017-07-only-extended -``` - ```yaml $(python) && $(multiapi) && $(track2) batch: - tag: package-2021-05-01-only @@ -95,9 +57,6 @@ These settings apply only when `--tag=package-2021-05-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` yaml $(tag) == 'package-2021-05-01-only' && $(python) -python: - namespace: azure.mgmt.containerservice.v2021_05_01 - output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_05_01 namespace: azure.mgmt.containerservice.v2021_05_01 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_05_01 ``` @@ -108,9 +67,6 @@ These settings apply only when `--tag=package-2021-03-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` yaml $(tag) == 'package-2021-03-01-only' && $(python) -python: - namespace: azure.mgmt.containerservice.v2021_03_01 - output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_03_01 namespace: azure.mgmt.containerservice.v2021_03_01 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_03_01 ``` @@ -121,9 +77,6 @@ These settings apply only when `--tag=package-2021-02-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` yaml $(tag) == 'package-2021-02-01-only' && $(python) -python: - namespace: azure.mgmt.containerservice.v2021_02_01 - output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_02_01 namespace: azure.mgmt.containerservice.v2021_02_01 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2021_02_01 ``` @@ -134,9 +87,6 @@ These settings apply only when `--tag=package-2020-12-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` yaml $(tag) == 'package-2020-12-01-only' && $(python) -python: - namespace: azure.mgmt.containerservice.v2020_12_01 - output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_12_01 namespace: azure.mgmt.containerservice.v2020_12_01 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_12_01 ``` @@ -147,9 +97,6 @@ These settings apply only when `--tag=package-2020-11-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` yaml $(tag) == 'package-2020-11-01-only' && $(python) -python: - namespace: azure.mgmt.containerservice.v2020_11_01 - output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_11_01 namespace: azure.mgmt.containerservice.v2020_11_01 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_11_01 ``` @@ -160,9 +107,6 @@ These settings apply only when `--tag=package-2020-09-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` yaml $(tag) == 'package-2020-09-01-only' && $(python) -python: - namespace: azure.mgmt.containerservice.v2020_09_01 - output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_09_01 namespace: azure.mgmt.containerservice.v2020_09_01 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_09_01 ``` @@ -173,9 +117,6 @@ These settings apply only when `--tag=package-2020-07-01-only --python` is speci Please also specify `--python-sdks-folder=`. ``` yaml $(tag) == 'package-2020-07-01-only' && $(python) -python: - namespace: azure.mgmt.containerservice.v2020_07_01 - output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_07_01 namespace: azure.mgmt.containerservice.v2020_07_01 output-folder: $(python-sdks-folder)/containerservice/azure-mgmt-containerservice/azure/mgmt/containerservice/v2020_07_01 ``` @@ -188,9 +129,6 @@ 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.hdinsight - package-name: azure-mgmt-hdinsight - package-version: 0.1.0 - clear-output-folder: true -``` ``` yaml $(python) && $(track2) python-mode: create azure-arm: true @@ -23,20 +12,8 @@ namespace: azure.mgmt.hdinsight package-name: azure-mgmt-hdinsight package-version: 1.0.0b1 clear-output-folder: true -modelerfour: - lenient-model-deduplication: true ``` -``` yaml $(python) && $(python-mode) == 'update' && !$(track2) -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/hdinsight/azure-mgmt-hdinsight/azure/mgmt/hdinsight -``` -``` yaml $(python) && $(python-mode) == 'create' && !$(track2) -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/hdinsight/azure-mgmt-hdinsight -``` ``` yaml $(python) && $(python-mode) == 'update' && $(track2) no-namespace-folders: true output-folder: $(python-sdks-folder)/hdinsight/azure-mgmt-hdinsight/azure/mgmt/hdinsight @@ -45,3 +22,8 @@ output-folder: $(python-sdks-folder)/hdinsight/azure-mgmt-hdinsight/azure/mgmt/h basic-setup-py: true output-folder: $(python-sdks-folder)/hdinsight/azure-mgmt-hdinsight ``` + +``` yaml $(python) && $(track2) +modelerfour: + lenient-model-deduplication: true +``` \ No newline at end of file diff --git a/specification/iothub/resource-manager/readme.md b/specification/iothub/resource-manager/readme.md index 3a5861d84b29..82071a72f3df 100644 --- a/specification/iothub/resource-manager/readme.md +++ b/specification/iothub/resource-manager/readme.md @@ -239,9 +239,6 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-net - - repo: azure-sdk-for-python - after_scripts: - - python ./scripts/multiapi_init_gen.py azure-mgmt-iothub - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go diff --git a/specification/iothub/resource-manager/readme.python.md b/specification/iothub/resource-manager/readme.python.md index 52813f675475..e701059df9c4 100644 --- a/specification/iothub/resource-manager/readme.python.md +++ b/specification/iothub/resource-manager/readme.python.md @@ -4,24 +4,12 @@ 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: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: azure.mgmt.iothub - package-name: azure-mgmt-iothub - package-version: 0.8.2 - clear-output-folder: true - no-namespace-folders: true -``` - ``` yaml $(python) && $(track2) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION namespace: azure.mgmt.iothub package-name: azure-mgmt-iothub -package-version: 0.8.2 +package-version: 1.0.0b1 clear-output-folder: true no-namespace-folders: true ``` @@ -30,21 +18,6 @@ no-namespace-folders: true Generate all API versions currently shipped for this package -```yaml $(python) && $(multiapi) && !$(track2) -batch: - - tag: package-2021-03 - - tag: package-preview-2021-03 - - tag: package-2020-03 - - tag: package-2019-11 - - tag: package-preview-2019-07 - - tag: package-2019-03 - - tag: package-2018-04 - - tag: package-2018-01 - - tag: package-2017-07 - - tag: package-2017-01 - - tag: package-2016-02 -``` - ```yaml $(python) && $(multiapi) && $(track2) batch: - tag: package-2021-03 @@ -75,9 +48,6 @@ 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 !$(track2) -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - package-name: azure-mgmt-rdbms - clear-output-folder: true - no-namespace-folders: true -``` - These settings apply only when `--track2` is specified on the command line. ``` yaml $(track2) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION package-name: azure-mgmt-rdbms +package-version: 1.0.0b1 no-namespace-folders: true ``` @@ -27,11 +18,6 @@ no-namespace-folders: true Generate all API versions currently shipped for this package -```yaml !$(track2) -batch: - - tag: package-2020-10-05-privatepreview -``` - ```yaml $(track2) clear-output-folder: true batch: @@ -46,7 +32,4 @@ 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.redis - package-name: azure-mgmt-redis - package-version: 5.0.0 - clear-output-folder: true -``` - -``` yaml $(python) && $(track2) -python-mode: update -azure-arm: true -license-header: MICROSOFT_MIT_NO_VERSION -namespace: azure.mgmt.redis -package-name: azure-mgmt-redis -package-version: 5.0.0 -clear-output-folder: true -``` - -``` yaml $(python) && $(python-mode) == 'update' -no-namespace-folders: true -output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis/azure/mgmt/redis -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis/azure/mgmt/redis -``` - -``` yaml $(python) && $(python-mode) == 'create' -basic-setup-py: true -output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis -``` +See configuration in [readme.python.md](./readme.python.md) ## Go diff --git a/specification/redis/resource-manager/readme.python.md b/specification/redis/resource-manager/readme.python.md new file mode 100644 index 000000000000..948dc77dbcea --- /dev/null +++ b/specification/redis/resource-manager/readme.python.md @@ -0,0 +1,48 @@ +## Python + +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.redis + package-name: azure-mgmt-redis + package-version: 0.1.0 + clear-output-folder: true +``` + +``` yaml $(python) && $(track2) +python-mode: update +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.redis +package-name: azure-mgmt-redis +package-version: 1.0.0b1 +clear-output-folder: true +``` + +``` yaml $(python) && $(python-mode) == 'update' && !$(track2) +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis/azure/mgmt/redis +``` +``` yaml $(python) && $(python-mode) == 'create' && !$(track2) +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis +``` + +``` yaml $(python) && $(python-mode) == 'update' $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis/azure/mgmt/redis +``` + +``` yaml $(python) && $(python-mode) == 'create' $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis +``` \ No newline at end of file diff --git a/specification/scheduler/resource-manager/readme.md b/specification/scheduler/resource-manager/readme.md index 05a09f91762f..0c2c1b887130 100644 --- a/specification/scheduler/resource-manager/readme.md +++ b/specification/scheduler/resource-manager/readme.md @@ -71,6 +71,7 @@ This is not used by Autorest itself. 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-ruby @@ -96,45 +97,7 @@ csharp: ## Python -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.scheduler - package-name: azure-mgmt-scheduler - clear-output-folder: true -``` - -``` yaml $(python) && $(track2) -python-mode: create -azure-arm: true -license-header: MICROSOFT_MIT_NO_VERSION -namespace: azure.mgmt.scheduler -package-name: azure-mgmt-scheduler -package-version: 7.0.0b1 -clear-output-folder: true -``` - -``` yaml $(python) && $(python-mode) == 'update' -no-namespace-folders: true -output-folder: $(python-sdks-folder)/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler -``` -``` yaml $(python) && $(python-mode) == 'create' -basic-setup-py: true -output-folder: $(python-sdks-folder)/scheduler/azure-mgmt-scheduler -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/scheduler/azure-mgmt-scheduler -``` +See configuration in [readme.python.md](./readme.python.md) ## Go diff --git a/specification/scheduler/resource-manager/readme.python.md b/specification/scheduler/resource-manager/readme.python.md new file mode 100644 index 000000000000..4365d0801e93 --- /dev/null +++ b/specification/scheduler/resource-manager/readme.python.md @@ -0,0 +1,47 @@ +## Python + +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.scheduler + package-name: azure-mgmt-scheduler + package-version: 0.1.0 + clear-output-folder: true +``` + +``` yaml $(python) && $(track2) +python-mode: create +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.scheduler +package-name: azure-mgmt-scheduler +package-version: 7.0.0b1 +clear-output-folder: true +``` +``` yaml $(python) && $(python-mode) == 'update' && !$(track2) +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler +``` + +``` yaml $(python) && $(python-mode) == 'create' && !$(track2) +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/scheduler/azure-mgmt-scheduler +``` + +``` yaml $(python) && $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler +``` +``` yaml $(python) && $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/scheduler/azure-mgmt-scheduler +``` \ No newline at end of file diff --git a/specification/signalr/resource-manager/readme.md b/specification/signalr/resource-manager/readme.md index 4415439848e1..1fa27c8aedfa 100644 --- a/specification/signalr/resource-manager/readme.md +++ b/specification/signalr/resource-manager/readme.md @@ -123,7 +123,6 @@ 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-node diff --git a/specification/signalr/resource-manager/readme.python.md b/specification/signalr/resource-manager/readme.python.md index 710f800cb849..993cebf285ce 100644 --- a/specification/signalr/resource-manager/readme.python.md +++ b/specification/signalr/resource-manager/readme.python.md @@ -4,36 +4,16 @@ 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.signalr - package-name: azure-mgmt-signalr - package-version: 0.2.0 - clear-output-folder: true -``` ``` yaml $(python) && $(track2) python-mode: create azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION namespace: azure.mgmt.signalr package-name: azure-mgmt-signalr -package-version: 0.2.0 +package-version: 1.0.0b1 clear-output-folder: true ``` -``` yaml $(python) && $(python-mode) == 'update' && !$(track2) -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/signalr/azure-mgmt-signalr/azure/mgmt/signalr -``` -``` yaml $(python) && $(python-mode) == 'create' && !$(track2) -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/signalr/azure-mgmt-signalr -``` + ``` yaml $(python) && $(python-mode) == 'update' && $(track2) no-namespace-folders: true output-folder: $(python-sdks-folder)/signalr/azure-mgmt-signalr/azure/mgmt/signalr From 9e29df08e82aeb29f50a4645223e1a9fd9bbd1d7 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Thu, 1 Jul 2021 17:12:47 +0800 Subject: [PATCH 2/3] redis --- specification/redis/resource-manager/readme.md | 2 +- specification/redis/resource-manager/readme.python.md | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/specification/redis/resource-manager/readme.md b/specification/redis/resource-manager/readme.md index da8148a11a19..bbb37885e0c8 100644 --- a/specification/redis/resource-manager/readme.md +++ b/specification/redis/resource-manager/readme.md @@ -114,7 +114,6 @@ This is not used by Autorest itself. 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 @@ -122,6 +121,7 @@ swagger-to-sdk: - repo: azure-sdk-for-ruby after_scripts: - bundle install && rake arm:regen_all_profiles['azure_mgmt_redis'] + - repo: azure-sdk-for-python-track2 - repo: azure-resource-manager-schemas ``` diff --git a/specification/redis/resource-manager/readme.python.md b/specification/redis/resource-manager/readme.python.md index 948dc77dbcea..519ee375e95b 100644 --- a/specification/redis/resource-manager/readme.python.md +++ b/specification/redis/resource-manager/readme.python.md @@ -1,5 +1,3 @@ -## Python - 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. @@ -12,7 +10,7 @@ python: payload-flattening-threshold: 2 namespace: azure.mgmt.redis package-name: azure-mgmt-redis - package-version: 0.1.0 + package-version: 5.0.0 clear-output-folder: true ``` @@ -22,7 +20,7 @@ azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION namespace: azure.mgmt.redis package-name: azure-mgmt-redis -package-version: 1.0.0b1 +package-version: 12.0.0b1 clear-output-folder: true ``` @@ -31,18 +29,19 @@ python: no-namespace-folders: true output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis/azure/mgmt/redis ``` + ``` yaml $(python) && $(python-mode) == 'create' && !$(track2) python: basic-setup-py: true output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis ``` -``` yaml $(python) && $(python-mode) == 'update' $(track2) +``` yaml $(python) && $(python-mode) == 'update' && $(track2) no-namespace-folders: true output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis/azure/mgmt/redis ``` -``` yaml $(python) && $(python-mode) == 'create' $(track2) +``` yaml $(python) && $(python-mode) == 'create' && $(track2) basic-setup-py: true output-folder: $(python-sdks-folder)/redis/azure-mgmt-redis ``` \ No newline at end of file From af44661236b6a92f7eb938f69d3b09c1bfb032f5 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Thu, 1 Jul 2021 17:18:49 +0800 Subject: [PATCH 3/3] redis --- specification/redis/resource-manager/readme.python.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/redis/resource-manager/readme.python.md b/specification/redis/resource-manager/readme.python.md index 519ee375e95b..efb0e9489ce9 100644 --- a/specification/redis/resource-manager/readme.python.md +++ b/specification/redis/resource-manager/readme.python.md @@ -1,3 +1,5 @@ +## Python + 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.