diff --git a/build-tools/capi_parser/requirements.txt b/build-tools/capi_parser/requirements.txt index fe15e3ba08ca5cd720bccf53bcb11daca2727f14..dc24ed701bc2751efca6e781355b8c6bfa0ac33c 100644 Binary files a/build-tools/capi_parser/requirements.txt and b/build-tools/capi_parser/requirements.txt differ diff --git a/build-tools/capi_parser/src/bin/write_md.py b/build-tools/capi_parser/src/bin/write_md.py index 1d7368508c8192c12db7a12e3ce2d2f6e75a3103..4b7eba8f764449479eb828bbd52eb7a29d296eae 100644 --- a/build-tools/capi_parser/src/bin/write_md.py +++ b/build-tools/capi_parser/src/bin/write_md.py @@ -15,7 +15,6 @@ import os import stat -import pandas as pd def sort_by_kit(result_info_list: list, output_path): @@ -86,14 +85,15 @@ def sort_by_type(result_info_list_file: list): return sorted_by_type_list -def create_md_table_with_pandas(data): +def change_to_md_data(data): """ - Description:将列表中字典元素数据转为md支持的数据 + Description:将列表中字典元素数据转为str的数据 """ - df = pd.DataFrame(data) - markdown_table = df.to_markdown(index=False) - if markdown_table: - markdown_table.encode(encoding='utf-8') + headers = list(data[0].keys()) + markdown_table = '{}{}{}'.format("|", "|".join(headers), "|\n") + markdown_table += '{}{}{}'.format("|", "|".join(["---"] * len(headers)), "|\n") + for element in data: + markdown_table += '{}{}{}'.format("|", "|".join(str(element[header]) for header in headers), "|\n") return markdown_table @@ -123,7 +123,7 @@ def write_data_in_md(kit_name: str, write_data: list, output_path): kit_name = r'nullOfKit' file_name = '{}{}'.format(kit_name, '.md') list_element_dict = change_list_obj_to_dict(write_data) - md_data = create_md_table_with_pandas(list_element_dict) + md_data = change_to_md_data(list_element_dict) if md_data: diff_str = r'diff合集' path_str = os.path.abspath(os.path.join(output_path, diff_str)) diff --git a/build-tools/capi_parser/src/coreImpl/diff/diff_file.py b/build-tools/capi_parser/src/coreImpl/diff/diff_file.py index 861a47bc039d1ffbeedd4ab6591af71e496021fe..bdde214efc50e37856c9cebaa2a14cf14e796d30 100644 --- a/build-tools/capi_parser/src/coreImpl/diff/diff_file.py +++ b/build-tools/capi_parser/src/coreImpl/diff/diff_file.py @@ -92,6 +92,8 @@ def get_api_change_obj(api_data): compatible_dict['不兼容'] = 1 if element.api_modification_type in modification_type_dict: modification_type_dict[element.api_modification_type] = 1 + if 1 == modification_type_dict.get('API修改(原型修改)') or 1 == modification_type_dict.get('API修改(约束变化)'): + modification_type_dict['API修改'] = 1 compatible_str = change_to_json(compatible_dict) modification_type_str = change_to_json(modification_type_dict) change_data_obj.set_compatible(compatible_str)