PARQUET-57 - Update dev README to clarify two points

Author: Brock Noland <[email protected]> Closes apache#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
parthchandra · Jul 31, 2014 · 0793e49 · 0793e49
1 parent 21d871b
commit 0793e49
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git 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):

diff --git a/dev/merge_parquet_pr.py b/dev/merge_parquet_pr.py
@@ -51,9 +51,9 @@
 # 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 get_version_json(version_str):
     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