From: Zack Cerza Date: Thu, 7 Jul 2016 14:53:41 +0000 (-0600) Subject: Revert "Add teuthology git version query/logging" X-Git-Tag: 1.1.0~576^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9608fff230665f5120e6ea98d4ae0efc91a345ef;p=teuthology.git Revert "Add teuthology git version query/logging" --- diff --git a/teuthology/__init__.py b/teuthology/__init__.py index 935c01fa33..d12e163498 100644 --- a/teuthology/__init__.py +++ b/teuthology/__init__.py @@ -14,20 +14,10 @@ monkey.patch_all() import logging import os -import subprocess -__version__ = '1.0.0' -# do our best, but if it fails, continue with above +__version__ = '0.1.0' -try: - __version__ += '-' + subprocess.check_output( - 'git rev-parse --short HEAD'.split(), - cwd=os.path.dirname(os.path.realpath(__file__)) - ).strip() -except Exception as e: - # before logging; should be unusual - print >>sys.stderr, 'Can\'t get version from git rev-parse', e # If we are running inside a virtualenv, ensure we have its 'bin' directory in # our PATH. This doesn't happen automatically if scripts are called without @@ -48,8 +38,6 @@ logging.basicConfig( format='%(asctime)s.%(msecs)03d %(levelname)s:%(name)s:%(message)s') log = logging.getLogger(__name__) -log.info('teuthology version: %s', __version__) - def setup_log_file(log_path): root_logger = logging.getLogger() @@ -66,4 +54,3 @@ def setup_log_file(log_path): handler = logging.FileHandler(filename=log_path) handler.setFormatter(formatter) root_logger.addHandler(handler) - root_logger.log.info('teuthology version: %s', __version__)