Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ci changes #424

Merged
merged 4 commits into from
Dec 10, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
tox.ini: fix builds
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]>
dupondje committed Nov 22, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 3aea0615c8d61bdc6ad1aefc0771bc3c081f5d2f
13 changes: 6 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ deps =
pytest
pytest-cov
pytest-timeout
packaging
changedir = {toxinidir}/tests
markers = "not (integration or slow or stress)"

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