From 4dc08d6e36a7fd5515231fb23fda47bdbe72b4dd Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 9 Jun 2021 13:38:37 +0000
Subject: [PATCH] Managed to have files functional in same directory
---
.gitlab-ci.yml | 7 ++++---
.stestr.conf | 3 ---
devices/.stestr.conf | 3 +++
devices/__init__.py | 8 ++------
requirements.txt => devices/requirements.txt | 0
setup.cfg => devices/setup.cfg | 6 +++---
devices/setup.py | 3 +++
test-requirements.txt => devices/test-requirements.txt | 3 ---
devices/test/base.py | 3 ++-
devices/test/sdp/test_sdp.py | 4 ++--
tox.ini => devices/tox.ini | 6 +++---
setup.py | 3 ---
12 files changed, 22 insertions(+), 27 deletions(-)
delete mode 100644 .stestr.conf
create mode 100644 devices/.stestr.conf
rename requirements.txt => devices/requirements.txt (100%)
rename setup.cfg => devices/setup.cfg (92%)
create mode 100644 devices/setup.py
rename test-requirements.txt => devices/test-requirements.txt (84%)
rename tox.ini => devices/tox.ini (75%)
delete mode 100644 setup.py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d9cd916b..be4e30a13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,12 @@
image: artefact.skatelescope.org/ska-tango-images/tango-itango:9.3.3.7
variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
- PBR_VERSION: "0.1"
cache:
paths:
- .cache/pip
- .tox
-before_script:
- - pip install tox
+#before_script:
+# - pip install tox
stages:
- linting
- unit-tests
@@ -15,8 +14,10 @@ linting:
stage: linting
allow_failure: true
script:
+ - cd devices
- tox -e pep8
unit_test:
stage: unit-tests
script:
+ - cd devices
- tox -e py37
\ No newline at end of file
diff --git a/.stestr.conf b/.stestr.conf
deleted file mode 100644
index 10b8cdff7..000000000
--- a/.stestr.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-test_path=./devices/test
-top_dir=./
\ No newline at end of file
diff --git a/devices/.stestr.conf b/devices/.stestr.conf
new file mode 100644
index 000000000..da4cd7aea
--- /dev/null
+++ b/devices/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./test
+top_dir=./
\ No newline at end of file
diff --git a/devices/__init__.py b/devices/__init__.py
index efefae1d5..329b61fa5 100644
--- a/devices/__init__.py
+++ b/devices/__init__.py
@@ -1,7 +1,3 @@
-import pbr.version
+from util.lofar_git import get_version
-__version__ = pbr.version.VersionInfo(
- 'TangoStationControl').version_string()
-# from ._version import get_versions
-# __version__ = get_versions()['version']
-# del get_versions
+__version__ = get_version()
diff --git a/requirements.txt b/devices/requirements.txt
similarity index 100%
rename from requirements.txt
rename to devices/requirements.txt
diff --git a/setup.cfg b/devices/setup.cfg
similarity index 92%
rename from setup.cfg
rename to devices/setup.cfg
index bc2b0d008..3b338be4e 100644
--- a/setup.cfg
+++ b/devices/setup.cfg
@@ -24,10 +24,10 @@ classifier =
[files]
packages =
- devices
+ ./
[entry_points]
console_scripts =
- SDP = devices.SDP:main
- PCC = devices.PCC:main
+ SDP = SDP:main
+ PCC = PCC:main
diff --git a/devices/setup.py b/devices/setup.py
new file mode 100644
index 000000000..c9cac6d25
--- /dev/null
+++ b/devices/setup.py
@@ -0,0 +1,3 @@
+import setuptools
+
+setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)
diff --git a/test-requirements.txt b/devices/test-requirements.txt
similarity index 84%
rename from test-requirements.txt
rename to devices/test-requirements.txt
index 3a6dd8dca..e5a7e45d4 100644
--- a/test-requirements.txt
+++ b/devices/test-requirements.txt
@@ -5,11 +5,8 @@
coverage>=5.2.0 # Apache-2.0
doc8>=0.8.0 # Apache-2.0
hacking>=3.2.0,<3.3.0 # Apache-2.0
-#mypy>=0.812 # MIT
python-subunit>=1.4.0 # Apache-2.0/BSD
Pygments>=2.6.0
-#oslotest>=4.4.0 # Apache-2.0
-#oslo.messaging>=12.2.0 # Apache-2.0
stestr>=3.0.0 # Apache-2.0
testscenarios>=0.5.0 # Apache-2.0/BSD
testtools>=2.4.0 # MIT
diff --git a/devices/test/base.py b/devices/test/base.py
index c3335dad5..5ef98096a 100644
--- a/devices/test/base.py
+++ b/devices/test/base.py
@@ -7,10 +7,11 @@
# Distributed under the terms of the APACHE license.
# See LICENSE.txt for more info.
+import unittest
import testscenarios
-class BaseTestCase(testscenarios.WithScenarios):
+class BaseTestCase(testscenarios.WithScenarios, unittest.TestCase):
"""Test base class."""
def setUp(self):
diff --git a/devices/test/sdp/test_sdp.py b/devices/test/sdp/test_sdp.py
index 5929acc09..fd50438b0 100644
--- a/devices/test/sdp/test_sdp.py
+++ b/devices/test/sdp/test_sdp.py
@@ -7,9 +7,9 @@
# Distributed under the terms of the APACHE license.
# See LICENSE.txt for more info.
-from devices.SDP import SDP
+from SDP import SDP
-from devices.test import base
+from test import base
class TestSDP(base.TestCase):
diff --git a/tox.ini b/devices/tox.ini
similarity index 75%
rename from tox.ini
rename to devices/tox.ini
index 1bd6bef4a..88d048b1e 100644
--- a/tox.ini
+++ b/devices/tox.ini
@@ -14,11 +14,11 @@ setenv =
OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60
deps = -r{toxinidir}/test-requirements.txt
- -r{toxinidir}/docker-compose/lofar-device-base/lofar-requirements.txt
+ -r{toxinidir}/../docker-compose/lofar-device-base/lofar-requirements.txt
commands = stestr run {posargs}
[testenv:pep8]
commands =
; doc8 doc/source/ README.rst
- flake8 devices/{posargs}
- bandit -r devices -x test -n5 -ll # -s B320
\ No newline at end of file
+ flake8 ./{posargs}
+ bandit -r ./ -x test -n5 -ll # -s B320
\ No newline at end of file
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 41c6476e1..000000000
--- a/setup.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import setuptools
-
-setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)
\ No newline at end of file
--
GitLab