parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject parquet-format git commit: PARQUET-1024: Allow case-insensitive parquet-xxx prefix in PR title.
Date Fri, 06 Oct 2017 23:52:41 GMT
Repository: parquet-format
Updated Branches:
  refs/heads/master bef543899 -> b9443d9fa


PARQUET-1024: Allow case-insensitive parquet-xxx prefix in PR title.

This merges changes from PARQUET-1024 in parquet-mr into parquet-format.

Also cleaning up old PRs:

Closes #29
Closes #60


Project: http://git-wip-us.apache.org/repos/asf/parquet-format/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-format/commit/b9443d9f
Tree: http://git-wip-us.apache.org/repos/asf/parquet-format/tree/b9443d9f
Diff: http://git-wip-us.apache.org/repos/asf/parquet-format/diff/b9443d9f

Branch: refs/heads/master
Commit: b9443d9fa2a83f4814e735113a8a68461af83c1a
Parents: bef5438
Author: Ryan Blue <blue@apache.org>
Authored: Fri Oct 6 16:49:55 2017 -0700
Committer: Ryan Blue <blue@apache.org>
Committed: Fri Oct 6 16:51:45 2017 -0700

----------------------------------------------------------------------
 dev/merge_parquet_pr.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-format/blob/b9443d9f/dev/merge_parquet_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_parquet_pr.py b/dev/merge_parquet_pr.py
index dcb7af6..4d2ca6d 100755
--- a/dev/merge_parquet_pr.py
+++ b/dev/merge_parquet_pr.py
@@ -79,11 +79,19 @@ def fail(msg):
 
 
 def run_cmd(cmd):
-    if isinstance(cmd, list):
-        return subprocess.check_output(cmd)
-    else:
-        return subprocess.check_output(cmd.split(" "))
-
+    try:
+        if isinstance(cmd, list):
+            return subprocess.check_output(cmd)
+        else:
+            return subprocess.check_output(cmd.split(" "))
+    except subprocess.CalledProcessError as e:
+        # this avoids hiding the stdout / stderr of failed processes
+        print 'Command failed: %s' % cmd
+        print 'With output:'
+        print '--------------'
+        print e.output
+        print '--------------'
+        raise e
 
 def continue_maybe(prompt):
     result = raw_input("\n%s (y/n): " % prompt)
@@ -210,9 +218,9 @@ def fix_version_from_branch(branch, versions):
         return filter(lambda x: x.name.startswith(branch_ver), versions)[-1]
 
 def exctract_jira_id(title):
-    m = re.search('^(PARQUET-[0-9]+):.*$', title)
+    m = re.search(r'^(PARQUET-[0-9]+)\b.*$', title, re.IGNORECASE)
     if m and m.groups > 0:
-        return m.group(1)
+        return m.group(1).upper()
     else:
         fail("PR title should be prefixed by a jira id \"PARQUET-XXX: ...\", found: \"%s\""
% title)
 


Mime
View raw message