From 293d71d5e4f0494a8f8c9476e03dc7d04850b5d7 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 9 Jun 2021 16:30:27 +0000
Subject: [PATCH] L2SS-259: Clean up of some initial solutions
---
.gitlab-ci.yml | 13 ++++++++-----
devices/setup.cfg | 17 +++++++----------
devices/setup.py | 1 +
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b26bd68e1..6aea1913b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,16 @@
image: artefact.skatelescope.org/ska-tango-images/tango-itango:9.3.3.7
variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+ # The PBR dependency requires a set version, not actually used
PBR_VERSION: "0.1"
cache:
paths:
- .cache/pip
- - .tox
-before_script:
- - sudo apt-get update
- - sudo apt-get install -y git
+ - devices/.tox
+.before_script_template: &before_unit_test
+ before_script:
+ - sudo apt-get update
+ - sudo apt-get install -y git
stages:
- linting
- unit-tests
@@ -20,6 +22,7 @@ linting:
- tox -e pep8
unit_test:
stage: unit-tests
+ <<: *before_unit_test
script:
- cd devices
- - tox -e py37
\ No newline at end of file
+ - tox -e py37
diff --git a/devices/setup.cfg b/devices/setup.cfg
index 3b338be4e..586aa1906 100644
--- a/devices/setup.cfg
+++ b/devices/setup.cfg
@@ -1,15 +1,14 @@
[metadata]
name = TangoStationControl
summary = LOFAR 2.0 Station Control
-#description-file =
-# README.rst
+description-file =
+ README.md
description-content-type = text/x-rst; charset=UTF-8
author = ASTRON
-#home-page = https://dantalion.nl
-#project_urls =
-# Bug Tracker = https://github.com/Dantali0n/RadLoggerPy/issues
-# Documentation = https://docs.openstack.org/pbr/
-# Source Code = https://github.com/Dantali0n/radloggerpy
+home-page = https://astron.nl
+project_urls =
+ Bug Tracker = https://support.astron.nl/jira/projects/L2SS/issues/
+ Source Code = https://git.astron.nl/lofar2.0/tango
license = Apache-2
classifier =
Environment :: Console
@@ -23,11 +22,9 @@ classifier =
Programming Language :: Python :: 3.9
[files]
-packages =
- ./
+package_dir=./
[entry_points]
console_scripts =
SDP = SDP:main
PCC = PCC:main
-
diff --git a/devices/setup.py b/devices/setup.py
index c9cac6d25..4fa0ce44d 100644
--- a/devices/setup.py
+++ b/devices/setup.py
@@ -1,3 +1,4 @@
import setuptools
+# Requires: setup.cfg
setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)
--
GitLab