From 48817cc111a9705f40b7c842315eee24291c2198 Mon Sep 17 00:00:00 2001 From: Holden Karau Date: Thu, 10 Sep 2015 16:42:12 +0200 Subject: [SPARK-10497] [BUILD] [TRIVIAL] Handle both locations for JIRAError with python-jira Location of JIRAError has moved between old and new versions of python-jira package. Longer term it probably makes sense to pin to specific versions (as mentioned in https://issues.apache.org/jira/browse/SPARK-10498 ) but for now, making release tools works with both new and old versions of python-jira. Author: Holden Karau Closes #8661 from holdenk/SPARK-10497-release-utils-does-not-work-with-new-jira-python. --- dev/create-release/releaseutils.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dev/create-release/releaseutils.py') diff --git a/dev/create-release/releaseutils.py b/dev/create-release/releaseutils.py index 51ab25a6a5..7f152b7f53 100755 --- a/dev/create-release/releaseutils.py +++ b/dev/create-release/releaseutils.py @@ -24,7 +24,11 @@ from subprocess import Popen, PIPE try: from jira.client import JIRA - from jira.exceptions import JIRAError + # Old versions have JIRAError in exceptions package, new (0.5+) in utils. + try: + from jira.exceptions import JIRAError + except ImportError: + from jira.utils import JIRAError except ImportError: print "This tool requires the jira-python library" print "Install using 'sudo pip install jira'" -- cgit v1.2.3