diff --git a/specification/authorization/resource-manager/readme.md b/specification/authorization/resource-manager/readme.md index b5b24935109..228827da26c 100644 --- a/specification/authorization/resource-manager/readme.md +++ b/specification/authorization/resource-manager/readme.md @@ -341,9 +341,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 - after_scripts: - - python ./scripts/multiapi_init_gen.py azure-mgmt-authorization --default-api-version=2018-09-01-preview + - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-java - repo: azure-sdk-for-go - repo: azure-sdk-for-node @@ -362,5 +360,9 @@ See configuration in [readme.go.md](./readme.go.md) See configuration in [readme.java.md](./readme.java.md) +## Python + +See configuration in [readme.python.md](./readme.python.md) + diff --git a/specification/authorization/resource-manager/readme.python.md b/specification/authorization/resource-manager/readme.python.md index f43554d6a8e..a799e2b25f6 100644 --- a/specification/authorization/resource-manager/readme.python.md +++ b/specification/authorization/resource-manager/readme.python.md @@ -1,25 +1,21 @@ ## 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) -python-mode: create -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - package-name: azure-mgmt-authorization - 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-authorization +no-namespace-folders: true +package-version: 1.0.0b1 ``` ### Python multi-api Generate all API versions currently shipped for this package -```yaml $(python) && $(multiapi) +```yaml $(multiapi) +clear-output-folder: true batch: - tag: package-2021-03-01-preview-only - tag: package-2021-01-01-preview-only @@ -31,6 +27,12 @@ batch: - tag: package-2018-01-01-preview-only - tag: package-2015-07-01 - tag: package-2015-06-01-preview + - multiapiscript: true +``` +``` yaml $(multiapiscript) +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/ +clear-output-folder: false +perform-load: false ``` ### Tag: package-2021-03-01-preview-only and python @@ -38,9 +40,8 @@ batch: These settings apply only when `--tag=package-2021-03-01-preview-only --python` is specified on the command line. ``` yaml $(tag) == 'package-2021-03-01-preview-only' && $(python) -python: - namespace: azure.mgmt.authorization.v2021_03_01_preview - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2021_03_01_preview +namespace: azure.mgmt.authorization.v2021_03_01_preview +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2021_03_01_preview ``` ### Tag: package-2020-04-01-preview-only and python @@ -48,9 +49,8 @@ python: These settings apply only when `--tag=package-2020-04-01-preview-only --python` is specified on the command line. ``` yaml $(tag) == 'package-2020-04-01-preview-only' && $(python) -python: - namespace: azure.mgmt.authorization.v2020_04_01_preview - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2020_04_01_preview +namespace: azure.mgmt.authorization.v2020_04_01_preview +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2020_04_01_preview ``` ### Tag: package-2018-09-01-preview-only and python @@ -58,9 +58,8 @@ python: These settings apply only when `--tag=package-2018-09-01-preview-only --python` is specified on the command line. ``` yaml $(tag) == 'package-2018-09-01-preview-only' && $(python) -python: - namespace: azure.mgmt.authorization.v2018_09_01_preview - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2018_09_01_preview +namespace: azure.mgmt.authorization.v2018_09_01_preview +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2018_09_01_preview ``` ### Tag: package-2018-07-01-preview-only and python @@ -68,9 +67,8 @@ python: These settings apply only when `--tag=package-2018-07-01-preview-only --python` is specified on the command line. ``` yaml $(tag) == 'package-2018-07-01-preview-only' && $(python) -python: - namespace: azure.mgmt.authorization.v2018_07_01_preview - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2018_07_01_preview +namespace: azure.mgmt.authorization.v2018_07_01_preview +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2018_07_01_preview ``` ### Tag: package-2018-05-01-preview and python @@ -78,9 +76,8 @@ python: These settings apply only when `--tag=package-2018-05-01-preview --python` is specified on the command line. ``` yaml $(tag) == 'package-2018-05-01-preview' && $(python) -python: - namespace: azure.mgmt.authorization.v2018_05_01_preview - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2018_05_01_preview +namespace: azure.mgmt.authorization.v2018_05_01_preview +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2018_05_01_preview ``` ### Tag: package-2018-01-01-preview-only and python @@ -88,9 +85,8 @@ python: These settings apply only when `--tag=package-2018-01-01-preview-only --python` is specified on the command line. ``` yaml $(tag) == 'package-2018-01-01-preview-only' && $(python) -python: - namespace: azure.mgmt.authorization.v2018_01_01_preview - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2018_01_01_preview +namespace: azure.mgmt.authorization.v2018_01_01_preview +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2018_01_01_preview ``` ### Tag: package-2015-07-01 and python @@ -98,9 +94,8 @@ python: These settings apply only when `--tag=package-2015-07-01 --python` is specified on the command line. ``` yaml $(tag) == 'package-2015-07-01' && $(python) -python: - namespace: azure.mgmt.authorization.v2015_07_01 - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01 +namespace: azure.mgmt.authorization.v2015_07_01 +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_07_01 ``` ### Tag: 2015-06-01-preview and python @@ -108,9 +103,8 @@ python: These settings apply only when `--tag=2015-06-01-preview --python` is specified on the command line. ``` yaml $(tag) == 'package-2015-06-01-preview' && $(python) -python: - namespace: azure.mgmt.authorization.v2015_06_01 - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_06_01 +namespace: azure.mgmt.authorization.v2015_06_01 +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2015_06_01 ``` ### Tag: package-2021-01-01-preview-only and python @@ -118,16 +112,14 @@ python: These settings apply only when `--tag=package-2021-01-01-preview-only --python` is specified on the command line. ``` yaml $(tag) == 'package-2021-01-01-preview-only' && $(python) -python: - namespace: azure.mgmt.authorization.v2021_01_01_preview - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2021_01_01_preview +namespace: azure.mgmt.authorization.v2021_01_01_preview +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2021_01_01_preview ``` ### Tag: package-2020-10-01-preview and python These settings apply only when `--tag=package-2020-10-01-preview --python` is specified on the command line. ``` yaml $(tag) == 'package-2020-10-01-preview' && $(python) -python: - namespace: azure.mgmt.authorization.v2020_10_01_preview - output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2020_10_01_preview +namespace: azure.mgmt.authorization.v2020_10_01_preview +output-folder: $(python-sdks-folder)/authorization/azure-mgmt-authorization/azure/mgmt/authorization/v2020_10_01_preview ``` \ No newline at end of file diff --git a/specification/automation/resource-manager/readme.md b/specification/automation/resource-manager/readme.md index 333ec8249cb..a6d09941710 100644 --- a/specification/automation/resource-manager/readme.md +++ b/specification/automation/resource-manager/readme.md @@ -270,7 +270,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-go - repo: azure-sdk-for-js diff --git a/specification/automation/resource-manager/readme.python.md b/specification/automation/resource-manager/readme.python.md index 0ca10a24ffb..76157259226 100644 --- a/specification/automation/resource-manager/readme.python.md +++ b/specification/automation/resource-manager/readme.python.md @@ -2,35 +2,14 @@ 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.automation - package-name: azure-mgmt-automation - package-version: 0.1.1 - clear-output-folder: true -``` ``` yaml $(python) && $(track2) -python-mode: create azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION namespace: azure.mgmt.automation package-name: azure-mgmt-automation 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)/automation/azure-mgmt-automation/azure/mgmt/automation ``` ``` yaml $(python) && $(python-mode) == 'update' && $(track2) @@ -38,13 +17,13 @@ no-namespace-folders: true output-folder: $(python-sdks-folder)/automation/azure-mgmt-automation/azure/mgmt/automation ``` -``` yaml $(python) && $(python-mode) == 'create' && !$(track2) -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/automation/azure-mgmt-automation -``` ``` yaml $(python) && $(python-mode) == 'create' && $(track2) basic-setup-py: true output-folder: $(python-sdks-folder)/automation/azure-mgmt-automation ``` + +``` yaml $(python) && $(track2) +modelerfour: + lenient-model-deduplication: true +``` \ No newline at end of file diff --git a/specification/logic/resource-manager/readme.md b/specification/logic/resource-manager/readme.md index 49d696dc92c..de6d61a1903 100644 --- a/specification/logic/resource-manager/readme.md +++ b/specification/logic/resource-manager/readme.md @@ -126,7 +126,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-trenton - repo: azure-sdk-for-go @@ -155,32 +155,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) -python-mode: create -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - payload-flattening-threshold: 2 - namespace: azure.mgmt.logic - package-name: azure-mgmt-logic - clear-output-folder: true -``` - -``` yaml $(python) && $(python-mode) == 'update' -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/logic/azure-mgmt-logic/azure/mgmt/logic -``` - -``` yaml $(python) && $(python-mode) == 'create' -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/logic/azure-mgmt-logic -``` +See configuration in [readme.python.md](./readme.python.md) ## Go diff --git a/specification/logic/resource-manager/readme.python.md b/specification/logic/resource-manager/readme.python.md index 78519d02497..a413cf47db3 100644 --- a/specification/logic/resource-manager/readme.python.md +++ b/specification/logic/resource-manager/readme.python.md @@ -3,34 +3,15 @@ These settings apply only when `--python` is specified on the command line. Please also specify `--python-sdks-folder=`. -```yaml $(python) && !$(track2) -python: - azure-arm: true - license-header: MICROSOFT_MIT_NO_VERSION - namespace: azure.mgmt.logic - package-name: azure-mgmt-logic - package-version: 2019-05-01 - clear-output-folder: true -``` ```yaml $(python) && $(track2) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION namespace: azure.mgmt.logic package-name: azure-mgmt-logic -package-version: 2019-05-01 +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)/logic/azure-mgmt-logic/azure/mgmt/logic -``` -``` yaml $(python) && $(python-mode) == 'create' && !$(track2) -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/logic/azure-mgmt-logic -``` ``` yaml $(python) && $(python-mode) == 'update' && $(track2) no-namespace-folders: true output-folder: $(python-sdks-folder)/logic/azure-mgmt-logic/azure/mgmt/logic diff --git a/specification/notificationhubs/resource-manager/readme.md b/specification/notificationhubs/resource-manager/readme.md index 8ab47c141fb..82e278e1d71 100644 --- a/specification/notificationhubs/resource-manager/readme.md +++ b/specification/notificationhubs/resource-manager/readme.md @@ -85,7 +85,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 @@ -114,45 +114,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.notificationhubs - package-name: azure-mgmt-notificationhubs - clear-output-folder: true -``` - -``` yaml $(python) && $(track2) -python-mode: create -azure-arm: true -license-header: MICROSOFT_MIT_NO_VERSION -namespace: azure.mgmt.notificationhubs -package-name: azure-mgmt-notificationhubs -package-version: 7.0.0b1 -clear-output-folder: true -``` - -``` yaml $(python) && $(python-mode) == 'update' -no-namespace-folders: true -output-folder: $(python-sdks-folder)/notificationhubs/azure-mgmt-notificationhubs/azure/mgmt/notificationhubs -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/notificationhubs/azure-mgmt-notificationhubs/azure/mgmt/notificationhubs -``` -``` yaml $(python) && $(python-mode) == 'create' -basic-setup-py: true -output-folder: $(python-sdks-folder)/notificationhubs/azure-mgmt-notificationhubs -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/notificationhubs/azure-mgmt-notificationhubs -``` +See configuration in [readme.python.md](./readme.python.md) ## Go diff --git a/specification/notificationhubs/resource-manager/readme.python.md b/specification/notificationhubs/resource-manager/readme.python.md new file mode 100644 index 00000000000..7eba098121a --- /dev/null +++ b/specification/notificationhubs/resource-manager/readme.python.md @@ -0,0 +1,24 @@ +## 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) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.notificationhubs +package-name: azure-mgmt-notificationhubs +package-version: 7.0.0b1 +clear-output-folder: true +``` + +``` yaml $(python) && $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/notificationhubs/azure-mgmt-notificationhubs/azure/mgmt/notificationhubs +``` +``` yaml $(python) && $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/notificationhubs/azure-mgmt-notificationhubs +``` \ No newline at end of file diff --git a/specification/recoveryservices/resource-manager/readme.md b/specification/recoveryservices/resource-manager/readme.md index cedd31067b1..6e77bf3f3b9 100644 --- a/specification/recoveryservices/resource-manager/readme.md +++ b/specification/recoveryservices/resource-manager/readme.md @@ -124,7 +124,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 @@ -154,6 +154,10 @@ csharp: See configuration in [readme.go.md](./readme.go.md) +## Python + +See configuration in [readme.python.md](./readme.python.md) + ## Java These settings apply only when `--java` is specified on the command line. diff --git a/specification/recoveryservices/resource-manager/readme.python.md b/specification/recoveryservices/resource-manager/readme.python.md index 777ef088bf3..6691aa8e3cb 100644 --- a/specification/recoveryservices/resource-manager/readme.python.md +++ b/specification/recoveryservices/resource-manager/readme.python.md @@ -4,31 +4,13 @@ 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.recoveryservices - package-name: azure-mgmt-recoveryservices - clear-output-folder: true -``` - ``` yaml $(python) && $(track2) -python-mode: create azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION namespace: azure.mgmt.recoveryservices package-name: azure-mgmt-recoveryservices package-version: 1.0.0b1 -clear-output-folder: false -``` - -``` yaml $(python) && $(python-mode) == 'update' && !$(track2) -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices +clear-output-folder: true ``` ``` yaml $(python) && $(python-mode) == 'update' && $(track2) @@ -36,12 +18,6 @@ no-namespace-folders: true output-folder: $(python-sdks-folder)/recoveryservices/azure-mgmt-recoveryservices/azure/mgmt/recoveryservices ``` -``` yaml $(python) && $(python-mode) == 'create' && !$(track2) -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/recoveryservices/azure-mgmt-recoveryservices -``` - ``` yaml $(python) && $(python-mode) == 'create' && $(track2) basic-setup-py: true output-folder: $(python-sdks-folder)/recoveryservices/azure-mgmt-recoveryservices diff --git a/specification/search/resource-manager/readme.md b/specification/search/resource-manager/readme.md index e3df4881968..b02b0f47a11 100644 --- a/specification/search/resource-manager/readme.md +++ b/specification/search/resource-manager/readme.md @@ -103,7 +103,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 @@ -133,6 +133,10 @@ csharp: See configuration in [readme.go.md](./readme.go.md) +## Go + +See configuration in [readme.python.md](./readme.python.md) + ## Java These settings apply only when `--java` is specified on the command line. diff --git a/specification/search/resource-manager/readme.python.md b/specification/search/resource-manager/readme.python.md index 060c5767764..610b7669a72 100644 --- a/specification/search/resource-manager/readme.python.md +++ b/specification/search/resource-manager/readme.python.md @@ -4,23 +4,19 @@ 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.search - package-name: azure-mgmt-search - clear-output-folder: true +``` yaml $(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +namespace: azure.mgmt.search +package-name: azure-mgmt-search +package-version: 1.0.0b1 +clear-output-folder: true ``` -``` yaml $(python) && $(python-mode) == 'update' -python: - no-namespace-folders: true - output-folder: $(python-sdks-folder)/search/azure-mgmt-search/azure/mgmt/search +``` yaml $(python) && $(python-mode) == 'update' && $(track2) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/search/azure-mgmt-search/azure/mgmt/search ``` -``` yaml $(python) && $(python-mode) == 'create' -python: - basic-setup-py: true - output-folder: $(python-sdks-folder)/search/azure-mgmt-search +``` yaml $(python) && $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/search/azure-mgmt-search ```