Skip to content

Commit 9a95169

Browse files
20200703 codereport (Azure#12361)
* add placeholder line in breaking sheet * check all versions since master is for track2
1 parent 5fe2922 commit 9a95169

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

tools/azure-sdk-tools/packaging_tools/code_report.py

-17
Original file line numberDiff line numberDiff line change
@@ -149,22 +149,6 @@ def merge_report(report_paths):
149149
merged_report["operations"].update(report_json["operations"])
150150
return merged_report
151151

152-
def filter_track2_versions(package_name, versions):
153-
track2_versions = {
154-
'azure-mgmt-appconfiguration': '1.0.0',
155-
'azure-mgmt-compute':'17.0.0',
156-
'azure-mgmt-eventhub':'8.0.0',
157-
'azure-mgmt-keyvault':'7.0.0',
158-
'azure-mgmt-monitor':'1.0.0',
159-
'azure-mgmt-network':'16.0.0',
160-
'azure-mgmt-resource':'15.0.0',
161-
'azure-mgmt-storage':'16.0.0',
162-
}
163-
upbound = track2_versions.get(package_name)
164-
if not upbound:
165-
return versions
166-
return list(filter(lambda x: x < upbound, versions))
167-
168152
def main(input_parameter: str, version: Optional[str] = None, no_venv: bool = False, pypi: bool = False, last_pypi: bool = False, output: str = None):
169153
package_name, module_name = parse_input(input_parameter)
170154
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
180164
_LOGGER.info(f"Got {versions}")
181165
if last_pypi:
182166
_LOGGER.info(f"Only keep last PyPI version")
183-
versions = filter_track2_versions(package_name, versions)
184167
versions = [versions[-1]]
185168

186169
for version in versions:

tools/azure-sdk-tools/packaging_tools/mgmt_release_stats.py

+16-3
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,26 @@ def add_provider(self, package_name, changelog_filename, start_date):
4646
package_name) # set column title
4747

4848
with open(changelog_filename) as f:
49+
in_stable_version = False
4950
rls_date, rls_version = None, None
5051
for line in f.readlines():
5152
version, date = ReleaseStats.parse_release_event(line)
5253
if version:
5354
rls_date, rls_version = date, version
54-
if rls_date >= start_date:
55+
if re.match(r"^\d+\.\d+\.\d+$", version):
56+
in_stable_version = True
57+
else:
58+
in_stable_version = False
59+
if rls_date >= start_date and in_stable_version:
5560
self._add_package_release(
5661
self.provider_num+1, version, rls_date, package_name)
5762

5863
if rls_date and rls_date >= start_date and ReleaseStats.parse_breaking_head(line):
59-
self._add_breaking_release(
60-
self.provider_num+1, rls_version, rls_date, package_name)
64+
if in_stable_version:
65+
self._add_breaking_release(
66+
self.provider_num+1, rls_version, rls_date, package_name)
67+
else:
68+
logging.info("skip breaking for {}".format(rls_version))
6169

6270
def gen_pivot_table(self):
6371
logging.info("Generating pivot table")
@@ -173,6 +181,10 @@ def _add_package_release(self, col, version, rls_date, package_name):
173181
row = self.find_or_create_row(rls_date, ws)
174182
ws.cell(row=row, column=col, value=1)
175183

184+
ws = self.wb[SHEET_BREAKING_MATRIX]
185+
row = self.find_or_create_row(rls_date, ws)
186+
ws.cell(row=row, column=col, value=0)
187+
176188
ws = self.wb[SHEET_EVENT]
177189
self.release_num += 1
178190
ws.append([rls_date, package_name])
@@ -278,6 +290,7 @@ def build_release_stats(xls_file, threshold, start_date):
278290
package_name, os.path.join(root, file), start_date)
279291
stats.gen_latest_sum(90, SHEET_BREAKING_MATRIX, threshold-1)
280292
stats.gen_latest_sum(180, SHEET_BREAKING_MATRIX, threshold)
293+
stats.gen_latest_sum(90, SHEET_PACKAGE_MATRIX, threshold-1)
281294
stats.gen_pivot_table()
282295
stats.sum_matrix_sheets()
283296
stats.save(xls_file)

0 commit comments

Comments
 (0)