From 3efd0e33bfbf7dd1ef6b88745ffa397acabd5ce9 Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Tue, 10 Oct 2017 16:00:36 +0200 Subject: [PATCH] lister_transports: load version by using vcversioner's export module --- .gitignore | 1 + setup.py | 2 +- swh/lister/core/lister_transports.py | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c5baade..67cfee3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ __pycache__ dist *.egg-info version.txt +swh/lister/_version.py diff --git a/setup.py b/setup.py index 8fe511f..74ec27b 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,6 @@ setup( scripts=['bin/ghlister'], install_requires=parse_requirements(), setup_requires=['vcversioner'], - vcversioner={}, + vcversioner={'version_module_paths': ['swh/lister/_version.py']}, include_package_data=True, ) diff --git a/swh/lister/core/lister_transports.py b/swh/lister/core/lister_transports.py index 4e116f9..58a4605 100644 --- a/swh/lister/core/lister_transports.py +++ b/swh/lister/core/lister_transports.py @@ -9,9 +9,13 @@ from email.utils import parsedate from pprint import pformat import requests -import vcversioner import xmltodict +try: + from swh.lister._version import __version__ +except ImportError: + __version__ = 'devel' + from .abstractattribute import AbstractAttribute from .lister_base import FetchError @@ -92,7 +96,7 @@ class SWHListerHttpTransport(abc.ABC): raise NameError('HTTP Lister Transport requires api_baseurl.') self.api_baseurl = api_baseurl # eg. 'https://api.github.com' self.session = requests.Session() - self.lister_version = vcversioner.find_version().version + self.lister_version = __version__ def transport_request(self, identifier): """Implements SWHListerBase.transport_request for HTTP using Requests.