Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
LOFAR Station Client
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
LOFAR2.0
LOFAR Station Client
Commits
36f05837
Commit
36f05837
authored
1 year ago
by
Corné Lukken
Browse files
Options
Downloads
Patches
Plain Diff
Compatability for PyTango 9.5.0
parent
2c9e54af
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!82
L2SS-1632: Compatability for PyTango 9.5.0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitlab-ci.yml
+8
-31
8 additions, 31 deletions
.gitlab-ci.yml
README.md
+1
-0
1 addition, 0 deletions
README.md
docker/Dockerfile.ci_python39
+5
-0
5 additions, 0 deletions
docker/Dockerfile.ci_python39
requirements-tango.txt
+1
-1
1 addition, 1 deletion
requirements-tango.txt
tox.ini
+0
-2
0 additions, 2 deletions
tox.ini
with
15 additions
and
34 deletions
.gitlab-ci.yml
+
8
−
31
View file @
36f05837
default
:
image
:
$CI_REGISTRY/lofar2.0/lofar-station-client/ci_python3
7
:$CI_COMMIT_SHORT_SHA
# minimum supported version
image
:
$CI_REGISTRY/lofar2.0/lofar-station-client/ci_python3
9
:$CI_COMMIT_SHORT_SHA
# minimum supported version
# Make sure each step is executed in a virtual environment with some basic dependencies present
before_script
:
-
python --version
# For debugging
...
...
@@ -26,7 +26,7 @@ stages:
variables
:
PIP_CACHE_DIR
:
"
$CI_PROJECT_DIR/.cache/pip"
build_test_image_python3
7
:
build_test_image_python3
9
:
stage
:
image
image
:
docker
services
:
...
...
@@ -36,8 +36,8 @@ build_test_image_python37:
before_script
:
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script
:
-
docker build -t $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python3
7
:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile.ci_python3
7
docker
-
docker push $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python3
7
:$CI_COMMIT_SHORT_SHA
-
docker build -t $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python3
9
:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile.ci_python3
9
docker
-
docker push $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python3
9
:$CI_COMMIT_SHORT_SHA
run_black
:
stage
:
lint
...
...
@@ -54,11 +54,6 @@ run_pylint:
script
:
-
tox -e pylint
# build_extensions:
# stage: build_extensions
# script:
# - echo "build fortran/c/cpp extension source code"
sast
:
variables
:
SAST_EXCLUDED_ANALYZERS
:
brakeman, flawfinder, kubesec, nodejs-scan, phpcs-security-audit,
...
...
@@ -75,11 +70,11 @@ secret_detection:
before_script
:
-
uname
run_unit_tests_py3
7
:
run_unit_tests_py3
9
:
stage
:
test
script
:
-
echo "run python3.
7
unit tests /w coverage"
-
tox -e py3
7
-
echo "run python3.
9
unit tests /w coverage"
-
tox -e py3
9
.run_unit_tests_pyXX
:
# installs the prerequisites explicitly, instead of piggy backing
...
...
@@ -87,40 +82,22 @@ run_unit_tests_py37:
# images with different python versions.
stage
:
test
before_script
:
-
apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y libboost-python-dev libtango-dev
# Needed to install pytango
-
python -m pip install --upgrade pip
-
pip --version
-
pip install --upgrade tox
-
tox --version
run_unit_tests_py38
:
extends
:
.run_unit_tests_pyXX
image
:
python:3.8-buster
script
:
-
echo "run python3.8 unit tests /w coverage"
-
tox -e py38
run_unit_tests_py39
:
extends
:
.run_unit_tests_pyXX
image
:
python:3.9-bullseye
script
:
-
echo "run python3.9 unit tests /w coverage"
-
tox -e py39
run_unit_tests_py310
:
extends
:
.run_unit_tests_pyXX
image
:
python:3.10-bullseye
script
:
# Debian Bullseye ships with libboost-python linked to Python 3.9. Use the one from Debian Sid instead.
-
echo 'deb http://deb.debian.org/debian sid main' >> /etc/apt/sources.list
-
apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y libboost-python1.74-dev
-
echo "run python3.10 unit tests /w coverage"
-
tox -e py310
coverage
:
stage
:
test
script
:
-
echo "run python3.
7
unit tests /w coverage"
-
echo "run python3.
9
unit tests /w coverage"
-
tox -e coverage
coverage
:
'
/(?i)total.*?
(100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
artifacts
:
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
−
0
View file @
36f05837
...
...
@@ -131,6 +131,7 @@ tox -e debug tests.requests.test_prometheus
## Release notes
-
0.18.4 - Compatability with PyTango 9.5.0
-
0.18.3 - Refactoring statistics packets. Moving tango to optional dependency
`[tango]`
-
0.18.2 - Bugfix when closing unused HDF5 files
-
0.18.1 - Flush HDF5 files explicitly, reduce memory usage for XSTs
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.ci_python3
7
→
docker/Dockerfile.ci_python3
9
+
5
−
0
View file @
36f05837
FROM python:3.7-buster
# Install PyTango dependencies
RUN apt-get update -y
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libboost-python-dev libtango-dev
FROM python:3.9-bullseye
# Make sure we have the latest tooling for our tests
RUN python -m pip install --upgrade pip
...
...
This diff is collapsed.
Click to expand it.
requirements-tango.txt
+
1
−
1
View file @
36f05837
PyTango>=9.
4
.0 # LGPL v3
PyTango>=9.
5
.0 # LGPL v3
This diff is collapsed.
Click to expand it.
tox.ini
+
0
−
2
View file @
36f05837
...
...
@@ -8,8 +8,6 @@ usedevelop = True
package
=
wheel
wheel_build_env
=
.pkg
setenv
=
LANGUAGE
=
en_US
LC_ALL
=
en_US.UTF-8
PYTHONWARNINGS
=
default::DeprecationWarning
deps
=
-r{toxinidir}/requirements.txt
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment