From 3d8bb599d154c1aaeb10e159be8fad006e76f050 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 13 Oct 2021 08:47:56 +0000
Subject: [PATCH] L2SS-287: pbr version test
---
tangostationcontrol/requirements.txt | 1 +
tangostationcontrol/setup.cfg | 13 ++++++++++++-
tangostationcontrol/setup.py | 4 ++--
tangostationcontrol/tangostationcontrol/__init__.py | 7 +++++--
tangostationcontrol/tangostationcontrol/version.py | 7 +++++--
5 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/tangostationcontrol/requirements.txt b/tangostationcontrol/requirements.txt
index a177d8feb..dbcf27551 100644
--- a/tangostationcontrol/requirements.txt
+++ b/tangostationcontrol/requirements.txt
@@ -2,5 +2,6 @@
# order of appearance. Changing the order has an impact on the overall
# integration process, which may cause wedges in the gate later.
+pbr >= 2
GitPython >= 3.1.24 # BSD
snmp>=0.1.7 # GPL3
diff --git a/tangostationcontrol/setup.cfg b/tangostationcontrol/setup.cfg
index 828bd0d65..49c884890 100644
--- a/tangostationcontrol/setup.cfg
+++ b/tangostationcontrol/setup.cfg
@@ -1,6 +1,7 @@
[metadata]
name = tangostationcontrol
-version = attr: tangostationcontrol.__version__
+;version = attr: tangostationcontrol.__version__
+version = 0.0.1
summary = LOFAR 2.0 Station Control
description_file =
README.md
@@ -25,6 +26,16 @@ classifier =
[files]
packages=tangostationcontrol
+;[options]
+;package_dir=
+; =tangostationcontrol
+;packages=find:
+;
+;[options.packages.find]
+;where=tangostationcontrol
+;
+;[options.entry_points]
+
[entry_points]
console_scripts =
l2ss-docker-device = tangostationcontrol.devices.docker_device:main
diff --git a/tangostationcontrol/setup.py b/tangostationcontrol/setup.py
index ab0d6867e..d3ec3b44f 100644
--- a/tangostationcontrol/setup.py
+++ b/tangostationcontrol/setup.py
@@ -1,5 +1,5 @@
import setuptools
# Requires: setup.cfg
-# setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)
-setuptools.setup()
+setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)
+# setuptools.setup()
diff --git a/tangostationcontrol/tangostationcontrol/__init__.py b/tangostationcontrol/tangostationcontrol/__init__.py
index e7b28aa7e..11f6b43c1 100644
--- a/tangostationcontrol/tangostationcontrol/__init__.py
+++ b/tangostationcontrol/tangostationcontrol/__init__.py
@@ -1,3 +1,6 @@
-from tangostationcontrol.common.lofar_git import get_version
+# from tangostationcontrol.common.lofar_git import get_version
+#
+# __version__ = get_version()
-__version__ = get_version()
+import pbr.version
+__version__ = pbr.version.VersionInfo('tangostationcontrol').version_string()
diff --git a/tangostationcontrol/tangostationcontrol/version.py b/tangostationcontrol/tangostationcontrol/version.py
index 796edfbff..e31f88543 100644
--- a/tangostationcontrol/tangostationcontrol/version.py
+++ b/tangostationcontrol/tangostationcontrol/version.py
@@ -1,3 +1,6 @@
-from tangostationcontrol.common.lofar_git import get_version
+# version = "v0.0.1"
-version_string = get_version()
+import pbr.version
+
+version_info = pbr.version.VersionInfo('python-watcher')
+version_string = version_info.version_string()
\ No newline at end of file
--
GitLab