Merge branch 'lukken-test-9.5.0rc2' into 'main'

Compatability for PyTango 9.5.0

See merge request !82

.gitlab-ci.yml

 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
   before_script:
     - python --version # For debugging
@@ -26,7 +26,7 @@ stages:
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
 
-build_test_image_python37:
+build_test_image_python39:
   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_python37:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile.ci_python37 docker
-    - docker push $CI_REGISTRY/lofar2.0/lofar-station-client/ci_python37:$CI_COMMIT_SHORT_SHA
+    - 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_python39:$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_py37:
+run_unit_tests_py39:
   stage: test
   script:
-    - echo "run python3.7 unit tests /w coverage"
-    - tox -e py37
+    - echo "run python3.9 unit tests /w coverage"
+    - tox -e py39
 
 .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:

README.md

@@ -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

docker/Dockerfile.ci_python37 → docker/Dockerfile.ci_python39

-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

requirements-tango.txt

-PyTango>=9.4.0 # LGPL v3
+PyTango>=9.5.0 # LGPL v3

tox.ini

@@ -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