Skip to content

Commit

Permalink
tox.ini: fix builds
Browse files Browse the repository at this point in the history
The fix in 9897045 did not really fix the issue with setuptools and
packaging incompatibility.

The issue is that tox creates a new virtualenv with latest
setuptools/pip from pypi. But the newest setuptools version is
incompatible with the system's packaging version (20.9 on c9s).

So first thing we do is installing packaging>=22.0 into the venv to make
sure the next installs don't fail.

Signed-off-by: Jean-Louis Dupond <[email protected]>
  • Loading branch information
dupondje authored and sandrobonazzola committed Dec 10, 2024
1 parent 253bdaf commit ef5c9de
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ deps =
pytest
pytest-cov
pytest-timeout
packaging
changedir = {toxinidir}/tests
markers = "not (integration or slow or stress)"

Expand Down Expand Up @@ -91,10 +90,10 @@ passenv = {[base]passenv}
setenv =
{[base]setenv}
COVERAGE_FILE=.coverage-storage-user
deps = {[base]deps}
userstorage>=0.5.1
changedir = {[base]changedir}
commands =
python -I -m pip install packaging>=22.0
python -I -m pip install nose==1.3.7 pytest pytest-cov pytest-timeout userstorage>=0.5.1
python profile {envname} pytest -m {[base]markers}" and not root" \
--durations=20 \
--cov=vdsm.storage \
Expand All @@ -107,10 +106,10 @@ passenv = {[base]passenv}
setenv =
{[base]setenv}
COVERAGE_FILE=.coverage-storage-root
deps = {[base]deps}
userstorage>=0.5.1
changedir = {[base]changedir}
commands =
python -I -m pip install packaging>=22.0
python -I -m pip install nose==1.3.7 pytest pytest-cov pytest-timeout userstorage>=0.5.1
python profile {envname} pytest -m {[base]markers}" and root" \
--durations=20 \
--cov=vdsm.storage \
Expand Down Expand Up @@ -161,9 +160,9 @@ commands =
[testenv:pylint]
setenv =
PYTHONPATH = vdsm:lib
deps =
pylint~=2.10.0
commands =
python -I -m pip install packaging>=22.0
python -I -m pip install pylint~=2.10.0
python {toxinidir}/tests/profile {envname} pylint -j{env:PYLINT_JOBS:4} --reports=no --score=no {posargs}

[testenv:flake8]
Expand Down

0 comments on commit ef5c9de

Please sign in to comment.