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

L2SS-1156: Upgrade PyTango to 9.4.0 and above

parent c7480c15
No related branches found
No related tags found
1 merge request!44L2SS-1156: Upgrade PyTango to 9.4.0 and above
...@@ -3,6 +3,8 @@ default: ...@@ -3,6 +3,8 @@ default:
# 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
- tox --version
- pip --version
cache: cache:
paths: paths:
- .cache/pip - .cache/pip
...@@ -66,7 +68,9 @@ run_unit_tests_py37: ...@@ -66,7 +68,9 @@ run_unit_tests_py37:
before_script: before_script:
- apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y libboost-python-dev libtango-dev # Needed to install pytango - 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 install --upgrade tox - pip install --upgrade tox
- tox --version
run_unit_tests_py38: run_unit_tests_py38:
extends: .run_unit_tests_pyXX extends: .run_unit_tests_pyXX
......
...@@ -6,4 +6,4 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libboost-python-dev libtan ...@@ -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 # Make sure we have the latest tooling for our tests
RUN python -m pip install --upgrade pip RUN python -m pip install --upgrade pip
RUN pip install --upgrade "tox<4" RUN pip install --upgrade tox
# Order does matter # Order does matter
PyTango>=9.4.0 # LGPL v3
requests>=2.0 # Apache 2 requests>=2.0 # Apache 2
numpy>=1.21.0 # BSD numpy>=1.21.0 # BSD
nptyping>=2.3.0 # MIT nptyping>=2.3.0 # MIT
...@@ -7,5 +8,3 @@ pyDeprecate>=0.3.0 # MIT ...@@ -7,5 +8,3 @@ pyDeprecate>=0.3.0 # MIT
h5py >= 3.1.0 # BSD h5py >= 3.1.0 # BSD
pytz>=2022.6 # MIT pytz>=2022.6 # MIT
psutil>=5.9.4 # BSD 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] [tox]
min_version = 4.3.3
# Generative environment list to test all supported Python versions # Generative environment list to test all supported Python versions
envlist = black,pep8,pylint,py3{7,8,9,10},docs envlist = black,pep8,pylint,py3{7,8,9,10},docs
minversion = 3.18.0
[testenv] [testenv]
usedevelop = True usedevelop = True
...@@ -15,9 +15,7 @@ deps = ...@@ -15,9 +15,7 @@ deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands_pre = commands_pre =
# required until https://gitlab.com/tango-controls/pytango/-/issues/468 is resolved {envpython} --version
pip install 'numpy>=1.21.0'
pip install --no-cache 'PyTango>=9.3.5'
commands = commands =
{envpython} --version {envpython} --version
stestr run {posargs} stestr run {posargs}
...@@ -72,7 +70,7 @@ skip_install = true ...@@ -72,7 +70,7 @@ skip_install = true
# Intentionally break import paths if not installed from package # Intentionally break import paths if not installed from package
changedir={toxinidir}/integration changedir={toxinidir}/integration
# Allow bash for wheel file substitution # Allow bash for wheel file substitution
allowlist_external = allowlist_externals =
bash bash
commands = commands =
# We need the bash substitutions here # We need the bash substitutions here
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment