From b1ca1b7e45178702e604bd18bb879be9ba84c9e8 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 28 Jan 2022 11:16:59 +0800 Subject: [PATCH 01/82] fix auto-ask-check bug --- scripts/release_issue_status/main.py | 22 +++++++------------ .../release_issue_status.yml | 6 +++++ .../release_issue_status/reply_generator.py | 3 ++- scripts/release_issue_status/requirement.txt | 3 +-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/release_issue_status/main.py b/scripts/release_issue_status/main.py index eff130e04ba5..f892a08eae46 100644 --- a/scripts/release_issue_status/main.py +++ b/scripts/release_issue_status/main.py @@ -7,9 +7,8 @@ import logging from github import Github -from azure.storage.blob import BlobClient +from reply_generator import AUTO_ASK_FOR_CHECK, begin_reply_generate -import reply_generator as rg from utils import update_issue_body, get_readme_and_output_folder, \ get_python_pipelines, get_pipeline_url, auto_close_issue @@ -144,7 +143,7 @@ def _latest_comment_time(comments, delay_from_create_date): return delay_from_create_date if not q else int((time.time() - q[-1][0]) / 3600 / 24) -def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines, assigner_repoes): +def auto_reply(item, request_repo, rest_repo, duplicated_issue, python_piplines, assigner_repoes): logging.info("new issue number: {}".format(item.issue_object.number)) assigner_repo = assigner_repoes[item.assignee] if 'auto-link' not in item.labels: @@ -171,8 +170,7 @@ def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python raise try: pipeline_url = get_pipeline_url(python_piplines, output_folder) - rg.begin_reply_generate(item=item, rest_repo=rest_repo, readme_link=readme_link, - pipeline_url=pipeline_url) + begin_reply_generate(item=item, rest_repo=rest_repo, readme_link=readme_link, pipeline_url=pipeline_url) if 'Configured' in item.labels: item.issue_object.remove_from_labels('Configured') except Exception as e: @@ -253,10 +251,11 @@ def main(): item.issue_object.add_to_assignees(_PYTHON_SDK_ASSIGNEES[assign_count]) item.assignee = item.issue_object.assignee.login item.issue_object.add_to_labels('assigned') - try: - auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines, assigner_repoes) - except Exception as e: - continue + if AUTO_ASK_FOR_CHECK not in item.labels: + try: + auto_reply(item, request_repo, rest_repo, duplicated_issue, python_piplines, assigner_repoes) + except Exception as e: + continue elif not item.author_latest_comment in _PYTHON_SDK_ADMINISTRATORS: item.bot_advice = 'new comment.
' if item.comment_num > 1 and item.language == 'Python': @@ -295,11 +294,6 @@ def main(): print_check('git commit -m \"update excel\"') print_check('git push -f origin HEAD') -# upload to storage account(it is created in advance) -# blob = BlobClient.from_connection_string(conn_str=os.getenv('CONN_STR'), container_name=os.getenv('FILE'), -# blob_name=_FILE_OUT) -# with open(_FILE_OUT, 'rb') as data: -# blob.upload_blob(data, overwrite=True) if __name__ == '__main__': main() diff --git a/scripts/release_issue_status/release_issue_status.yml b/scripts/release_issue_status/release_issue_status.yml index d79e7dd19b2d..2e384ec47b36 100644 --- a/scripts/release_issue_status/release_issue_status.yml +++ b/scripts/release_issue_status/release_issue_status.yml @@ -7,6 +7,12 @@ trigger: exclude: - '*' +# avoid being triggered as part of CI check +pr: + branches: + exclude: + - '*' + schedules: - cron: "0,30 1-9 * * *" displayName: Daily release diff --git a/scripts/release_issue_status/reply_generator.py b/scripts/release_issue_status/reply_generator.py index 3659f19bd33d..5a3ebc6b206c 100644 --- a/scripts/release_issue_status/reply_generator.py +++ b/scripts/release_issue_status/reply_generator.py @@ -6,6 +6,7 @@ logging.basicConfig(level=logging.INFO, format='[auto-reply log] - %(funcName)s[line:%(lineno)d] - %(levelname)s: %(message)s') +AUTO_ASK_FOR_CHECK = 'auto-ask-check' def readme_comparison(rest_repo, link_dict, labels): # to see whether need change readme @@ -68,6 +69,6 @@ def begin_reply_generate(item, rest_repo, readme_link, pipeline_url): logging.info(f'{issue_object_rg.number} run pipeline successfully') else: logging.info(f'{issue_object_rg.number} run pipeline fail') - issue_object_rg.add_to_labels('auto-ask-check') + issue_object_rg.add_to_labels(AUTO_ASK_FOR_CHECK) else: logging.info('issue {} need config readme'.format(issue_object_rg.number)) diff --git a/scripts/release_issue_status/requirement.txt b/scripts/release_issue_status/requirement.txt index 512d9702666a..95f800db46db 100644 --- a/scripts/release_issue_status/requirement.txt +++ b/scripts/release_issue_status/requirement.txt @@ -2,6 +2,5 @@ PyGithub datetime requests bs4 -azure.storage.blob==12.8.1 -azure-devops +azure-devops msrest From 5ae58ab80ac68b7f25e74ad99abe0b4e5894fc2a Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 16 Feb 2022 17:07:08 +0800 Subject: [PATCH 02/82] update comment --- scripts/auto_release/main.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 34e56022cd2e..eb2f1a746e27 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -410,6 +410,11 @@ def check_file(self): def sdk_code_path(self) -> str: return str(Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}')) + @property + def whether_single_path(self) -> bool: + path = sum([os.path.isdir(listx) for listx in os.listdir(str(Path(f'sdk/{self.sdk_folder}'))]) + return True if path==1 else False + @return_origin_path def install_package_locally(self): os.chdir(self.sdk_code_path()) @@ -454,6 +459,8 @@ def create_pr_proc(self): pr_head = "{}:{}".format(os.getenv('USR_NAME'), self.new_branch) pr_base = 'main' pr_body = "{} \n{} \n{}".format(self.issue_link, self.test_result, self.pipeline_link) + if not self.whether_single_path: + pr_body += f'\nBuildTargetingString: {self.package_name}\nSkip.CreateApiReview: true' res_create = api.pulls.create(pr_title, pr_head, pr_base, pr_body) # Add issue link on PR From 79a3594aad784b3da87b13f474d4679c18e53bda Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Wed, 16 Feb 2022 17:26:21 +0800 Subject: [PATCH 03/82] update comment --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index eb2f1a746e27..b8e4ef288b1f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -412,7 +412,7 @@ def sdk_code_path(self) -> str: @property def whether_single_path(self) -> bool: - path = sum([os.path.isdir(listx) for listx in os.listdir(str(Path(f'sdk/{self.sdk_folder}'))]) + path = sum([os.path.isdir(listx) for listx in os.listdir(str(Path(f'sdk/{self.sdk_folder}')))]) return True if path==1 else False @return_origin_path From 7071377db0a8fcbdc037acc47beaed7ab13c0572 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Thu, 17 Feb 2022 10:03:42 +0800 Subject: [PATCH 04/82] fix bug --- scripts/auto_release/main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b8e4ef288b1f..4e4aa35ca259 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -412,8 +412,9 @@ def sdk_code_path(self) -> str: @property def whether_single_path(self) -> bool: - path = sum([os.path.isdir(listx) for listx in os.listdir(str(Path(f'sdk/{self.sdk_folder}')))]) - return True if path==1 else False + path = str(Path(f'sdk/{self.sdk_folder}')) + num = sum([os.path.isdir(f'{path}/{listx}') for listx in os.listdir(path)]) + return True if num == 1 else False @return_origin_path def install_package_locally(self): @@ -460,7 +461,7 @@ def create_pr_proc(self): pr_base = 'main' pr_body = "{} \n{} \n{}".format(self.issue_link, self.test_result, self.pipeline_link) if not self.whether_single_path: - pr_body += f'\nBuildTargetingString: {self.package_name}\nSkip.CreateApiReview: true' + pr_body += f'\nBuildTargetingString\n azure-mgmt-{self.package_name}\nSkip.CreateApiReview\ntrue' res_create = api.pulls.create(pr_title, pr_head, pr_base, pr_body) # Add issue link on PR From 8f6fe79664db8c2957009fcc3058c85d68c3ccfd Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 17 Feb 2022 10:26:05 +0800 Subject: [PATCH 05/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 4e4aa35ca259..97620c4f9b64 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -414,7 +414,7 @@ def sdk_code_path(self) -> str: def whether_single_path(self) -> bool: path = str(Path(f'sdk/{self.sdk_folder}')) num = sum([os.path.isdir(f'{path}/{listx}') for listx in os.listdir(path)]) - return True if num == 1 else False + return num == 1 @return_origin_path def install_package_locally(self): From 8d23d87d7dea6d635316ac75fddc1f37aaeef644 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Thu, 17 Feb 2022 10:44:21 +0800 Subject: [PATCH 06/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 97620c4f9b64..ef846cc0534a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -413,7 +413,7 @@ def sdk_code_path(self) -> str: @property def whether_single_path(self) -> bool: path = str(Path(f'sdk/{self.sdk_folder}')) - num = sum([os.path.isdir(f'{path}/{listx}') for listx in os.listdir(path)]) + num = sum([os.path.isdir(str(Path(f'{path}/{listx}'))) for listx in os.listdir(path)]) return num == 1 @return_origin_path From 44faa80efb2b2b16c65e93f55df1432feb4cb8f1 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Thu, 17 Feb 2022 10:46:51 +0800 Subject: [PATCH 07/82] Update main.py --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ef846cc0534a..b6a791bda638 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -411,7 +411,7 @@ def sdk_code_path(self) -> str: return str(Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}')) @property - def whether_single_path(self) -> bool: + def is_single_path(self) -> bool: path = str(Path(f'sdk/{self.sdk_folder}')) num = sum([os.path.isdir(str(Path(f'{path}/{listx}'))) for listx in os.listdir(path)]) return num == 1 @@ -460,7 +460,7 @@ def create_pr_proc(self): pr_head = "{}:{}".format(os.getenv('USR_NAME'), self.new_branch) pr_base = 'main' pr_body = "{} \n{} \n{}".format(self.issue_link, self.test_result, self.pipeline_link) - if not self.whether_single_path: + if not self.is_single_path: pr_body += f'\nBuildTargetingString\n azure-mgmt-{self.package_name}\nSkip.CreateApiReview\ntrue' res_create = api.pulls.create(pr_title, pr_head, pr_base, pr_body) From 84768ebf73ec5cb679abd0a91a97651cb6ee2daf Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 18 Feb 2022 11:01:16 +0800 Subject: [PATCH 08/82] fix changelog format for new service --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b6a791bda638..1b129be68cce 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -367,7 +367,7 @@ def edit_changelog_for_new_service(self): def edit_changelog_for_new_service_proc(content: List[str]): for i in range(0, len(content)): if '##' in content[i]: - content[i] = f'## {self.next_version}({current_time()})' + content[i] = f'## {self.next_version}({current_time()})\n\n' break modify_file(str(Path(self.sdk_code_path()) / 'CHANGELOG.md'), edit_changelog_for_new_service_proc) From 29f9a86b805ca6f507a0fde8fd6f70ea36d4c19d Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 18 Feb 2022 15:39:12 +0800 Subject: [PATCH 09/82] fix check_pprint_name bug --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 1b129be68cce..ea59218a1b1c 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -266,7 +266,7 @@ def edit_file_for_pprint_name(content: List[str]): for file in os.listdir(self.sdk_code_path()): if os.path.isfile(file): - modify_file(file, edit_file_for_pprint_name) + modify_file(str(Path(self.sdk_code_path()) / file), edit_file_for_pprint_name) log(f' replace \"MyService\" with \"{pprint_name}\" successfully ') def get_all_files_under_package_folder(self) -> List[str]: From 5b11c1267cd1e2f0480f0b8b67b3e021c9e4b042 Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 18 Feb 2022 17:14:49 +0800 Subject: [PATCH 10/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ea59218a1b1c..f3b229318e8c 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -367,7 +367,7 @@ def edit_changelog_for_new_service(self): def edit_changelog_for_new_service_proc(content: List[str]): for i in range(0, len(content)): if '##' in content[i]: - content[i] = f'## {self.next_version}({current_time()})\n\n' + content[i] = f'## {self.next_version}({current_time()})\n' break modify_file(str(Path(self.sdk_code_path()) / 'CHANGELOG.md'), edit_changelog_for_new_service_proc) From 6b13133eb4920748e9d34d317117b5bec2d4aad9 Mon Sep 17 00:00:00 2001 From: BigCat20196 <1095260342@qq.com> Date: Fri, 18 Feb 2022 17:35:29 +0800 Subject: [PATCH 11/82] fix check_pprint_name bug --- scripts/auto_release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ea59218a1b1c..5f56b69f5677 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -265,8 +265,9 @@ def edit_file_for_pprint_name(content: List[str]): content[i] = content[i].replace('MyService', pprint_name) for file in os.listdir(self.sdk_code_path()): - if os.path.isfile(file): - modify_file(str(Path(self.sdk_code_path()) / file), edit_file_for_pprint_name) + file_path = str(Path(self.sdk_code_path()) / file) + if os.path.isfile(file_path): + modify_file(file_path, edit_file_for_pprint_name) log(f' replace \"MyService\" with \"{pprint_name}\" successfully ') def get_all_files_under_package_folder(self) -> List[str]: From c53585bd9a43bb28d99907fe0c9a52692c7d4a9e Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Mon, 21 Feb 2022 10:02:18 +0800 Subject: [PATCH 12/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 89f44635cbf6..be3277b51dba 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -368,7 +368,7 @@ def edit_changelog_for_new_service(self): def edit_changelog_for_new_service_proc(content: List[str]): for i in range(0, len(content)): if '##' in content[i]: - content[i] = f'## {self.next_version}({current_time()})\n' + content[i] = f'## {self.next_version} ({current_time()})\n' break modify_file(str(Path(self.sdk_code_path()) / 'CHANGELOG.md'), edit_changelog_for_new_service_proc) From 90ab52db6e0b0bb00dc8b5ee0b3ae5e62b8b496e Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Fri, 4 Mar 2022 10:34:22 +0800 Subject: [PATCH 13/82] Update main.py --- scripts/auto_release/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index be3277b51dba..adeaa514a600 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -549,7 +549,8 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_check('git push origin HEAD -f') + print_exec('git remote add azure https://github.com/Azure/azure-sdk-for-python.git') + print_check('git push azure HEAD -f') # create PR self.create_pr_proc() From c12493377629bfa23b137ce47bc4cbd3929c0742 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 15:15:54 +0800 Subject: [PATCH 14/82] test --- scripts/auto_release/main.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index adeaa514a600..ae1ab4c4685a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -44,6 +44,10 @@ def print_exec_output(cmd: str) -> List[str]: def print_check(cmd): log(cmd) subprocess.check_call(cmd, shell=True) + +def print_check_with_path(cmd, path): + log(cmd) + subprocess.check_call(cmd, shell=True, cwd=path) def preview_version_plus(preview_label: str, last_version: str) -> str: @@ -257,6 +261,11 @@ def edit_sdk_setup(content: List[str]): modify_file(str(Path(self.sdk_code_path()) / 'setup.py'), edit_sdk_setup) + # Use the template to update readme and setup by packaging_tools + def check_sdk_readme_and_setup(self): + path = self.sdk_folder + print_check_with_path(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}',path) + def check_pprint_name(self): pprint_name = self.package_name.capitalize() @@ -403,6 +412,8 @@ def check_ci_file(self): def check_file(self): self.check_pprint_name() + # self.check_sdk_readme_and_setup() + print(f'**{self.sdk_folder=}') self.check_sdk_setup() self.check_version() self.check_changelog_file() From e6f89a28194227fc445630a5219d68e92b6b865c Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 15:33:30 +0800 Subject: [PATCH 15/82] test --- scripts/auto_release/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ae1ab4c4685a..f3bbf7354eba 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -263,8 +263,9 @@ def edit_sdk_setup(content: List[str]): # Use the template to update readme and setup by packaging_tools def check_sdk_readme_and_setup(self): - path = self.sdk_folder + path = str(Path(f'sdk/{self.sdk_folder}')) print_check_with_path(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}',path) + log(f' packaging_tools --build-conf successfully ') def check_pprint_name(self): pprint_name = self.package_name.capitalize() @@ -412,9 +413,8 @@ def check_ci_file(self): def check_file(self): self.check_pprint_name() - # self.check_sdk_readme_and_setup() - print(f'**{self.sdk_folder=}') - self.check_sdk_setup() + self.check_sdk_readme_and_setup() + # self.check_sdk_setup() self.check_version() self.check_changelog_file() self.check_ci_file() From 76faf366ed883ff42f43201e443e42d529b97329 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 15:38:38 +0800 Subject: [PATCH 16/82] change to azclibot --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index f3bbf7354eba..6c19b2ad524b 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -560,8 +560,8 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_exec('git remote add azure https://github.com/Azure/azure-sdk-for-python.git') - print_check('git push azure HEAD -f') + print_exec('git remote add azclibot https://github.com/azclibot/azure-sdk-for-python.git') + print_check('git push azclibot HEAD -f') # create PR self.create_pr_proc() From ffb8635ac54beb77a939a8d6425d40449fa264a5 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 16:03:04 +0800 Subject: [PATCH 17/82] change to azure --- scripts/auto_release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 6c19b2ad524b..e7b3c1f1fd25 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -560,8 +560,9 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_exec('git remote add azclibot https://github.com/azclibot/azure-sdk-for-python.git') - print_check('git push azclibot HEAD -f') + print_exec('git remote add azure https://github.com/azure/azure-sdk-for-python.git') + res1 = print_exec_output('git push azure HEAD -f') + print(f'{res1=}') # create PR self.create_pr_proc() From 40a0f7469c08c85052d1b7970a8b776b5b39a20f Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 16:28:05 +0800 Subject: [PATCH 18/82] fix push --- scripts/auto_release/main.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index e7b3c1f1fd25..907319d6dd27 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -560,9 +560,7 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_exec('git remote add azure https://github.com/azure/azure-sdk-for-python.git') - res1 = print_exec_output('git push azure HEAD -f') - print(f'{res1=}') + print_exec('git push origin HEAD -f') # create PR self.create_pr_proc() From 2f6b17443de2adc53d98e0663c596920e57c9cde Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 16:55:04 +0800 Subject: [PATCH 19/82] test --- scripts/auto_release/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 907319d6dd27..f57c7fc22d08 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -85,8 +85,10 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'Azure' - branch = 'main' + # usr = 'Azure' + usr = 'azclibot' + # branch = 'main' + branch = 't2-advisor-2022-03-09-54263' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From d5ce82678a6873af4ecb7add4e8d357aa80cddf2 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:16:59 +0800 Subject: [PATCH 20/82] update --- scripts/auto_release/main.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index f57c7fc22d08..840d003da8f6 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -85,10 +85,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - # usr = 'Azure' - usr = 'azclibot' - # branch = 'main' - branch = 't2-advisor-2022-03-09-54263' + usr = 'Azure' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') @@ -416,7 +414,6 @@ def check_ci_file(self): def check_file(self): self.check_pprint_name() self.check_sdk_readme_and_setup() - # self.check_sdk_setup() self.check_version() self.check_changelog_file() self.check_ci_file() @@ -562,7 +559,7 @@ def create_pr(self): # commit all code print_exec('git add sdk/') print_exec('git commit -m \"code and test\"') - print_exec('git push origin HEAD -f') + print_check('git push origin HEAD -f') # create PR self.create_pr_proc() From 79a553e181ba5df0ff1df165259a6804c5dbb7f3 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:35:48 +0800 Subject: [PATCH 21/82] update --- scripts/auto_release/main.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 840d003da8f6..3d56acdb7b67 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -44,10 +44,6 @@ def print_exec_output(cmd: str) -> List[str]: def print_check(cmd): log(cmd) subprocess.check_call(cmd, shell=True) - -def print_check_with_path(cmd, path): - log(cmd) - subprocess.check_call(cmd, shell=True, cwd=path) def preview_version_plus(preview_label: str, last_version: str) -> str: @@ -262,9 +258,10 @@ def edit_sdk_setup(content: List[str]): modify_file(str(Path(self.sdk_code_path()) / 'setup.py'), edit_sdk_setup) # Use the template to update readme and setup by packaging_tools + @return_origin_path def check_sdk_readme_and_setup(self): - path = str(Path(f'sdk/{self.sdk_folder}')) - print_check_with_path(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}',path) + os.chdir(Path(f'sdk/{self.sdk_folder}')) + print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') log(f' packaging_tools --build-conf successfully ') def check_pprint_name(self): @@ -414,6 +411,8 @@ def check_ci_file(self): def check_file(self): self.check_pprint_name() self.check_sdk_readme_and_setup() + self.check_sdk_readme() + self.check_sdk_setup() self.check_version() self.check_changelog_file() self.check_ci_file() From ec747f10069fc9a93a933dc1873cc3d21b626a3e Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:36:48 +0800 Subject: [PATCH 22/82] test --- scripts/auto_release/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 3d56acdb7b67..301eb40de681 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,10 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'Azure' - branch = 'main' + # usr = 'Azure' + # branch = 'main' + usr = 'azclibot' + branch = 't2-advisor-2022-03-09-54263' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 6f51fc8d963e90275e951bbc9deac79d04aa25d7 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:48:34 +0800 Subject: [PATCH 23/82] test --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 301eb40de681..b58cec549b3e 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -241,7 +241,7 @@ def prepare_branch(self): # self.prepare_branch_with_base_branch() def check_sdk_readme(self): - sdk_readme = str(Path(f'sdk/{self.sdk_folder}/{self.package_name}/README.md')) + sdk_readme = str(Path(f'sdk/{self.sdk_folder}/azure-mgmt-{self.package_name}/README.md')) def edit_sdk_readme(content: List[str]): for i in range(0, len(content)): From 7107723a4d1ada144363da3cb3e0e03cecbb426a Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Wed, 9 Mar 2022 17:57:28 +0800 Subject: [PATCH 24/82] reduction --- scripts/auto_release/main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b58cec549b3e..347e9c4bc671 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,10 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - # usr = 'Azure' - # branch = 'main' - usr = 'azclibot' - branch = 't2-advisor-2022-03-09-54263' + usr = 'Azure' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 6885266bf40f30462904c8720dcdfb60e4dfb06d Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 11 Mar 2022 10:35:37 +0800 Subject: [PATCH 25/82] update main --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 347e9c4bc671..86667e0648aa 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -259,7 +259,7 @@ def edit_sdk_setup(content: List[str]): # Use the template to update readme and setup by packaging_tools @return_origin_path - def check_sdk_readme_and_setup(self): + def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') log(f' packaging_tools --build-conf successfully ') @@ -409,8 +409,8 @@ def check_ci_file(self): self.check_ci_file_proc('azure-mgmt-core>=1.3.0,<2.0.0') def check_file(self): + self.check_file_with_packaging_tool() self.check_pprint_name() - self.check_sdk_readme_and_setup() self.check_sdk_readme() self.check_sdk_setup() self.check_version() From 6c9bbbd6d39b9511ff5cece8fc7b7a78eb09f6bf Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 11 Mar 2022 13:26:47 +0800 Subject: [PATCH 26/82] delete f --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 86667e0648aa..1eba85942dde 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -262,7 +262,7 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') - log(f' packaging_tools --build-conf successfully ') + log(' packaging_tools --build-conf successfully ') def check_pprint_name(self): pprint_name = self.package_name.capitalize() From c2cb7e410d7bcda61ddc240e5a26a6ab0c0316c2 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:13:52 +0800 Subject: [PATCH 27/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 1eba85942dde..ed36d5c9cd93 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -262,7 +262,7 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') - log(' packaging_tools --build-conf successfully ') + log('packaging_tools --build-conf successfully ') def check_pprint_name(self): pprint_name = self.package_name.capitalize() From 5164abe59c5c24f5dc00370d24bc09827218fcaf Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 28 Mar 2022 10:40:56 +0800 Subject: [PATCH 28/82] test --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ed36d5c9cd93..633f884f6e26 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'main' + branch = 'test_autorest_03_18' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From cdb30c42eb9c87048c722ef398bd27fd5550e654 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 28 Mar 2022 11:22:00 +0800 Subject: [PATCH 29/82] test --- scripts/auto_release/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 633f884f6e26..9655fd7e980d 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,10 +173,10 @@ def generate_code(self): # prepare input data input_data = { - 'headSha': self.get_latest_commit_in_swagger_repo(), + 'headSha': '90985ff9930614361e97034b3f149ea73efec6cb', 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", - 'specFolder': self.spec_repo, - 'relatedReadmeMdFiles': [str(self.readme_local_folder())] + 'specFolder': 'https://github.com/Azure/azure-rest-api-specs/blob/main/specification/hdinsight/resource-manager/readme.md', + 'relatedReadmeMdFiles': ['specification/hdinsight/resource-manager/readme.md'] } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From e173adc9f1f872a55b9819e623b80c4d427883a4 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 28 Mar 2022 14:19:34 +0800 Subject: [PATCH 30/82] test --- scripts/auto_release/main.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 9655fd7e980d..40c98b38579b 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,10 +173,23 @@ def generate_code(self): # prepare input data input_data = { - 'headSha': '90985ff9930614361e97034b3f149ea73efec6cb', - 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", - 'specFolder': 'https://github.com/Azure/azure-rest-api-specs/blob/main/specification/hdinsight/resource-manager/readme.md', - 'relatedReadmeMdFiles': ['specification/hdinsight/resource-manager/readme.md'] + "dryRun": False, + "specFolder": "../azure-rest-api-specs", + "headSha": "9ac082c33a7d0d8fa6768bd64e53394ada9baaf9", + "headRef": "master", + "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", + "trigger": "continuousIntegration", + "changedFiles": [ + "specification/hdinsight/resource-manager/readme.python.md" + ], "relatedReadmeMdFiles": [ + "specification/hdinsight/resource-manager/readme.md" + ], + "installInstructionInput": { + "isPublic": False, + "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", + "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", + "trigger": "continuousIntegration" + } } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From 04baa8aaa7a2e3d869e1d17fcff636f605ce0da8 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 28 Mar 2022 15:02:25 +0800 Subject: [PATCH 31/82] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index c5b16b57b579..65e726c948c0 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,6 +46,8 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + git fetch origin test-hdinsight-03-17 + git checkout test-hdinsight-03-17 # install autorest sudo npm install -g n From 2a9f585748806276422a01c4ea29fbab21d706e6 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 28 Mar 2022 15:41:07 +0800 Subject: [PATCH 32/82] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 65e726c948c0..a9b389822f09 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,8 +46,10 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + cd azure-rest-api-specs git fetch origin test-hdinsight-03-17 git checkout test-hdinsight-03-17 + cd .. # install autorest sudo npm install -g n From 8b71e0484c96d25d4fc0cf411e19f75f7ab4c23f Mon Sep 17 00:00:00 2001 From: Yuchao Yan Date: Sat, 7 May 2022 17:44:23 +0800 Subject: [PATCH 33/82] remove surplus code --- scripts/auto_release/main.py | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index ed36d5c9cd93..52537517baaf 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -149,6 +149,7 @@ def __init__(self): self.pr_number = 0 self.container_name = '' self.private_package_link = [] # List[str] + self.tag_is_stable = False @return_origin_path def get_latest_commit_in_swagger_repo(self) -> str: @@ -183,9 +184,13 @@ def generate_code(self): with open(self.autorest_result, 'w') as file: json.dump(input_data, file) - # generate code + # generate code(be careful about the order) print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') + + self.tag_is_stable = self.get_autorest_result()["packages"][0]["tagIsStable"] + log(f"tag_is_stable is {self.tag_is_stable}") + print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') def get_package_name_with_autorest_result(self): @@ -282,33 +287,8 @@ def get_all_files_under_package_folder(self) -> List[str]: all_files(self.sdk_code_path(), files) return files - def judge_tag(self) -> bool: - files = self.get_all_files_under_package_folder() - default_api_version = '' # for multi-api - api_version = '' # for single-api - for file in files: - if '.py' not in file or '.pyc' in file: - continue - try: - with open(file, 'r') as file_in: - list_in = file_in.readlines() - except: - _LOG.info(f'can not open {file}') - continue - - for line in list_in: - if line.find('DEFAULT_API_VERSION = ') > -1: - default_api_version += line.split('=')[-1].strip('\n') # collect all default api version - if default_api_version == '' and line.find('api_version = ') > -1: - api_version += line.split('=')[-1].strip('\n') # collect all single api version - if default_api_version != '': - log(f'find default api version:{default_api_version}') - return 'preview' in default_api_version - log(f'find single api version:{api_version}') - return 'preview' in api_version - def calculate_next_version_proc(self, last_version: str): - preview_tag = self.judge_tag() + preview_tag = not self.tag_is_stable changelog = self.get_changelog() if changelog == '': return '0.0.0' From 68a527350a5e4f92994561cca78cc296d06de8e0 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 11:00:33 +0800 Subject: [PATCH 34/82] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index a9b389822f09..522daee096af 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,8 +47,9 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs cd azure-rest-api-specs - git fetch origin test-hdinsight-03-17 - git checkout test-hdinsight-03-17 + git remote add test https://github.com/openapi-env-test/azure-rest-api-specs.git + git fetch test bigcat/test-cosmos2 + git checkout bigcat/test-cosmos2 cd .. # install autorest From a517b293a484e81d3ee15b96648388d6b688beda Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 11:02:33 +0800 Subject: [PATCH 35/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 40c98b38579b..223d25a22910 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'test_autorest_03_18' + branch = 'code-report-update-comparision-category' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 3841e3265f22fb6ca882bdd31d59bc8c70a89a31 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 11:06:33 +0800 Subject: [PATCH 36/82] Update main.py --- scripts/auto_release/main.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 223d25a22910..65741b5e814a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,22 +173,10 @@ def generate_code(self): # prepare input data input_data = { - "dryRun": False, - "specFolder": "../azure-rest-api-specs", - "headSha": "9ac082c33a7d0d8fa6768bd64e53394ada9baaf9", - "headRef": "master", - "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", - "trigger": "continuousIntegration", - "changedFiles": [ - "specification/hdinsight/resource-manager/readme.python.md" - ], "relatedReadmeMdFiles": [ - "specification/hdinsight/resource-manager/readme.md" - ], - "installInstructionInput": { - "isPublic": False, - "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", - "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", - "trigger": "continuousIntegration" + 'headSha': self.get_latest_commit_in_swagger_repo(), + 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", + 'specFolder': self.spec_repo, + 'relatedReadmeMdFiles': [str(self.readme_local_folder())] } } From 2fdba355b77cae817455ce4d1d0f85f21fca91b9 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 11:12:14 +0800 Subject: [PATCH 37/82] Update main.py --- scripts/auto_release/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 65741b5e814a..9ffa8aa98ddc 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -177,7 +177,6 @@ def generate_code(self): 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", 'specFolder': self.spec_repo, 'relatedReadmeMdFiles': [str(self.readme_local_folder())] - } } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From 3ad0f6437e8a02433827f70e030e3f9615ddad44 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 14:41:46 +0800 Subject: [PATCH 38/82] Update main.py --- scripts/auto_release/main.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 9ffa8aa98ddc..127e6b9c7d10 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,10 +173,23 @@ def generate_code(self): # prepare input data input_data = { - 'headSha': self.get_latest_commit_in_swagger_repo(), - 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", - 'specFolder': self.spec_repo, - 'relatedReadmeMdFiles': [str(self.readme_local_folder())] + "dryRun": False, + "specFolder": "../azure-rest-api-specs", + "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", + "headRef": "master", + "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", + "trigger": "continuousIntegration", + "changedFiles": [ + "specification/cosmos-db/resource-manager/readme.python.md" + ], "relatedReadmeMdFiles": [ + "specification/cosmos-db/resource-manager/readme.md" + ], + "installInstructionInput": { + "isPublic": False, + "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", + "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", + "trigger": "continuousIntegration" + } } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From a32eac743349b76c3ef1eb39b30abcd27c51c2c4 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 17:33:05 +0800 Subject: [PATCH 39/82] Update main.py --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 127e6b9c7d10..88a159f2a23c 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,7 +173,7 @@ def generate_code(self): # prepare input data input_data = { - "dryRun": False, + "dryRun": false, "specFolder": "../azure-rest-api-specs", "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", "headRef": "master", @@ -185,7 +185,7 @@ def generate_code(self): "specification/cosmos-db/resource-manager/readme.md" ], "installInstructionInput": { - "isPublic": False, + "isPublic": false, "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", "trigger": "continuousIntegration" From 7148c2a78a845fa4a15b0f3bf4b5ec76cc9556de Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 18 May 2022 17:41:44 +0800 Subject: [PATCH 40/82] Update main.py --- scripts/auto_release/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 88a159f2a23c..14a605b8b3fb 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,8 +173,9 @@ def generate_code(self): # prepare input data input_data = { - "dryRun": false, + "dryRun": False, "specFolder": "../azure-rest-api-specs", + "packageName": "azure-mgmt-cosmosdb", "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", "headRef": "master", "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", @@ -185,7 +186,7 @@ def generate_code(self): "specification/cosmos-db/resource-manager/readme.md" ], "installInstructionInput": { - "isPublic": false, + "isPublic": False, "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", "trigger": "continuousIntegration" From 6d1fbbb363c0e441576ff5feeece4c1c1d470533 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 13:36:28 +0800 Subject: [PATCH 41/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 14a605b8b3fb..353f976a4a4f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'code-report-update-comparision-category' + branch = 'code-report-update-comparision-category-test1' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From e0083153f028dea4ad60c7940c6d3843b8fe8329 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 14:53:35 +0800 Subject: [PATCH 42/82] Update main.py --- scripts/auto_release/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 353f976a4a4f..b4a6cbecc60a 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -175,7 +175,6 @@ def generate_code(self): input_data = { "dryRun": False, "specFolder": "../azure-rest-api-specs", - "packageName": "azure-mgmt-cosmosdb", "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", "headRef": "master", "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", @@ -200,6 +199,9 @@ def generate_code(self): # generate code print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') + with open(self.autorest_result, 'r') as fr: + print("#### self.autorest_result", fr.read()) + print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') def get_package_name_with_autorest_result(self): From 63bd619e9e0952e3261acfe354272219465ca091 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 16:25:28 +0800 Subject: [PATCH 43/82] Update main.py --- scripts/auto_release/main.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b4a6cbecc60a..79494788b970 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -173,23 +173,10 @@ def generate_code(self): # prepare input data input_data = { - "dryRun": False, - "specFolder": "../azure-rest-api-specs", - "headSha": "c6ed0986c1ee45df5c8f2bc56f2a9e802b01d2b0", - "headRef": "master", - "repoHttpsUrl": "https://github.com/Azure/azure-rest-api-specs", - "trigger": "continuousIntegration", - "changedFiles": [ - "specification/cosmos-db/resource-manager/readme.python.md" - ], "relatedReadmeMdFiles": [ - "specification/cosmos-db/resource-manager/readme.md" - ], - "installInstructionInput": { - "isPublic": False, - "downloadUrlPrefix": "https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/13991/azure-sdk-for-python-track2/", - "downloadCommandTemplate": "curl -L \"{URL}\" -o {FILENAME}", - "trigger": "continuousIntegration" - } + 'headSha': self.get_latest_commit_in_swagger_repo(), + 'repoHttpsUrl': "https://github.com/Azure/azure-rest-api-specs", + 'specFolder': self.spec_repo, + 'relatedReadmeMdFiles': [str(self.readme_local_folder())] } self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') From 31a7e2df580060e07d06bc693ac738bded9c65de Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 16:43:45 +0800 Subject: [PATCH 44/82] Update main.py --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 79494788b970..d61aa12328f3 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -193,6 +193,7 @@ def generate_code(self): def get_package_name_with_autorest_result(self): generate_result = self.get_autorest_result() + print(f"generate_result: {generate_result}") self.package_name = generate_result["packages"][0]["packageName"].split('-')[-1] def prepare_branch_with_readme(self): From dd0c4d8233c4be7b1108db19365f037c49353951 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Thu, 19 May 2022 16:52:16 +0800 Subject: [PATCH 45/82] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 522daee096af..c5b16b57b579 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,11 +46,6 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs - cd azure-rest-api-specs - git remote add test https://github.com/openapi-env-test/azure-rest-api-specs.git - git fetch test bigcat/test-cosmos2 - git checkout bigcat/test-cosmos2 - cd .. # install autorest sudo npm install -g n From 225a28eac5f8a39b0a957142d8ee7c4af8cfec3a Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 20 May 2022 10:36:08 +0800 Subject: [PATCH 46/82] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index c5b16b57b579..516ffac1e2a7 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,6 +46,12 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs + cd azure-rest-api-specs + git fetch origin bigcat/confluent-test-branch + git checkout bigcat/confluent-test-branch + cd .. + + # install autorest sudo npm install -g n From 79c8572dced30ee3abca73108dbf3791f96d7508 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 20 May 2022 10:56:09 +0800 Subject: [PATCH 47/82] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 516ffac1e2a7..ee87e81bd321 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -47,8 +47,8 @@ jobs: mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs cd azure-rest-api-specs - git fetch origin bigcat/confluent-test-branch - git checkout bigcat/confluent-test-branch + git fetch origin bigcat/confluent-test-branch-1 + git checkout bigcat/confluent-test-branch-1 cd .. From a41959d24189ab0cd718252a9e6974d62efd1448 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 23 May 2022 14:30:47 +0800 Subject: [PATCH 48/82] fix bug --- scripts/auto_release/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index f8a0cd4a2fb5..423780c44261 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -188,7 +188,8 @@ def generate_code(self): print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') - self.tag_is_stable = self.get_autorest_result()["packages"][0]["tagIsStable"] + generate_result = self.get_autorest_result() + self.tag_is_stable = generate_result["packages"][0]["tagIsStable"] log(f"tag_is_stable is {self.tag_is_stable}") print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') From aed57d80696e820afac0dd884f4a78692799863e Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 23 May 2022 14:45:37 +0800 Subject: [PATCH 49/82] update --- scripts/auto_release/PythonSdkLiveTest.yml | 5 ----- scripts/auto_release/main.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index ee87e81bd321..5942e0f969eb 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -46,11 +46,6 @@ jobs: if [ "$(SPEC_README)" ]; then mkdir azure-rest-api-specs git clone https://github.com/Azure/azure-rest-api-specs.git $(pwd)/azure-rest-api-specs - cd azure-rest-api-specs - git fetch origin bigcat/confluent-test-branch-1 - git checkout bigcat/confluent-test-branch-1 - cd .. - # install autorest diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 423780c44261..b59ac8d66052 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'code-report-update-comparision-category-test1' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') @@ -187,7 +187,7 @@ def generate_code(self): # generate code(be careful about the order) print_exec('python scripts/dev_setup.py -p azure-core') print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') - + generate_result = self.get_autorest_result() self.tag_is_stable = generate_result["packages"][0]["tagIsStable"] log(f"tag_is_stable is {self.tag_is_stable}") From f5bb4c5f507bf35438bff4554bf8ca54145f4e90 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 23 May 2022 14:54:02 +0800 Subject: [PATCH 50/82] test --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b59ac8d66052..99e275273f0e 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -315,6 +315,7 @@ def calculate_next_version_proc(self, last_version: str): def get_autorest_result(self) -> Dict[Any, Any]: with open(self.autorest_result, 'r') as file_in: content = json.load(file_in) + print(f'**** content: {content}') return content def get_changelog(self) -> str: From 38d34ba46dc313927662bb107f12d3a7c1db6b47 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 23 May 2022 16:34:31 +0800 Subject: [PATCH 51/82] update code --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 99e275273f0e..522bb375f63f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -189,7 +189,7 @@ def generate_code(self): print_check(f'python -m packaging_tools.auto_codegen {self.autorest_result} {self.autorest_result}') generate_result = self.get_autorest_result() - self.tag_is_stable = generate_result["packages"][0]["tagIsStable"] + self.tag_is_stable = list(generate_result.values())[0]['tagIsStable'] log(f"tag_is_stable is {self.tag_is_stable}") print_check(f'python -m packaging_tools.auto_package {self.autorest_result} {self.autorest_result}') From 047f03c0f33765b847643d4993b4e741fc2ea851 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 6 Jun 2022 10:09:58 +0800 Subject: [PATCH 52/82] update bot --- scripts/auto_release/PythonSdkLiveTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 5942e0f969eb..b316809e93ce 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -40,7 +40,7 @@ jobs: # clone(REPO: https://github.com/Azure/azure-sdk-for-python.git, USR_NAME: Azure, USR_TOKEN: xxxxxxxxxxxxx) mkdir azure-sdk-for-python - git clone ${REPO:0:8}$(USR_NAME):$(USR_TOKEN)@${REPO:8} $(pwd)/azure-sdk-for-python + git clone ${REPO:0:8}$(USR_NAME):$(azuresdk-github-pat)@${REPO:8} $(pwd)/azure-sdk-for-python # prepare env if need to generate SDK code if [ "$(SPEC_README)" ]; then From 33da0454cccb313a3600f2d1e50a1af37e235c7c Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Mon, 6 Jun 2022 10:25:46 +0800 Subject: [PATCH 53/82] update main bot --- scripts/auto_release/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 522bb375f63f..2119b5be5abf 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -132,7 +132,6 @@ class CodegenTestPR: def __init__(self): self.issue_link = os.getenv('ISSUE_LINK') - self.usr_token = os.getenv('USR_TOKEN') self.pipeline_link = os.getenv('PIPELINE_LINK') self.bot_token = os.getenv('AZURESDK_BOT_TOKEN') self.spec_readme = os.getenv('SPEC_README', '') @@ -448,7 +447,7 @@ def run_test(self): self.run_test_proc() def create_pr_proc(self): - api = GhApi(owner='Azure', repo='azure-sdk-for-python', token=self.usr_token) + api = GhApi(owner='Azure', repo='azure-sdk-for-python', token=self.bot_token) pr_title = "[AutoRelease] {}(Do not merge)".format(self.new_branch) pr_head = "{}:{}".format(os.getenv('USR_NAME'), self.new_branch) pr_base = 'main' From a71853144d54fd34b446a362490a5fccb3c1b227 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:38:59 +0800 Subject: [PATCH 54/82] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index b316809e93ce..7d9b2f3f9b78 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -78,7 +78,6 @@ jobs: export AZURE_CLIENT_SECRET=$(ENV_CLIENT_SECRET) export AZURE_SUBSCRIPTION_ID=$(ENV_SUBSCRIPTION_ID) export ISSUE_LINK=$(ISSUE_LINK) - export USR_TOKEN=$(USR_TOKEN) export BASE_BRANCH=$(BASE_BRANCH) export SCRIPT_PATH=$script_path export AZURESDK_BOT_TOKEN=$(azuresdk-github-pat) From 4bbcce9d5eff24353fc1c268c5df286245093add Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:05:24 +0800 Subject: [PATCH 55/82] Update main.py --- scripts/auto_release/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 2119b5be5abf..f7c34442a009 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -195,7 +195,6 @@ def generate_code(self): def get_package_name_with_autorest_result(self): generate_result = self.get_autorest_result() - print(f"generate_result: {generate_result}") self.package_name = generate_result["packages"][0]["packageName"].split('-')[-1] def prepare_branch_with_readme(self): From bfd4d3e23f25473f74eb2f4df626bbf1bf444862 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:06:25 +0800 Subject: [PATCH 56/82] Update main.py --- scripts/auto_release/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index f7c34442a009..b9c25fb6a903 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -313,7 +313,6 @@ def calculate_next_version_proc(self, last_version: str): def get_autorest_result(self) -> Dict[Any, Any]: with open(self.autorest_result, 'r') as file_in: content = json.load(file_in) - print(f'**** content: {content}') return content def get_changelog(self) -> str: From 82d4b0fd503f8a435b26fe7feebc13a88e9f46cb Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 7 Jun 2022 11:12:49 +0800 Subject: [PATCH 57/82] change branch for test --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index b9c25fb6a903..6ad8793dcbfe 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'Azure' - branch = 'main' + usr = 'azure-sdk' + branch = 't2-communication-2022-06-06-53443' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From d4269a71f898259fd7bef033ef3c9cb5b38c544e Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 7 Jun 2022 11:29:01 +0800 Subject: [PATCH 58/82] for test --- scripts/auto_release/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 6ad8793dcbfe..e47e6c81d642 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -267,6 +267,8 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') + with open('MANIFEST.in', 'r', encoding='utf-8') as f: + print(f'**** {f.read()}') log('packaging_tools --build-conf successfully ') def check_pprint_name(self): From 544efb839fe9574c64b2a13a065967a03fc09dfd Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 7 Jun 2022 11:40:20 +0800 Subject: [PATCH 59/82] for test --- scripts/auto_release/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index e47e6c81d642..5d85663df2b7 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -267,6 +267,8 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') + print("**** path: ", Path(f'sdk/{self.sdk_folder}')) + print("**** path now:", os.getcwd()) with open('MANIFEST.in', 'r', encoding='utf-8') as f: print(f'**** {f.read()}') log('packaging_tools --build-conf successfully ') From 7d46cd824d40798d685dd9e102f423ea90391105 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 7 Jun 2022 11:48:40 +0800 Subject: [PATCH 60/82] for test --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 5d85663df2b7..c922054db71b 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -269,7 +269,7 @@ def check_file_with_packaging_tool(self): print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') print("**** path: ", Path(f'sdk/{self.sdk_folder}')) print("**** path now:", os.getcwd()) - with open('MANIFEST.in', 'r', encoding='utf-8') as f: + with open(Path(f'azure-mgmt-{self.package_name}/MANIFEST.in'), 'r', encoding='utf-8') as f: print(f'**** {f.read()}') log('packaging_tools --build-conf successfully ') From 378c1c032417edb29082c8c0bc8f2042f63a0bb1 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 10 Jun 2022 13:58:51 +0800 Subject: [PATCH 61/82] add python_tag --- scripts/auto_release/PythonSdkLiveTest.yml | 1 + scripts/auto_release/main.py | 3 +++ tools/azure-sdk-tools/packaging_tools/auto_codegen.py | 4 +++- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index 7d9b2f3f9b78..d3dd80fc8127 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -83,6 +83,7 @@ jobs: export AZURESDK_BOT_TOKEN=$(azuresdk-github-pat) export STORAGE_CONN_STR=$(storage-conn-str) export STORAGE_ENDPOINT=$(storage-endpoint) + export PYTHON_TAG=@(PYTHON_TAG) # run cd azure-sdk-for-python diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index c922054db71b..e6f55095dbe0 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -178,6 +178,9 @@ def generate_code(self): 'specFolder': self.spec_repo, 'relatedReadmeMdFiles': [str(self.readme_local_folder())] } + # if Python tag exists + if os.getenv('PYTHON_TAG'): + input_data['python_tag'] = os.getenv('PYTHON_TAG') self.autorest_result = str(Path(os.getenv('TEMP_FOLDER')) / 'temp.json') with open(self.autorest_result, 'w') as file: diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index dc19dca8128b..d8d616f8cae4 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -19,11 +19,13 @@ def main(generate_input, generate_output): sdk_folder = "." result = {} package_total = set() + python_tag = data.get('python_tag') if data.get('python_tag') else None for input_readme in data["relatedReadmeMdFiles"]: relative_path_readme = str(Path(spec_folder, input_readme)) _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin") config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG - config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) + config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, + python_tag=python_tag) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index b403e8fa0ec4..73ba76c13850 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -19,7 +19,8 @@ def generate( - config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False + config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, + python_tag=None ): sdk_folder = Path(sdk_folder).expanduser() From 6eb0ed19f94b12d540ad23907074240f5ae3c8c6 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 10 Jun 2022 14:01:29 +0800 Subject: [PATCH 62/82] restore branch --- scripts/auto_release/main.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index e6f55095dbe0..af91183d99f0 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -81,8 +81,8 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): - usr = 'azure-sdk' - branch = 't2-communication-2022-06-06-53443' + usr = 'Azure' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') @@ -270,10 +270,6 @@ def edit_sdk_setup(content: List[str]): def check_file_with_packaging_tool(self): os.chdir(Path(f'sdk/{self.sdk_folder}')) print_check(f'python -m packaging_tools --build-conf azure-mgmt-{self.package_name}') - print("**** path: ", Path(f'sdk/{self.sdk_folder}')) - print("**** path now:", os.getcwd()) - with open(Path(f'azure-mgmt-{self.package_name}/MANIFEST.in'), 'r', encoding='utf-8') as f: - print(f'**** {f.read()}') log('packaging_tools --build-conf successfully ') def check_pprint_name(self): From 1bd12ca40bf04d5897cec0b79ac8fb1a32bc23a2 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 14:04:17 +0800 Subject: [PATCH 63/82] Update PythonSdkLiveTest.yml --- scripts/auto_release/PythonSdkLiveTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index d3dd80fc8127..ac1e415c1faf 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -83,7 +83,7 @@ jobs: export AZURESDK_BOT_TOKEN=$(azuresdk-github-pat) export STORAGE_CONN_STR=$(storage-conn-str) export STORAGE_ENDPOINT=$(storage-endpoint) - export PYTHON_TAG=@(PYTHON_TAG) + export PYTHON_TAG=$(PYTHON_TAG) # run cd azure-sdk-for-python From 35e1a19f7712cbddad181e8952bec0d541ba9374 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Fri, 10 Jun 2022 15:18:00 +0800 Subject: [PATCH 64/82] update global_conf --- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index 73ba76c13850..92ef2f5bbf28 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -31,6 +31,8 @@ def generate( global_conf["autorest_options"] = solve_relative_path(global_conf.get("autorest_options", {}), sdk_folder) global_conf["envs"] = solve_relative_path(global_conf.get("envs", {}), sdk_folder) global_conf["advanced_options"] = solve_relative_path(global_conf.get("advanced_options", {}), sdk_folder) + if python_tag: + global_conf["autorest_options"]['tag'] = python_tag if restapi_git_folder: restapi_git_folder = Path(restapi_git_folder).expanduser() From 32bd55fc2fdde26858ec46815bb8d11d14ba5a9d Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:34:38 +0800 Subject: [PATCH 65/82] Update auto_codegen.py --- tools/azure-sdk-tools/packaging_tools/auto_codegen.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py index d8d616f8cae4..dc19dca8128b 100644 --- a/tools/azure-sdk-tools/packaging_tools/auto_codegen.py +++ b/tools/azure-sdk-tools/packaging_tools/auto_codegen.py @@ -19,13 +19,11 @@ def main(generate_input, generate_output): sdk_folder = "." result = {} package_total = set() - python_tag = data.get('python_tag') if data.get('python_tag') else None for input_readme in data["relatedReadmeMdFiles"]: relative_path_readme = str(Path(spec_folder, input_readme)) _LOGGER.info(f"[CODEGEN]({input_readme})codegen begin") config_file = CONFIG_FILE if 'resource-manager' in input_readme else CONFIG_FILE_DPG - config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True, - python_tag=python_tag) + config = generate(config_file, sdk_folder, [], relative_path_readme, spec_folder, force_generation=True) package_names = get_package_names(sdk_folder) _LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]") From 845a892f0bb19307886d268ec20eae1bd8036ae0 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:35:12 +0800 Subject: [PATCH 66/82] Update generate_sdk.py --- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index 92ef2f5bbf28..f526824c0f9d 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -20,7 +20,6 @@ def generate( config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, - python_tag=None ): sdk_folder = Path(sdk_folder).expanduser() @@ -31,8 +30,6 @@ def generate( global_conf["autorest_options"] = solve_relative_path(global_conf.get("autorest_options", {}), sdk_folder) global_conf["envs"] = solve_relative_path(global_conf.get("envs", {}), sdk_folder) global_conf["advanced_options"] = solve_relative_path(global_conf.get("advanced_options", {}), sdk_folder) - if python_tag: - global_conf["autorest_options"]['tag'] = python_tag if restapi_git_folder: restapi_git_folder = Path(restapi_git_folder).expanduser() From 64de6b88e680adad2f12e4200616469fba75e42f Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:35:39 +0800 Subject: [PATCH 67/82] Update generate_sdk.py --- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index f526824c0f9d..3f7aea0f08c1 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -19,7 +19,7 @@ def generate( - config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, + config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, ): sdk_folder = Path(sdk_folder).expanduser() From 7e871b6629f11f0bc16e3d77576032f294995197 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:36:01 +0800 Subject: [PATCH 68/82] Update generate_sdk.py --- tools/azure-sdk-tools/packaging_tools/generate_sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py index 3f7aea0f08c1..b403e8fa0ec4 100644 --- a/tools/azure-sdk-tools/packaging_tools/generate_sdk.py +++ b/tools/azure-sdk-tools/packaging_tools/generate_sdk.py @@ -19,7 +19,7 @@ def generate( - config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False, + config_path, sdk_folder, project_pattern, readme, restapi_git_folder, autorest_bin=None, force_generation=False ): sdk_folder = Path(sdk_folder).expanduser() From 091bf1f793947d72690edd4bf2d3a56e27e08d6e Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Fri, 10 Jun 2022 15:36:28 +0800 Subject: [PATCH 69/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index af91183d99f0..0029721727e3 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'main' + branch = 'test-condegen-update-0610' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 8af7ccb2e6973082e4dd4bb49de95699ac1086c5 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:19:14 +0800 Subject: [PATCH 70/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 0029721727e3..af91183d99f0 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -82,7 +82,7 @@ def all_files(path: str, files: List[str]): def checkout_azure_default_branch(): usr = 'Azure' - branch = 'test-condegen-update-0610' + branch = 'main' print_exec(f'git remote add {usr} https://github.com/{usr}/azure-sdk-for-python.git') print_check(f'git fetch {usr} {branch}') print_check(f'git checkout {usr}/{branch}') From 9dd3b1fbac17e3e3b42d50a95f3e21b2d4563a66 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Mon, 13 Jun 2022 11:38:34 +0800 Subject: [PATCH 71/82] Update PythonSdkLiveTest.yml for Azure Pipelines --- scripts/auto_release/PythonSdkLiveTest.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/auto_release/PythonSdkLiveTest.yml b/scripts/auto_release/PythonSdkLiveTest.yml index ac1e415c1faf..f70e2c727afa 100644 --- a/scripts/auto_release/PythonSdkLiveTest.yml +++ b/scripts/auto_release/PythonSdkLiveTest.yml @@ -69,14 +69,14 @@ jobs: # import env variable export AZURE_TEST_RUN_LIVE=true - export TENANT_ID=$(ENV_TENANT_ID) - export CLIENT_ID=$(ENV_CLIENT_ID) - export CLIENT_SECRET=$(ENV_CLIENT_SECRET) - export SUBSCRIPTION_ID=$(ENV_SUBSCRIPTION_ID) - export AZURE_TENANT_ID=$(ENV_TENANT_ID) - export AZURE_CLIENT_ID=$(ENV_CLIENT_ID) - export AZURE_CLIENT_SECRET=$(ENV_CLIENT_SECRET) - export AZURE_SUBSCRIPTION_ID=$(ENV_SUBSCRIPTION_ID) + export TENANT_ID=$(ENV-TENANT-ID) + export CLIENT_ID=$(ENV-CLIENT-ID) + export CLIENT_SECRET=$(ENV-CLIENT-SECRET) + export SUBSCRIPTION_ID=$(ENV-SUBSCRIPTION-ID) + export AZURE_TENANT_ID=$(ENV-TENANT-ID) + export AZURE_CLIENT_ID=$(ENV-CLIENT-ID) + export AZURE_CLIENT_SECRET=$(ENV-CLIENT-SECRET) + export AZURE_SUBSCRIPTION_ID=$(ENV-SUBSCRIPTION-ID) export ISSUE_LINK=$(ISSUE_LINK) export BASE_BRANCH=$(BASE_BRANCH) export SCRIPT_PATH=$script_path From 1061cb35352c9794bfbf0d055ad1c6a8f0e3fc61 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 11:27:02 +0800 Subject: [PATCH 72/82] uodate edit_sdk_setup --- scripts/auto_release/main.py | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index af91183d99f0..c7c03e84d767 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -9,8 +9,8 @@ from functools import wraps from typing import List, Any, Dict from packaging.version import Version -from ghapi.all import GhApi -from azure.storage.blob import BlobServiceClient, ContainerClient +# from ghapi.all import GhApi +# from azure.storage.blob import BlobServiceClient, ContainerClient from util import add_certificate _LOG = logging.getLogger() @@ -256,12 +256,28 @@ def edit_sdk_readme(content: List[str]): modify_file(sdk_readme, edit_sdk_readme) + @staticmethod + def get_need_mgmt_core(): + template_path = Path('../../tools/azure-sdk-tools/packaging_tools/templates/setup.py') + with open(template_path, 'r') as fr: + content = fr.readlines() + for line in content: + if 'msrest' in line: + target_msrest = line.strip().strip(',') + yield target_msrest + if 'azure-mgmt-core' in line: + target_mgmt_core = line.strip().strip(',') + yield target_mgmt_core + def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): + target_msrest, target_mgmt_core = self.get_need_mgmt_core() + msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') + mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') for i in range(0, len(content)): - content[i] = content[i].replace('msrestazure>=0.4.32,<2.0.0', 'azure-mgmt-core>=1.3.0,<2.0.0') - content[i] = content[i].replace('azure-mgmt-core>=1.2.0,<2.0.0', 'azure-mgmt-core>=1.3.0,<2.0.0') - content[i] = content[i].replace('msrest>=0.5.0', 'msrest>=0.6.21') + content[i] = content[i].replace('msrestazure>=0.4.32,<2.0.0', target_mgmt_core) + content[i] = re.sub(mgmt_core_pattern, target_mgmt_core, content[i]) + content[i] = re.sub(msrest_pattern, target_msrest, content[i]) modify_file(str(Path(self.sdk_code_path()) / 'setup.py'), edit_sdk_setup) @@ -561,5 +577,6 @@ def run(self): logging.basicConfig() main_logger.setLevel(logging.INFO) - instance = CodegenTestPR() - instance.run() + CodegenTestPR.get_need_mgmt_core() + # instance = CodegenTestPR() + # instance.run() From ce4bef811e1d98542a95ac279108a0a3fd59562f Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 11:30:57 +0800 Subject: [PATCH 73/82] fix --- scripts/auto_release/main.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index c7c03e84d767..10f560c695a2 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -9,8 +9,8 @@ from functools import wraps from typing import List, Any, Dict from packaging.version import Version -# from ghapi.all import GhApi -# from azure.storage.blob import BlobServiceClient, ContainerClient +from ghapi.all import GhApi +from azure.storage.blob import BlobServiceClient, ContainerClient from util import add_certificate _LOG = logging.getLogger() @@ -577,6 +577,5 @@ def run(self): logging.basicConfig() main_logger.setLevel(logging.INFO) - CodegenTestPR.get_need_mgmt_core() - # instance = CodegenTestPR() - # instance.run() + instance = CodegenTestPR() + instance.run() From 916bd3a2fc7ae661b5ff5db45acf5c615564e120 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 11:40:01 +0800 Subject: [PATCH 74/82] test --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 10f560c695a2..c2f572b8c361 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -330,6 +330,7 @@ def calculate_next_version_proc(self, last_version: str): return next_version def get_autorest_result(self) -> Dict[Any, Any]: + print("***", os.getcwd()) with open(self.autorest_result, 'r') as file_in: content = json.load(file_in) return content From 4278ee3c7e734b776f3ae6bcb4dec6272feaf750 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 11:54:25 +0800 Subject: [PATCH 75/82] test --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index c2f572b8c361..4a63cf074828 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -258,7 +258,8 @@ def edit_sdk_readme(content: List[str]): @staticmethod def get_need_mgmt_core(): - template_path = Path('../../tools/azure-sdk-tools/packaging_tools/templates/setup.py') + print("***", os.getcwd()) + template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py') with open(template_path, 'r') as fr: content = fr.readlines() for line in content: @@ -330,7 +331,6 @@ def calculate_next_version_proc(self, last_version: str): return next_version def get_autorest_result(self) -> Dict[Any, Any]: - print("***", os.getcwd()) with open(self.autorest_result, 'r') as file_in: content = json.load(file_in) return content From 5fc5ccf21beee02a4a1578d64a468c7932ed11bb Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 13:47:52 +0800 Subject: [PATCH 76/82] fix bug --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 4a63cf074828..af9e6ce13316 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -272,7 +272,7 @@ def get_need_mgmt_core(): def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): - target_msrest, target_mgmt_core = self.get_need_mgmt_core() + target_msrest, target_mgmt_core = list(self.get_need_mgmt_core()) msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') for i in range(0, len(content)): From c895704b08d6936c32a22b2e16b0697b3b461ce6 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 13:58:42 +0800 Subject: [PATCH 77/82] debug --- scripts/auto_release/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index af9e6ce13316..29ddac669e06 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -272,6 +272,7 @@ def get_need_mgmt_core(): def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): + print("**** get_need_mgmt_core: ", list(self.get_need_mgmt_core())) target_msrest, target_mgmt_core = list(self.get_need_mgmt_core()) msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') From 4c22e5cd09e746d7a912d54533370e8dee2cce3a Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 14:08:51 +0800 Subject: [PATCH 78/82] fix bug --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 29ddac669e06..189f72fb9f5c 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -263,7 +263,7 @@ def get_need_mgmt_core(): with open(template_path, 'r') as fr: content = fr.readlines() for line in content: - if 'msrest' in line: + if 'msrest>' in line: target_msrest = line.strip().strip(',') yield target_msrest if 'azure-mgmt-core' in line: From cded964566bd762bc91a8f46ee3407780430d6c6 Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 14:18:21 +0800 Subject: [PATCH 79/82] fix bug --- scripts/auto_release/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 189f72fb9f5c..a9ddfc2ce19f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -264,10 +264,10 @@ def get_need_mgmt_core(): content = fr.readlines() for line in content: if 'msrest>' in line: - target_msrest = line.strip().strip(',') + target_msrest = line.strip().strip(',').strip('\'') yield target_msrest if 'azure-mgmt-core' in line: - target_mgmt_core = line.strip().strip(',') + target_mgmt_core = line.strip().strip(',').strip('\'') yield target_mgmt_core def check_sdk_setup(self): From cc60f92450b8c1d509f0b3d03f9148aaf65b10b7 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Tue, 14 Jun 2022 14:38:12 +0800 Subject: [PATCH 80/82] Update main.py --- scripts/auto_release/main.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index a9ddfc2ce19f..2cfd11d8d97f 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -258,7 +258,6 @@ def edit_sdk_readme(content: List[str]): @staticmethod def get_need_mgmt_core(): - print("***", os.getcwd()) template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py') with open(template_path, 'r') as fr: content = fr.readlines() @@ -272,7 +271,6 @@ def get_need_mgmt_core(): def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): - print("**** get_need_mgmt_core: ", list(self.get_need_mgmt_core())) target_msrest, target_mgmt_core = list(self.get_need_mgmt_core()) msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') From 1f67dfea37a512c48d0faba36ae03d91fea6fe2c Mon Sep 17 00:00:00 2001 From: "Jiefeng Chen (WICRESOFT NORTH AMERICA LTD)" Date: Tue, 14 Jun 2022 15:35:29 +0800 Subject: [PATCH 81/82] move to ci check --- scripts/auto_release/main.py | 45 +++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 2cfd11d8d97f..89f87322b8fb 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -256,28 +256,12 @@ def edit_sdk_readme(content: List[str]): modify_file(sdk_readme, edit_sdk_readme) - @staticmethod - def get_need_mgmt_core(): - template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py') - with open(template_path, 'r') as fr: - content = fr.readlines() - for line in content: - if 'msrest>' in line: - target_msrest = line.strip().strip(',').strip('\'') - yield target_msrest - if 'azure-mgmt-core' in line: - target_mgmt_core = line.strip().strip(',').strip('\'') - yield target_mgmt_core - def check_sdk_setup(self): def edit_sdk_setup(content: List[str]): - target_msrest, target_mgmt_core = list(self.get_need_mgmt_core()) - msrest_pattern = re.compile('msrest>=\d\.\d[1-2]\.\d[1-2]') - mgmt_core_pattern = re.compile('azure-mgmt-core>=\d\.\d\.\d,<\d\.\d\.\d') for i in range(0, len(content)): - content[i] = content[i].replace('msrestazure>=0.4.32,<2.0.0', target_mgmt_core) - content[i] = re.sub(mgmt_core_pattern, target_mgmt_core, content[i]) - content[i] = re.sub(msrest_pattern, target_msrest, content[i]) + content[i] = content[i].replace('msrestazure>=0.4.32,<2.0.0', 'azure-mgmt-core>=1.3.0,<2.0.0') + content[i] = content[i].replace('azure-mgmt-core>=1.2.0,<2.0.0', 'azure-mgmt-core>=1.3.0,<2.0.0') + content[i] = content[i].replace('msrest>=0.5.0', 'msrest>=0.6.21') modify_file(str(Path(self.sdk_code_path()) / 'setup.py'), edit_sdk_setup) @@ -391,12 +375,29 @@ def check_changelog_file(self): else: self.edit_changelog() + @staticmethod + def get_need_dependency(): + template_path = Path('tools/azure-sdk-tools/packaging_tools/templates/setup.py') + with open(template_path, 'r') as fr: + content = fr.readlines() + for line in content: + if 'msrest>' in line: + target_msrest = line.strip().strip(',').strip('\'') + yield target_msrest + if 'azure-mgmt-core' in line: + target_mgmt_core = line.strip().strip(',').strip('\'') + yield target_mgmt_core + def check_ci_file_proc(self, dependency: str): def edit_ci_file(content: List[str]): new_line = f'#override azure-mgmt-{self.package_name} {dependency}' + dependency_name = dependency.split('>')[0] for i in range(len(content)): if new_line in content[i]: return + if f'azure-mgmt-{self.package_name} {dependency_name}' in content[i]: + content[i] = new_line + return prefix = '' if '\n' in content[-1] else '\n' content.append(prefix + new_line + '\n') @@ -404,8 +405,10 @@ def edit_ci_file(content: List[str]): print_exec('git add shared_requirements.txt') def check_ci_file(self): - self.check_ci_file_proc('msrest>=0.6.21') - self.check_ci_file_proc('azure-mgmt-core>=1.3.0,<2.0.0') + # eg: target_msrest = 'msrest>=0.6.21', target_mgmt_core = 'azure-mgmt-core>=1.3.0,<2.0.0' + target_msrest, target_mgmt_core = list(self.get_need_dependency()) + self.check_ci_file_proc(target_msrest) + self.check_ci_file_proc(target_mgmt_core) def check_file(self): self.check_file_with_packaging_tool() From 88323f7c6d16504f169ce65ceee1755961aaae70 Mon Sep 17 00:00:00 2001 From: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Date: Wed, 15 Jun 2022 10:36:50 +0800 Subject: [PATCH 82/82] Update main.py --- scripts/auto_release/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto_release/main.py b/scripts/auto_release/main.py index 89f87322b8fb..0dbdb7d66451 100644 --- a/scripts/auto_release/main.py +++ b/scripts/auto_release/main.py @@ -396,7 +396,7 @@ def edit_ci_file(content: List[str]): if new_line in content[i]: return if f'azure-mgmt-{self.package_name} {dependency_name}' in content[i]: - content[i] = new_line + content[i] = new_line + '\n' return prefix = '' if '\n' in content[-1] else '\n' content.append(prefix + new_line + '\n')