From 62dc4dc257fe13214d2f39d903033729ab847ac8 Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Thu, 21 Nov 2019 18:23:20 +0100
Subject: [PATCH] Use pkg_resources to get the package version instead of
 vcversioner

---
 .gitignore                           | 1 -
 setup.py                             | 2 +-
 swh/lister/__init__.py               | 6 ++++++
 swh/lister/core/lister_transports.py | 5 +----
 swh/lister/core/tests/test_lister.py | 6 ++++++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0fe4dd9..a7b82b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,5 @@ build/
 dist/
 *.egg-info
 version.txt
-swh/lister/_version.py
 .tox/
 .mypy_cache/
diff --git a/setup.py b/setup.py
index 823747f..905d1f4 100755
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ setup(
     tests_require=parse_requirements('test'),
     setup_requires=['vcversioner'],
     extras_require={'testing': parse_requirements('test')},
-    vcversioner={'version_module_paths': ['swh/lister/_version.py']},
+    vcversioner={},
     include_package_data=True,
     entry_points='''
         [swh.cli.subcommands]
diff --git a/swh/lister/__init__.py b/swh/lister/__init__.py
index 5697901..600c231 100644
--- a/swh/lister/__init__.py
+++ b/swh/lister/__init__.py
@@ -10,6 +10,12 @@ import pkg_resources
 logger = logging.getLogger(__name__)
 
 
+try:
+    __version__ = pkg_resources.get_distribution('swh.lister').version
+except pkg_resources.DistributionNotFound:
+    __version__ = 'devel'
+
+
 LISTERS = {entry_point.name.split('.', 1)[1]: entry_point
            for entry_point in pkg_resources.iter_entry_points('swh.workers')
            if entry_point.name.split('.', 1)[0] == 'lister'}
diff --git a/swh/lister/core/lister_transports.py b/swh/lister/core/lister_transports.py
index f7a62c4..93b1038 100644
--- a/swh/lister/core/lister_transports.py
+++ b/swh/lister/core/lister_transports.py
@@ -14,10 +14,7 @@ import xmltodict
 
 from typing import Optional, Union
 
-try:
-    from swh.lister._version import __version__
-except ImportError:
-    __version__ = 'devel'
+from swh.lister import __version__
 
 from .abstractattribute import AbstractAttribute
 from .lister_base import FetchError
diff --git a/swh/lister/core/tests/test_lister.py b/swh/lister/core/tests/test_lister.py
index f19bdd2..8d8d6ba 100644
--- a/swh/lister/core/tests/test_lister.py
+++ b/swh/lister/core/tests/test_lister.py
@@ -12,6 +12,7 @@ import requests_mock
 from sqlalchemy import create_engine
 from typing import Any, Callable, Optional, Pattern, Type, Union
 
+import swh.lister
 from swh.lister.core.abstractattribute import AbstractAttribute
 from swh.lister.tests.test_utils import init_db
 
@@ -20,6 +21,11 @@ def noop(*args, **kwargs):
     pass
 
 
+def test_version_generation():
+    assert swh.lister.__version__ != 'devel', \
+        "Make sure swh.lister is installed (e.g. pip install -e .)"
+
+
 class HttpListerTesterBase(abc.ABC):
     """Testing base class for listers.
        This contains methods for both :class:`HttpSimpleListerTester` and