Merge branch 'L2SS-1156' into 'main'

L2SS-1156: Upgrade PyTango to 9.4.0 and above

Closes L2SS-1156

See merge request !44

.gitlab-ci.yml

@@ -3,6 +3,8 @@ default:
   # Make sure each step is executed in a virtual environment with some basic dependencies present
   before_script:
     - python --version # For debugging
+    - tox --version
+    - pip --version
   cache:
     paths:
       - .cache/pip
@@ -66,7 +68,9 @@ run_unit_tests_py37:
   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

docker/Dockerfile.ci_python37

@@ -6,4 +6,4 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libboost-python-dev libtan
 
 # Make sure we have the latest tooling for our tests
 RUN python -m pip install --upgrade pip
-RUN pip install --upgrade "tox<4"
+RUN pip install --upgrade tox

requirements.txt

 # Order does matter
+PyTango>=9.4.0 # LGPL v3
 requests>=2.0 # Apache 2
 numpy>=1.21.0 # BSD
 nptyping>=2.3.0 # MIT
@@ -7,5 +8,3 @@ pyDeprecate>=0.3.0 # MIT
 h5py >= 3.1.0 # BSD
 pytz>=2022.6 # MIT
 psutil>=5.9.4 # BSD
-# commented out until https://gitlab.com/tango-controls/pytango/-/issues/468 is resolved
-# PyTango>=9.3.5 # GNU LGPL v3

tox.ini

 [tox]
+min_version = 4.3.3
 # Generative environment list to test all supported Python versions
 envlist = black,pep8,pylint,py3{7,8,9,10},docs
-minversion = 3.18.0
 
 [testenv]
 usedevelop = True
@@ -15,9 +15,7 @@ deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands_pre =
-    # required until https://gitlab.com/tango-controls/pytango/-/issues/468 is resolved
-    pip install 'numpy>=1.21.0'
-    pip install --no-cache 'PyTango>=9.3.5'
+    {envpython} --version
 commands =
     {envpython} --version
     stestr run {posargs}
@@ -72,7 +70,7 @@ skip_install = true
 # Intentionally break import paths if not installed from package
 changedir={toxinidir}/integration
 # Allow bash for wheel file substitution
-allowlist_external =
+allowlist_externals =
     bash
 commands =
     # We need the bash substitutions here