Skip to content

GitLab

C
ceph
Commit 3a4b2708 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Pegged virtualenv tox versions

parent a9386fc9
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 20 deletions
ceph-16.2.4-fix_pytest.patch
View file @ 3a4b2708
diff -uNr ceph-16.2.4/qa/tox.ini ceph-16.2.4-fix_pytest/qa/tox.ini
--- ceph-16.2.4/qa/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/qa/tox.ini 2025-05-29 09:45:13.898300401 +0930
+++ ceph-16.2.4-fix_pytest/qa/tox.ini 2025-05-30 10:06:08.486338831 +0930
@@ -5,7 +5,7 @@
[testenv:flake8]
basepython = python3
......@@ -28,7 +28,7 @@ diff -uNr ceph-16.2.4/qa/tox.ini ceph-16.2.4-fix_pytest/qa/tox.ini
\ No newline at end of file
diff -uNr ceph-16.2.4/src/cephadm/tox.ini ceph-16.2.4-fix_pytest/src/cephadm/tox.ini
--- ceph-16.2.4/src/cephadm/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/cephadm/tox.ini 2025-05-29 09:45:13.899300380 +0930
+++ ceph-16.2.4-fix_pytest/src/cephadm/tox.ini 2025-05-30 10:06:08.737333754 +0930
@@ -20,7 +20,7 @@
[testenv]
skip_install=true
......@@ -49,7 +49,7 @@ diff -uNr ceph-16.2.4/src/cephadm/tox.ini ceph-16.2.4-fix_pytest/src/cephadm/tox
flake8 --config=tox.ini {posargs:cephadm}
diff -uNr ceph-16.2.4/src/ceph-volume/plugin/zfs/tox.ini ceph-16.2.4-fix_pytest/src/ceph-volume/plugin/zfs/tox.ini
--- ceph-16.2.4/src/ceph-volume/plugin/zfs/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/ceph-volume/plugin/zfs/tox.ini 2025-05-29 09:45:14.241293409 +0930
+++ ceph-16.2.4-fix_pytest/src/ceph-volume/plugin/zfs/tox.ini 2025-05-30 10:06:08.740333693 +0930
@@ -10,7 +10,7 @@
[testenv:flake8]
......@@ -61,7 +61,7 @@ diff -uNr ceph-16.2.4/src/ceph-volume/plugin/zfs/tox.ini ceph-16.2.4-fix_pytest/
[testenv]
diff -uNr ceph-16.2.4/src/ceph-volume/tox.ini ceph-16.2.4-fix_pytest/src/ceph-volume/tox.ini
--- ceph-16.2.4/src/ceph-volume/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/ceph-volume/tox.ini 2025-05-29 09:45:14.241293409 +0930
+++ ceph-16.2.4-fix_pytest/src/ceph-volume/tox.ini 2025-05-30 10:06:08.740333693 +0930
@@ -4,13 +4,13 @@
[testenv]
......@@ -80,7 +80,7 @@ diff -uNr ceph-16.2.4/src/ceph-volume/tox.ini ceph-16.2.4-fix_pytest/src/ceph-vo
[tool:pytest]
diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/constraints.txt ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/constraints.txt
--- ceph-16.2.4/src/pybind/mgr/dashboard/constraints.txt 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/constraints.txt 2025-05-29 09:45:14.241293409 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/constraints.txt 2025-05-30 10:06:08.746333572 +0930
@@ -6,3 +6,4 @@
python3-saml==1.4.1
requests==2.20.0
......@@ -88,7 +88,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/constraints.txt ceph-16.2.4-fix_p
+lxml==5.3.0
diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-lint.txt
--- ceph-16.2.4/src/pybind/mgr/dashboard/requirements-lint.txt 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-lint.txt 2025-05-29 09:45:14.241293409 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-lint.txt 2025-05-30 10:06:08.747333552 +0930
@@ -8,4 +8,4 @@
autopep8
pyfakefs
......@@ -97,7 +97,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-16.2.4
+pytest >=2.1.3,<6
diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-test.txt ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-test.txt
--- ceph-16.2.4/src/pybind/mgr/dashboard/requirements-test.txt 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-test.txt 2025-05-29 09:45:14.241293409 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-test.txt 2025-05-30 10:06:08.747333552 +0930
@@ -1,4 +1,4 @@
-pytest
+pytest >=2.1.3,<6
......@@ -106,7 +106,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-test.txt ceph-16.2.4
pyfakefs
diff -uNr ceph-16.2.4/src/pybind/mgr/mgr_util.py ceph-16.2.4-fix_pytest/src/pybind/mgr/mgr_util.py
--- ceph-16.2.4/src/pybind/mgr/mgr_util.py 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/mgr_util.py 2025-05-29 09:45:14.243293368 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/mgr_util.py 2025-05-30 10:06:08.750333491 +0930
@@ -467,7 +467,7 @@
# type: (str) -> None
from OpenSSL import crypto
......@@ -127,7 +127,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/mgr_util.py ceph-16.2.4-fix_pytest/src/pybi
'Invalid certificate key: {}'.format(str(e))
diff -uNr ceph-16.2.4/src/pybind/mgr/requirements.txt ceph-16.2.4-fix_pytest/src/pybind/mgr/requirements.txt
--- ceph-16.2.4/src/pybind/mgr/requirements.txt 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/requirements.txt 2025-05-29 09:45:14.243293368 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/requirements.txt 2025-05-30 10:06:08.750333491 +0930
@@ -9,3 +9,4 @@
remoto
Jinja2
......@@ -135,7 +135,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/requirements.txt ceph-16.2.4-fix_pytest/src
+pytest<6
diff -uNr ceph-16.2.4/src/pybind/mgr/rook/rook-client-python/requirements.txt ceph-16.2.4-fix_pytest/src/pybind/mgr/rook/rook-client-python/requirements.txt
--- ceph-16.2.4/src/pybind/mgr/rook/rook-client-python/requirements.txt 2020-02-12 01:10:28.000000000 +1030
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/rook/rook-client-python/requirements.txt 2025-05-29 09:45:14.244293347 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/rook/rook-client-python/requirements.txt 2025-05-30 10:06:08.753333430 +0930
@@ -1,4 +1,4 @@
-pytest
+pytest >=2.1.3,<6
......@@ -144,13 +144,13 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/rook/rook-client-python/requirements.txt ce
markdown
diff -uNr ceph-16.2.4/src/pybind/mgr/snap_schedule/requirements.txt ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/requirements.txt
--- ceph-16.2.4/src/pybind/mgr/snap_schedule/requirements.txt 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/requirements.txt 2025-05-29 09:45:14.244293347 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/requirements.txt 2025-05-30 10:06:08.754333410 +0930
@@ -1 +1 @@
-pytest
+pytest >=2.1.3,<6
diff -uNr ceph-16.2.4/src/pybind/mgr/snap_schedule/tox.ini ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/tox.ini
--- ceph-16.2.4/src/pybind/mgr/snap_schedule/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/tox.ini 2025-05-29 09:45:14.246293307 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/tox.ini 2025-05-30 10:06:08.754333410 +0930
@@ -12,7 +12,7 @@
py3: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3:{toxinidir}
SNAP_SCHED_UNITTEST = true
......@@ -162,7 +162,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/snap_schedule/tox.ini ceph-16.2.4-fix_pytes
commands=
diff -uNr ceph-16.2.4/src/pybind/mgr/tox.ini ceph-16.2.4-fix_pytest/src/pybind/mgr/tox.ini
--- ceph-16.2.4/src/pybind/mgr/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/tox.ini 2025-05-29 09:45:14.246293307 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/tox.ini 2025-05-30 10:06:08.754333410 +0930
@@ -94,11 +94,6 @@
[testenv:flake8]
basepython = python3
......@@ -179,7 +179,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/tox.ini ceph-16.2.4-fix_pytest/src/pybind/m
+ flake8 --config=tox.ini cephadm/ orchestrator/ prometheus/
diff -uNr ceph-16.2.4/src/python-common/requirements.txt ceph-16.2.4-fix_pytest/src/python-common/requirements.txt
--- ceph-16.2.4/src/python-common/requirements.txt 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/python-common/requirements.txt 2025-05-29 10:30:40.736681431 +0930
+++ ceph-16.2.4-fix_pytest/src/python-common/requirements.txt 2025-05-30 10:07:15.271988049 +0930
@@ -2,6 +2,6 @@
mock; python_version < '3.3'
mypy==0.790; python_version >= '3'
......@@ -187,11 +187,10 @@ diff -uNr ceph-16.2.4/src/python-common/requirements.txt ceph-16.2.4-fix_pytest/
-pytest >= 2.1.3; python_version >= '3'
+pytest >=2.1.3,<6; python_version >= '3'
pyyaml
-typing-extensions; python_version < '3.8'
+typing-extensions <=4.12.2
typing-extensions; python_version < '3.8'
diff -uNr ceph-16.2.4/src/tools/cephfs/top/tox.ini ceph-16.2.4-fix_pytest/src/tools/cephfs/top/tox.ini
--- ceph-16.2.4/src/tools/cephfs/top/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/tools/cephfs/top/tox.ini 2025-05-29 09:45:14.247293286 +0930
+++ ceph-16.2.4-fix_pytest/src/tools/cephfs/top/tox.ini 2025-05-30 10:06:08.769333107 +0930
@@ -3,5 +3,5 @@
skipsdist = true
......@@ -201,7 +200,7 @@ diff -uNr ceph-16.2.4/src/tools/cephfs/top/tox.ini ceph-16.2.4-fix_pytest/src/to
commands = flake8 --ignore=W503 --max-line-length=100 cephfs-top
diff -uNr ceph-16.2.4/src/tools/cephfs/tox.ini ceph-16.2.4-fix_pytest/src/tools/cephfs/tox.ini
--- ceph-16.2.4/src/tools/cephfs/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/tools/cephfs/tox.ini 2025-05-29 09:45:14.247293286 +0930
+++ ceph-16.2.4-fix_pytest/src/tools/cephfs/tox.ini 2025-05-30 10:06:08.770333087 +0930
@@ -3,5 +3,5 @@
skipsdist = true
......@@ -211,7 +210,7 @@ diff -uNr ceph-16.2.4/src/tools/cephfs/tox.ini ceph-16.2.4-fix_pytest/src/tools/
commands = flake8 --ignore=W503 --max-line-length=100 cephfs-shell
diff -uNr ceph-16.2.4/src/tools/setup-virtualenv.sh ceph-16.2.4-fix_pytest/src/tools/setup-virtualenv.sh
--- ceph-16.2.4/src/tools/setup-virtualenv.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/tools/setup-virtualenv.sh 2025-05-29 09:45:14.247293286 +0930
+++ ceph-16.2.4-fix_pytest/src/tools/setup-virtualenv.sh 2025-05-30 10:10:02.501605710 +0930
@@ -68,7 +68,7 @@
# older versions of pip will not install wrap_console scripts
......@@ -226,7 +225,7 @@ diff -uNr ceph-16.2.4/src/tools/setup-virtualenv.sh ceph-16.2.4-fix_pytest/src/t
fi
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
+pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >= 2.9.1, <= 4.23.1'
+pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >= 2.9.1, <= 4.23.1' 'cachetools <= 5.5.0' 'pluggy <= 1.5.0' 'pyproject-api <= 1.8.0' 'typing-extensions <= 4.12.2'
require_files=$(ls *requirements*.txt 2>/dev/null) || true
constraint_files=$(ls *constraints*.txt 2>/dev/null) || true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment