Repository: incubator-airflow Updated Branches: refs/heads/master 7980f7771 -> 096564848
[AIRFLOW-282] Remove PR Tool logic that depends on version formatting Closes #1625 from jlowin/pr-tool Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/09656484 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/09656484 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/09656484 Branch: refs/heads/master Commit: 09656484806672b8ffaa133dffaf755f45c98307 Parents: 7980f77 Author: jlowin <jlo...@users.noreply.github.com> Authored: Thu Jun 30 18:14:55 2016 -0400 Committer: jlowin <jlo...@users.noreply.github.com> Committed: Thu Jun 30 18:14:55 2016 -0400 ---------------------------------------------------------------------- dev/airflow-pr | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/09656484/dev/airflow-pr ---------------------------------------------------------------------- diff --git a/dev/airflow-pr b/dev/airflow-pr index 937ce28..7f10a89 100755 --- a/dev/airflow-pr +++ b/dev/airflow-pr @@ -503,17 +503,20 @@ def resolve_jira_issue(comment=None, jira_id=None, merge_branches=None): else: default_fix_versions = [] - for v in default_fix_versions: - # Handles the case where we have forked a release branch but not yet made the release. - # In this case, if the PR is committed to the master branch and the release branch, we - # only consider the release branch to be the fix version. E.g. it is not valid to have - # both 1.1.0 and 1.0.0 as fix versions. - (major, minor, patch) = v.split(".") - if patch == "0": - previous = "%s.%s.%s" % (major, int(minor) - 1, 0) - if previous in default_fix_versions: - default_fix_versions = list(filter( - lambda x: x != v, default_fix_versions)) + # TODO Airflow versions vary from two to four decimal places (2.0, 1.7.1.3) + # The following logic can be reintroduced if/when a standard emerges. + + # for v in default_fix_versions: + # # Handles the case where we have forked a release branch but not yet made the release. + # # In this case, if the PR is committed to the master branch and the release branch, we + # # only consider the release branch to be the fix version. E.g. it is not valid to have + # # both 1.1.0 and 1.0.0 as fix versions. + # (major, minor, patch) = v.split(".") + # if patch == "0": + # previous = "%s.%s.%s" % (major, int(minor) - 1, 0) + # if previous in default_fix_versions: + # default_fix_versions = list(filter( + # lambda x: x != v, default_fix_versions)) default_fix_versions = ",".join(default_fix_versions) fix_versions = click.prompt(
