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/12/22 12:49:44 UTC
incubator-airflow git commit: [AIRFLOW-1938] Clean up unused exception
Repository: incubator-airflow
Updated Branches:
refs/heads/master 664521809 -> a5ca8cdce
[AIRFLOW-1938] Clean up unused exception
There is no longer the possibility of a
GitCommandError (since cc4404b5f75)
Closes #2898 from wrp/setup
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/a5ca8cdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/a5ca8cdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/a5ca8cdc
Branch: refs/heads/master
Commit: a5ca8cdce9ca0e8d8818af437d609d6fb9b5e627
Parents: 6645218
Author: William Pursell <wi...@wepay.com>
Authored: Fri Dec 22 13:49:37 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Fri Dec 22 13:49:37 2017 +0100
----------------------------------------------------------------------
setup.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/a5ca8cdc/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 0b7462b..cc6dc03 100644
--- a/setup.py
+++ b/setup.py
@@ -72,19 +72,14 @@ def git_version(version):
logger.warning('gitpython not found: Cannot compute the git version.')
return ''
except Exception as e:
- logger.warning('Git repo not found: Cannot compute the git version.')
+ logger.warning('Cannot compute the git version. {}'.format(e))
return ''
if repo:
sha = repo.head.commit.hexsha
if repo.is_dirty():
return '.dev0+{sha}.dirty'.format(sha=sha)
# commit is clean
- # is it release of `version` ?
- try:
- return '.release:{version}+{sha}'.format(version=version,
- sha=sha)
- except git.GitCommandError:
- return '.dev0+{sha}'.format(sha=sha)
+ return '.release:{version}+{sha}'.format(version=version, sha=sha)
else:
return 'no_git_version'