kaxil commented on a change in pull request #9270: URL: https://github.com/apache/airflow/pull/9270#discussion_r439772147
########## File path: dev/airflow-github ########## @@ -0,0 +1,218 @@ +#!/usr/bin/env python3 + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# This tool is based on the Spark merge_spark_pr script: +# https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py + +from collections import defaultdict, Counter + +import re +import sys +from github import Github + +GIT_COMMIT_FIELDS = ['id', 'author_name', + 'author_email', 'date', 'subject', 'body'] +GIT_LOG_FORMAT = '%x1f'.join(['%h', '%an', '%ae', '%ad', '%s', '%b']) + '%x1e' +pr_title_re = re.compile(r".*\((#[0-9]{1,6})\)$") + +try: + import click +except ImportError: + print("Could not find the click library. Run 'sudo pip install click' to install.") + sys.exit(-1) + +try: + import git +except ImportError: + print("Could not import git. Run 'sudo pip install gitpython' to install") + sys.exit(-1) + +STATUS_COLOR_MAP = { + 'Resolved': 'green', + 'Open': 'red', +} + +DEFAULT_SECTION_NAME = 'Uncategorized' + +def get_commits_to_current_branch(repo, previous_version=None): + log_args = ['--format="%H"'] + if previous_version: + log_args.append(previous_version + "..") + + log = repo.git.log(*log_args) + return set(log.strip('"').split('"\n"')) + + +def get_commits_between_tags(repo, earlier_tag, later_tag): + log_args = ['--format="%H"', earlier_tag + ".." + later_tag] + log = repo.git.log(*log_args) + return list(log.strip('"').split('"\n"')) + + +def get_issue_status(issue): + status = issue.state.capitalize() + if status == 'Closed': + return 'Resolved' + return status + + +def style_issue_status(status): + if status in STATUS_COLOR_MAP: + return click.style(status[:10].ljust(10), STATUS_COLOR_MAP[status]) + return status[:10].ljust(10) + + +def get_issue_type(issue): + label_prefix = "type:" + issue_type = DEFAULT_SECTION_NAME + if issue.labels: + for label in issue.labels: + if label.name.startswith(label_prefix): + return label.name.replace(label_prefix, "").strip() + return issue_type + + +def print_changelog(sections): + for section, lines in sections.items(): + print(section) + print('"' * len(section)) + for line in lines: + print('-', line) + print() + + [email protected]() +def cli(): + r""" + This tool should be used by Airflow Release Manager to verify what Github issue's + were merged in the current working branch. + + airflow-github compare <target_version> <github_token> + """ + + [email protected](short_help='Compare a Github target version against git merges') [email protected]('target_version') [email protected]('github-token', envvar='GITHUB_TOKEN') [email protected]('--previous-version', + 'previous_version', + help="Specify the previous tag on the working branch to limit" + " searching for few commits to find the cherry-picked commits") [email protected]('--unmerged', 'show_uncherrypicked_only', help="Show unmerged issues only", is_flag=True) +def compare(target_version, github_token, previous_version=None, show_uncherrypicked_only=False): + repo = git.Repo(".", search_parent_directories=True) + commits_to_current_branch = get_commits_to_current_branch( + repo, previous_version) + + github_handler = Github(github_token) + milestone_issues = list(github_handler.search_issues( + f"repo:apache/airflow milestone:\"Airflow {target_version}\"")) + + num_cherrypicked = 0 + num_uncherrypicked = Counter() + + # :<18 says left align, pad to 18 + # :<50.50 truncates after 50 chars + # !s forces as string + formatstr = "{id:<8}|{typ!s:<15}|{status!s}|{description:<83.83}|{merged:<6}|{commit:>9.7}" + + print(formatstr.format( + id="ISSUE", + typ="TYPE", + status="STATUS".ljust(10), + description="DESCRIPTION", + merged="MERGED", + commit="COMMIT")) + + for issue in milestone_issues: + commit = None + for event in issue.get_events(): + # Checks if event is a commit getting merged into master. + if event.event == 'merged': + commit = event.commit_id Review comment: This loop is time-consuming, takes a good amount of time on my machine to load all commits. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
