You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/09/11 13:24:19 UTC
[1/2] incubator-airflow git commit: [AIRFLOW-XXX] Save username and
password in airflow-pr
Repository: incubator-airflow
Updated Branches:
refs/heads/master da76ac72e -> 5de632e07
[AIRFLOW-XXX] Save username and password in airflow-pr
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/f9dcc7d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/f9dcc7d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/f9dcc7d6
Branch: refs/heads/master
Commit: f9dcc7d6e0e61f86b8b02b15106170e7fd4465ce
Parents: 5b978b2
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Mon Sep 11 15:02:45 2017 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Mon Sep 11 15:19:58 2017 +0200
----------------------------------------------------------------------
dev/airflow-pr | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/f9dcc7d6/dev/airflow-pr
----------------------------------------------------------------------
diff --git a/dev/airflow-pr b/dev/airflow-pr
index c7f75a0..65243dd 100755
--- a/dev/airflow-pr
+++ b/dev/airflow-pr
@@ -469,7 +469,9 @@ def fix_version_from_branch(branch, versions):
def register(username, password):
""" Use this function to register a JIRA account in your OS' keyring """
- keyring.set_password('airflow-pr', username, password)
+ keyring.set_password('airflow-pr', 'username', username)
+ keyring.set_password('airflow-pr', 'password', password)
+
def validate_jira_id(jira_id):
if not jira_id:
@@ -541,6 +543,11 @@ def resolve_jira_issue(comment=None, jira_id=None, merge_branches=None):
JIRA_USERNAME = os.environ.get("JIRA_USERNAME", '')
if not JIRA_USERNAME:
JIRA_USERNAME = TMP_CREDENTIALS.get('JIRA_USERNAME', '')
+ if not JIRA_USERNAME:
+ JIRA_USERNAME = keyring.get_password("airflow-pr", "username")
+ if JIRA_USERNAME:
+ click.echo("Obtained jira username from keyring. To reset remove it there")
+
# ASF JIRA password
JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", '')
if not JIRA_PASSWORD:
@@ -554,7 +561,7 @@ def resolve_jira_issue(comment=None, jira_id=None, merge_branches=None):
'Set a JIRA_USERNAME env var to avoid this prompt in the future.')
TMP_CREDENTIALS['JIRA_USERNAME'] = JIRA_USERNAME
if JIRA_USERNAME and not JIRA_PASSWORD:
- JIRA_PASSWORD = keyring.get_password("airflow-pr", JIRA_USERNAME)
+ JIRA_PASSWORD = keyring.get_password("airflow-pr", 'password')
if JIRA_PASSWORD:
click.echo("Obtained password from keyring. To reset remove it there.")
if not JIRA_PASSWORD:
[2/2] incubator-airflow git commit: Merge branch 'pr_nicer'
Posted by bo...@apache.org.
Merge branch 'pr_nicer'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/5de632e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/5de632e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/5de632e0
Branch: refs/heads/master
Commit: 5de632e07ba062bac1934ffeaa92f9a1ba17ce78
Parents: da76ac7 f9dcc7d
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Mon Sep 11 15:24:11 2017 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Mon Sep 11 15:24:11 2017 +0200
----------------------------------------------------------------------
dev/airflow-pr | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------