From 1e269428e64e17ea1ba4065fcb123c8d456444eb Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Sat, 7 May 2022 11:23:00 +0800 Subject: [PATCH] update --- .../dev_requirements.txt | 0 .../main.py} | 8 ++++---- .../template/CHANGELOG.md | 0 .../template/LICENSE | 0 .../template/MANIFEST.in | 0 .../template/README.md | 0 .../template/__init__.py | 0 .../template/dev_requirements.txt | 4 ++-- .../template/sdk_packaging.toml | 0 .../template/setup.py | 8 +------- .../template/swagger_README.md | 5 ++--- .../template_samples/sample.py | 0 .../template_tests/test_smoke.py | 0 .../template_tests/test_smoke_async.py | 0 .../template_tests/testcase.py | 0 .../template_tests/testcase_async.py | 0 .../template_tests/conftest.py | 15 --------------- 17 files changed, 9 insertions(+), 31 deletions(-) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/dev_requirements.txt (100%) rename scripts/{quickstart_tooling_llc/llc_initial.py => quickstart_tooling_dpg/main.py} (95%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/CHANGELOG.md (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/LICENSE (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/MANIFEST.in (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/README.md (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/__init__.py (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/dev_requirements.txt (86%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/sdk_packaging.toml (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/setup.py (97%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template/swagger_README.md (81%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template_samples/sample.py (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template_tests/test_smoke.py (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template_tests/test_smoke_async.py (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template_tests/testcase.py (100%) rename scripts/{quickstart_tooling_llc => quickstart_tooling_dpg}/template_tests/testcase_async.py (100%) delete mode 100644 scripts/quickstart_tooling_llc/template_tests/conftest.py diff --git a/scripts/quickstart_tooling_llc/dev_requirements.txt b/scripts/quickstart_tooling_dpg/dev_requirements.txt similarity index 100% rename from scripts/quickstart_tooling_llc/dev_requirements.txt rename to scripts/quickstart_tooling_dpg/dev_requirements.txt diff --git a/scripts/quickstart_tooling_llc/llc_initial.py b/scripts/quickstart_tooling_dpg/main.py similarity index 95% rename from scripts/quickstart_tooling_llc/llc_initial.py rename to scripts/quickstart_tooling_dpg/main.py index 4018c37aac81..97cc1d81f5d6 100644 --- a/scripts/quickstart_tooling_llc/llc_initial.py +++ b/scripts/quickstart_tooling_dpg/main.py @@ -77,8 +77,8 @@ def build_package(**kwargs) -> None: # generate code with autorest and swagger readme _LOGGER.info("generate SDK code with autorest") - check_call(f'autorest --version=3.7.2 --python --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.2' - f' --python-mode=update {swagger_readme}', shell=True) + check_call(f'autorest --version=3.7.2 --use=@autorest/python@5.16.0 --use=@autorest/modelerfour@4.19.3' + f' {swagger_readme}', shell=True) # generate necessary file(setup.py, CHANGELOG.md, etc) work_path = Path(output_folder) @@ -130,8 +130,8 @@ def main(**kwargs): " or `D:\\azure-rest-api-specs\\specification\\webpubsub\\data-plane\\WebPubSub\\stable\\2021-10-01\\webpubsub.json`", ) parser.add_argument( - "--credential-scope", "-c", - dest="credential_scope", + "--security-scope", "-c", + dest="security_scope", required=True, help="Each service for data plan should have specific scopes", ) diff --git a/scripts/quickstart_tooling_llc/template/CHANGELOG.md b/scripts/quickstart_tooling_dpg/template/CHANGELOG.md similarity index 100% rename from scripts/quickstart_tooling_llc/template/CHANGELOG.md rename to scripts/quickstart_tooling_dpg/template/CHANGELOG.md diff --git a/scripts/quickstart_tooling_llc/template/LICENSE b/scripts/quickstart_tooling_dpg/template/LICENSE similarity index 100% rename from scripts/quickstart_tooling_llc/template/LICENSE rename to scripts/quickstart_tooling_dpg/template/LICENSE diff --git a/scripts/quickstart_tooling_llc/template/MANIFEST.in b/scripts/quickstart_tooling_dpg/template/MANIFEST.in similarity index 100% rename from scripts/quickstart_tooling_llc/template/MANIFEST.in rename to scripts/quickstart_tooling_dpg/template/MANIFEST.in diff --git a/scripts/quickstart_tooling_llc/template/README.md b/scripts/quickstart_tooling_dpg/template/README.md similarity index 100% rename from scripts/quickstart_tooling_llc/template/README.md rename to scripts/quickstart_tooling_dpg/template/README.md diff --git a/scripts/quickstart_tooling_llc/template/__init__.py b/scripts/quickstart_tooling_dpg/template/__init__.py similarity index 100% rename from scripts/quickstart_tooling_llc/template/__init__.py rename to scripts/quickstart_tooling_dpg/template/__init__.py diff --git a/scripts/quickstart_tooling_llc/template/dev_requirements.txt b/scripts/quickstart_tooling_dpg/template/dev_requirements.txt similarity index 86% rename from scripts/quickstart_tooling_llc/template/dev_requirements.txt rename to scripts/quickstart_tooling_dpg/template/dev_requirements.txt index 892121489c50..8d3c7d8e1144 100644 --- a/scripts/quickstart_tooling_llc/template/dev_requirements.txt +++ b/scripts/quickstart_tooling_dpg/template/dev_requirements.txt @@ -2,6 +2,6 @@ -e ../../../tools/azure-sdk-tools ../../core/azure-core ../../identity/azure-identity -aiohttp>=3.0; +aiohttp>=3.0 typing_extensions>=3.7.2 -asyncio; +asyncio diff --git a/scripts/quickstart_tooling_llc/template/sdk_packaging.toml b/scripts/quickstart_tooling_dpg/template/sdk_packaging.toml similarity index 100% rename from scripts/quickstart_tooling_llc/template/sdk_packaging.toml rename to scripts/quickstart_tooling_dpg/template/sdk_packaging.toml diff --git a/scripts/quickstart_tooling_llc/template/setup.py b/scripts/quickstart_tooling_dpg/template/setup.py similarity index 97% rename from scripts/quickstart_tooling_llc/template/setup.py rename to scripts/quickstart_tooling_dpg/template/setup.py index f783f701cbf3..f69ec85d0cd9 100644 --- a/scripts/quickstart_tooling_llc/template/setup.py +++ b/scripts/quickstart_tooling_dpg/template/setup.py @@ -5,14 +5,10 @@ # Licensed under the MIT License. See License.txt in the project root for # license information. # -------------------------------------------------------------------------- - - import os import re - from setuptools import setup, find_packages - # Change the PACKAGE_NAME only to change folder and different name PACKAGE_NAME = "{{ package_name }}" PACKAGE_PPRINT_NAME = "{{ package_pprint_name }}" @@ -20,7 +16,6 @@ # a-b-c => a/b/c package_folder_path = PACKAGE_NAME.replace("-", "/") - # Version extraction inspired from 'requests' with open(os.path.join(package_folder_path, "_version.py"), "r") as fd: version = re.search( @@ -61,9 +56,8 @@ ] ), install_requires=[ - "azure-core<2.0.0,>=1.19.1", + "azure-core<2.0.0,>=1.23.0", "msrest>=0.6.21", - 'six>=1.11.0', ], python_requires=">=3.6", ) diff --git a/scripts/quickstart_tooling_llc/template/swagger_README.md b/scripts/quickstart_tooling_dpg/template/swagger_README.md similarity index 81% rename from scripts/quickstart_tooling_llc/template/swagger_README.md rename to scripts/quickstart_tooling_dpg/template/swagger_README.md index 0bb62589fe65..184ca45e76da 100644 --- a/scripts/quickstart_tooling_llc/template/swagger_README.md +++ b/scripts/quickstart_tooling_dpg/template/swagger_README.md @@ -8,10 +8,9 @@ package-name: {{ package_name }} license-header: MICROSOFT_MIT_NO_VERSION clear-output-folder: true no-namespace-folders: true -python: true title: {{ client_name }} version-tolerant: true package-version: 1.0.0b1 -add-credential: true -credential-scopes: {{ credential_scope }} +security: AADToken +security-scopes: {{ security_scope }} ``` diff --git a/scripts/quickstart_tooling_llc/template_samples/sample.py b/scripts/quickstart_tooling_dpg/template_samples/sample.py similarity index 100% rename from scripts/quickstart_tooling_llc/template_samples/sample.py rename to scripts/quickstart_tooling_dpg/template_samples/sample.py diff --git a/scripts/quickstart_tooling_llc/template_tests/test_smoke.py b/scripts/quickstart_tooling_dpg/template_tests/test_smoke.py similarity index 100% rename from scripts/quickstart_tooling_llc/template_tests/test_smoke.py rename to scripts/quickstart_tooling_dpg/template_tests/test_smoke.py diff --git a/scripts/quickstart_tooling_llc/template_tests/test_smoke_async.py b/scripts/quickstart_tooling_dpg/template_tests/test_smoke_async.py similarity index 100% rename from scripts/quickstart_tooling_llc/template_tests/test_smoke_async.py rename to scripts/quickstart_tooling_dpg/template_tests/test_smoke_async.py diff --git a/scripts/quickstart_tooling_llc/template_tests/testcase.py b/scripts/quickstart_tooling_dpg/template_tests/testcase.py similarity index 100% rename from scripts/quickstart_tooling_llc/template_tests/testcase.py rename to scripts/quickstart_tooling_dpg/template_tests/testcase.py diff --git a/scripts/quickstart_tooling_llc/template_tests/testcase_async.py b/scripts/quickstart_tooling_dpg/template_tests/testcase_async.py similarity index 100% rename from scripts/quickstart_tooling_llc/template_tests/testcase_async.py rename to scripts/quickstart_tooling_dpg/template_tests/testcase_async.py diff --git a/scripts/quickstart_tooling_llc/template_tests/conftest.py b/scripts/quickstart_tooling_llc/template_tests/conftest.py deleted file mode 100644 index a6ab83f7f5f0..000000000000 --- a/scripts/quickstart_tooling_llc/template_tests/conftest.py +++ /dev/null @@ -1,15 +0,0 @@ -# coding: utf-8 -# ------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -------------------------------------------------------------------------- - -import sys - -# fixture needs to be visible from conftest - -# Ignore async tests for Python < 3.5 -collect_ignore_glob = [] -if sys.version_info < (3, 5): - collect_ignore_glob.append("*_async.py") \ No newline at end of file