parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jul...@apache.org
Subject git commit: PARQUET-57 - Update dev README to clarify two points
Date Thu, 31 Jul 2014 21:58:14 GMT
Repository: incubator-parquet-mr
Updated Branches:
  refs/heads/master 21d871b54 -> 0793e49b8


PARQUET-57 - Update dev README to clarify two points

Author: Brock Noland <brock@apache.org>

Closes #26 from brockn/PARQUET-57 and squashes the following commits:

ffb2a9a [Brock Noland] Prompt for jira user/pass if not set
0135cdd [Brock Noland] Fix spelling
171d714 [Brock Noland] PARQUET-57 - Update dev README to clarify two points


Project: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/commit/0793e49b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/tree/0793e49b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/diff/0793e49b

Branch: refs/heads/master
Commit: 0793e49b85d34135fee9f55030997d95f62af97b
Parents: 21d871b
Author: Brock Noland <brock@apache.org>
Authored: Thu Jul 31 14:57:54 2014 -0700
Committer: julien <julien@twitter.com>
Committed: Thu Jul 31 14:57:54 2014 -0700

----------------------------------------------------------------------
 dev/README.md           |  5 +++++
 dev/merge_parquet_pr.py | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/blob/0793e49b/dev/README.md
----------------------------------------------------------------------
diff --git a/dev/README.md b/dev/README.md
index c39e286..983b3f4 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -14,6 +14,11 @@ run the following command
 ```
 dev/merge_parquet_pr.py
 ```
+
+Note:
+* The parent directory of your parquet repository must be called parquet-mr
+* Without jira-python installed you'll have to close the JIRA manually
+
 example output:
 ```
 Which pull request would you like to merge? (e.g. 34):

http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/blob/0793e49b/dev/merge_parquet_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_parquet_pr.py b/dev/merge_parquet_pr.py
index 2870276..413f2df 100755
--- a/dev/merge_parquet_pr.py
+++ b/dev/merge_parquet_pr.py
@@ -51,9 +51,9 @@ PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache-github")
 # Remote name which points to Apache git
 PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache")
 # ASF JIRA username
-JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "setme")
+JIRA_USERNAME = os.environ.get("JIRA_USERNAME")
 # ASF JIRA password
-JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "setme")
+JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD")
 
 GITHUB_BASE = "https://github.com/apache/" + PROJECT_NAME + "/pull"
 GITHUB_API_BASE = "https://api.github.com/repos/apache/" + PROJECT_NAME
@@ -277,6 +277,12 @@ def resolve_jira(title, merge_branches, comment):
     print "Succesfully resolved %s with fixVersions=%s!" % (jira_id, fix_versions)
 
 
+if not JIRA_USERNAME:
+    JIRA_USERNAME =  raw_input("Env JIRA_USERNAME not set, please enter your JIRA username:")
+
+if not JIRA_PASSWORD:
+    JIRA_PASSWORD =  raw_input("Env JIRA_PASSWORD not set, please enter your JIRA password:")
+
 branches = get_json("%s/branches" % GITHUB_API_BASE)
 branch_names = filter(lambda x: x.startswith("branch-"), [x['name'] for x in branches])
 # Assumes branch names can be sorted lexicographically


Mime
View raw message