erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

setup, tools(utils): fixed versioning in setup and getRepositoryData

Browse source
This commit is contained in:
Goffi 2018-04-06 16:47:40 +02:00
commit a9e368cf6a
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sat/tools/utils.py
View file

@ -204,18 +204,23 @@ def getRepositoryData(module, as_string=True, is_path=False):
try:
import pkg_resources
pkg_version = pkg_resources.get_distribution(C.APP_NAME_FILE).version
version, hg_node, hg_distance = pkg_version.split('-')
version, local_id = pkg_version.split('+', 1)
except ImportError:
log.warning("pkg_resources not available, can't get package data")
except pkg_resources.DistributionNotFound:
log.warning("can't retrieve package data")
except ValueError:
log.warning(u"package version doesn't fit: {pkg_version}".format(pkg_version=pkg_version))
log.info(u"no local version id in package: {pkg_version}".format(pkg_version=pkg_version))
else:
version = version.replace('.dev0', 'D')
if version != C.APP_VERSION:
log.error("Incompatible version ({version}) and pkg_version ({pkg_version})".format(
log.warning("Incompatible version ({version}) and pkg_version ({pkg_version})".format(
version=C.APP_VERSION, pkg_version=pkg_version))
else:
try:
hg_node, hg_distance = local_id.split('.')
except ValueError:
log.warning("Version doesn't specify repository data")
hg_data = {'node_short': hg_node, 'distance': hg_distance}
repos_cache_dict = hg_data