diff --git a/zuul/cmd/__init__.py b/zuul/cmd/__init__.py index 6df796bcad..9ce3425020 100755 --- a/zuul/cmd/__init__.py +++ b/zuul/cmd/__init__.py @@ -105,8 +105,8 @@ class ZuulApp(object): self.commands = {} def _get_version(self): - from zuul.version import version_info as zuul_version_info - return "Zuul version: %s" % zuul_version_info.release_string() + from zuul.version import release_string + return "Zuul version: %s" % release_string def createParser(self): parser = argparse.ArgumentParser( @@ -226,12 +226,12 @@ class ZuulDaemonApp(ZuulApp, metaclass=abc.ABCMeta): def setup_logging(self, section, parameter): super(ZuulDaemonApp, self).setup_logging(section, parameter) - from zuul.version import version_info as zuul_version_info + from zuul.version import release_string log = logging.getLogger( "zuul.{section}".format(section=section.title())) log.debug( "Configured logging: {version}".format( - version=zuul_version_info.release_string())) + version=release_string)) def main(self): self.parseArguments() diff --git a/zuul/version.py b/zuul/version.py index eafa6c2c70..80512842b5 100644 --- a/zuul/version.py +++ b/zuul/version.py @@ -17,11 +17,10 @@ import json -import pbr.version +from importlib import metadata as importlib_metadata import pkg_resources -version_info = pbr.version.VersionInfo('zuul') -release_string = version_info.release_string() +release_string = importlib_metadata.distribution('zuul').version is_release = None git_version = None