Skip to content
Snippets Groups Projects
Commit 36f05837 authored by Corné Lukken's avatar Corné Lukken
Browse files

Compatability for PyTango 9.5.0

parent 2c9e54af
No related branches found
No related tags found
1 merge request!82L2SS-1632: Compatability for PyTango 9.5.0
default: default:
image: $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python37:$CI_COMMIT_SHORT_SHA # minimum supported version image: $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python39:$CI_COMMIT_SHORT_SHA # minimum supported version
# Make sure each step is executed in a virtual environment with some basic dependencies present # Make sure each step is executed in a virtual environment with some basic dependencies present
before_script: before_script:
- python --version # For debugging - python --version # For debugging
...@@ -26,7 +26,7 @@ stages: ...@@ -26,7 +26,7 @@ stages:
variables: variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
build_test_image_python37: build_test_image_python39:
stage: image stage: image
image: docker image: docker
services: services:
...@@ -36,8 +36,8 @@ build_test_image_python37: ...@@ -36,8 +36,8 @@ build_test_image_python37:
before_script: before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script: script:
- docker build -t $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python37:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile.ci_python37 docker - docker build -t $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python39:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile.ci_python39 docker
- docker push $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python37:$CI_COMMIT_SHORT_SHA - docker push $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python39:$CI_COMMIT_SHORT_SHA
run_black: run_black:
stage: lint stage: lint
...@@ -54,11 +54,6 @@ run_pylint: ...@@ -54,11 +54,6 @@ run_pylint:
script: script:
- tox -e pylint - tox -e pylint
# build_extensions:
# stage: build_extensions
# script:
# - echo "build fortran/c/cpp extension source code"
sast: sast:
variables: variables:
SAST_EXCLUDED_ANALYZERS: brakeman, flawfinder, kubesec, nodejs-scan, phpcs-security-audit, SAST_EXCLUDED_ANALYZERS: brakeman, flawfinder, kubesec, nodejs-scan, phpcs-security-audit,
...@@ -75,11 +70,11 @@ secret_detection: ...@@ -75,11 +70,11 @@ secret_detection:
before_script: before_script:
- uname - uname
run_unit_tests_py37: run_unit_tests_py39:
stage: test stage: test
script: script:
- echo "run python3.7 unit tests /w coverage" - echo "run python3.9 unit tests /w coverage"
- tox -e py37 - tox -e py39
.run_unit_tests_pyXX: .run_unit_tests_pyXX:
# installs the prerequisites explicitly, instead of piggy backing # installs the prerequisites explicitly, instead of piggy backing
...@@ -87,40 +82,22 @@ run_unit_tests_py37: ...@@ -87,40 +82,22 @@ run_unit_tests_py37:
# images with different python versions. # images with different python versions.
stage: test stage: test
before_script: 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 - python -m pip install --upgrade pip
- pip --version - pip --version
- pip install --upgrade tox - pip install --upgrade tox
- tox --version - 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: run_unit_tests_py310:
extends: .run_unit_tests_pyXX extends: .run_unit_tests_pyXX
image: python:3.10-bullseye image: python:3.10-bullseye
script: 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" - echo "run python3.10 unit tests /w coverage"
- tox -e py310 - tox -e py310
coverage: coverage:
stage: test stage: test
script: script:
- echo "run python3.7 unit tests /w coverage" - echo "run python3.9 unit tests /w coverage"
- tox -e coverage - tox -e coverage
coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/' coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
artifacts: artifacts:
......
...@@ -131,6 +131,7 @@ tox -e debug tests.requests.test_prometheus ...@@ -131,6 +131,7 @@ tox -e debug tests.requests.test_prometheus
## Release notes ## 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.3 - Refactoring statistics packets. Moving tango to optional dependency `[tango]`
- 0.18.2 - Bugfix when closing unused HDF5 files - 0.18.2 - Bugfix when closing unused HDF5 files
- 0.18.1 - Flush HDF5 files explicitly, reduce memory usage for XSTs - 0.18.1 - Flush HDF5 files explicitly, reduce memory usage for XSTs
......
FROM python:3.7-buster FROM python:3.9-bullseye
# Install PyTango dependencies
RUN apt-get update -y
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libboost-python-dev libtango-dev
# Make sure we have the latest tooling for our tests # Make sure we have the latest tooling for our tests
RUN python -m pip install --upgrade pip RUN python -m pip install --upgrade pip
......
PyTango>=9.4.0 # LGPL v3 PyTango>=9.5.0 # LGPL v3
...@@ -8,8 +8,6 @@ usedevelop = True ...@@ -8,8 +8,6 @@ usedevelop = True
package = wheel package = wheel
wheel_build_env = .pkg wheel_build_env = .pkg
setenv = setenv =
LANGUAGE=en_US
LC_ALL=en_US.UTF-8
PYTHONWARNINGS=default::DeprecationWarning PYTHONWARNINGS=default::DeprecationWarning
deps = deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment