From 5183b78a351ac70918fbe441ee9907ed063f1d01 Mon Sep 17 00:00:00 2001 From: Changlong Liu Date: Fri, 3 Jul 2020 13:34:32 +0800 Subject: [PATCH 1/2] add placeholder line in breaking sheet --- .../packaging_tools/mgmt_release_stats.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/mgmt_release_stats.py b/tools/azure-sdk-tools/packaging_tools/mgmt_release_stats.py index 559afa554113..b2b94f988fa7 100644 --- a/tools/azure-sdk-tools/packaging_tools/mgmt_release_stats.py +++ b/tools/azure-sdk-tools/packaging_tools/mgmt_release_stats.py @@ -46,18 +46,26 @@ def add_provider(self, package_name, changelog_filename, start_date): package_name) # set column title with open(changelog_filename) as f: + in_stable_version = False rls_date, rls_version = None, None for line in f.readlines(): version, date = ReleaseStats.parse_release_event(line) if version: rls_date, rls_version = date, version - if rls_date >= start_date: + if re.match(r"^\d+\.\d+\.\d+$", version): + in_stable_version = True + else: + in_stable_version = False + if rls_date >= start_date and in_stable_version: self._add_package_release( self.provider_num+1, version, rls_date, package_name) if rls_date and rls_date >= start_date and ReleaseStats.parse_breaking_head(line): - self._add_breaking_release( - self.provider_num+1, rls_version, rls_date, package_name) + if in_stable_version: + self._add_breaking_release( + self.provider_num+1, rls_version, rls_date, package_name) + else: + logging.info("skip breaking for {}".format(rls_version)) def gen_pivot_table(self): logging.info("Generating pivot table") @@ -173,6 +181,10 @@ def _add_package_release(self, col, version, rls_date, package_name): row = self.find_or_create_row(rls_date, ws) ws.cell(row=row, column=col, value=1) + ws = self.wb[SHEET_BREAKING_MATRIX] + row = self.find_or_create_row(rls_date, ws) + ws.cell(row=row, column=col, value=0) + ws = self.wb[SHEET_EVENT] self.release_num += 1 ws.append([rls_date, package_name]) @@ -278,6 +290,7 @@ def build_release_stats(xls_file, threshold, start_date): package_name, os.path.join(root, file), start_date) stats.gen_latest_sum(90, SHEET_BREAKING_MATRIX, threshold-1) stats.gen_latest_sum(180, SHEET_BREAKING_MATRIX, threshold) + stats.gen_latest_sum(90, SHEET_PACKAGE_MATRIX, threshold-1) stats.gen_pivot_table() stats.sum_matrix_sheets() stats.save(xls_file) From da6ff1012be6e628b9ffba16a39426e2a37bc705 Mon Sep 17 00:00:00 2001 From: Changlong Liu Date: Fri, 3 Jul 2020 13:35:55 +0800 Subject: [PATCH 2/2] check all versions since master is for track2 --- .../packaging_tools/code_report.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/tools/azure-sdk-tools/packaging_tools/code_report.py b/tools/azure-sdk-tools/packaging_tools/code_report.py index 59002847bfaa..672a26aef778 100644 --- a/tools/azure-sdk-tools/packaging_tools/code_report.py +++ b/tools/azure-sdk-tools/packaging_tools/code_report.py @@ -149,22 +149,6 @@ def merge_report(report_paths): merged_report["operations"].update(report_json["operations"]) return merged_report -def filter_track2_versions(package_name, versions): - track2_versions = { - 'azure-mgmt-appconfiguration': '1.0.0', - 'azure-mgmt-compute':'17.0.0', - 'azure-mgmt-eventhub':'8.0.0', - 'azure-mgmt-keyvault':'7.0.0', - 'azure-mgmt-monitor':'1.0.0', - 'azure-mgmt-network':'16.0.0', - 'azure-mgmt-resource':'15.0.0', - 'azure-mgmt-storage':'16.0.0', - } - upbound = track2_versions.get(package_name) - if not upbound: - return versions - return list(filter(lambda x: x < upbound, versions)) - def main(input_parameter: str, version: Optional[str] = None, no_venv: bool = False, pypi: bool = False, last_pypi: bool = False, output: str = None): package_name, module_name = parse_input(input_parameter) path_to_package = resolve_package_directory(package_name) @@ -180,7 +164,6 @@ def main(input_parameter: str, version: Optional[str] = None, no_venv: bool = Fa _LOGGER.info(f"Got {versions}") if last_pypi: _LOGGER.info(f"Only keep last PyPI version") - versions = filter_track2_versions(package_name, versions) versions = [versions[-1]] for version in versions: