Skip to content

GitLab

C
ceph
Commit 6f2d3b1c authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Limit pip to <25

parent 45458a4c
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 31 deletions
ceph-16.2.4-fix_pytest.patch
View file @ 6f2d3b1c
diff -uNr ceph-16.2.4/qa/tox.ini ceph-16.2.4-fix_pytest/qa/tox.ini 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 03:20:27.000000000 +1000 --- ceph-16.2.4/qa/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/qa/tox.ini 2024-09-24 13:59:41.362487944 +1000 +++ ceph-16.2.4-fix_pytest/qa/tox.ini 2025-05-15 16:39:37.706181271 +0930
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
[testenv:flake8] [testenv:flake8]
basepython = python3 basepython = python3
...@@ -11,8 +11,8 @@ diff -uNr ceph-16.2.4/qa/tox.ini ceph-16.2.4-fix_pytest/qa/tox.ini ...@@ -11,8 +11,8 @@ diff -uNr ceph-16.2.4/qa/tox.ini ceph-16.2.4-fix_pytest/qa/tox.ini
[testenv:mypy] [testenv:mypy]
diff -uNr ceph-16.2.4/src/cephadm/tox.ini ceph-16.2.4-fix_pytest/src/cephadm/tox.ini 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.364487903 +1000 +++ ceph-16.2.4-fix_pytest/src/cephadm/tox.ini 2025-05-15 16:39:37.708181232 +0930
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
[testenv] [testenv]
skip_install=true skip_install=true
...@@ -32,8 +32,8 @@ diff -uNr ceph-16.2.4/src/cephadm/tox.ini ceph-16.2.4-fix_pytest/src/cephadm/tox ...@@ -32,8 +32,8 @@ diff -uNr ceph-16.2.4/src/cephadm/tox.ini ceph-16.2.4-fix_pytest/src/cephadm/tox
commands = commands =
flake8 --config=tox.ini {posargs:cephadm} 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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.365487883 +1000 +++ ceph-16.2.4-fix_pytest/src/ceph-volume/plugin/zfs/tox.ini 2025-05-15 16:39:37.710181192 +0930
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
[testenv:flake8] [testenv:flake8]
...@@ -44,8 +44,8 @@ diff -uNr ceph-16.2.4/src/ceph-volume/plugin/zfs/tox.ini ceph-16.2.4-fix_pytest/ ...@@ -44,8 +44,8 @@ diff -uNr ceph-16.2.4/src/ceph-volume/plugin/zfs/tox.ini ceph-16.2.4-fix_pytest/
[testenv] [testenv]
diff -uNr ceph-16.2.4/src/ceph-volume/tox.ini ceph-16.2.4-fix_pytest/src/ceph-volume/tox.ini 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.365487883 +1000 +++ ceph-16.2.4-fix_pytest/src/ceph-volume/tox.ini 2025-05-15 16:39:37.712181152 +0930
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
[testenv] [testenv]
...@@ -63,8 +63,8 @@ diff -uNr ceph-16.2.4/src/ceph-volume/tox.ini ceph-16.2.4-fix_pytest/src/ceph-vo ...@@ -63,8 +63,8 @@ diff -uNr ceph-16.2.4/src/ceph-volume/tox.ini ceph-16.2.4-fix_pytest/src/ceph-vo
[tool:pytest] [tool:pytest]
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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.366487862 +1000 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-lint.txt 2025-05-15 16:39:37.713181132 +0930
@@ -8,4 +8,4 @@ @@ -8,4 +8,4 @@
autopep8 autopep8
pyfakefs pyfakefs
...@@ -72,8 +72,8 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-16.2.4 ...@@ -72,8 +72,8 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-16.2.4
-pytest -pytest
+pytest >=2.1.3,<6 +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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.366487862 +1000 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-test.txt 2025-05-15 16:39:37.714181112 +0930
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-pytest -pytest
+pytest >=2.1.3,<6 +pytest >=2.1.3,<6
...@@ -81,8 +81,8 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-test.txt ceph-16.2.4 ...@@ -81,8 +81,8 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-test.txt ceph-16.2.4
pytest-instafail pytest-instafail
pyfakefs 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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 14:00:12.341854849 +1000 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/mgr_util.py 2025-05-15 16:39:37.716181072 +0930
@@ -467,7 +467,7 @@ @@ -467,7 +467,7 @@
# type: (str) -> None # type: (str) -> None
from OpenSSL import crypto from OpenSSL import crypto
...@@ -102,16 +102,16 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/mgr_util.py ceph-16.2.4-fix_pytest/src/pybi ...@@ -102,16 +102,16 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/mgr_util.py ceph-16.2.4-fix_pytest/src/pybi
raise ServerConfigException( raise ServerConfigException(
'Invalid certificate key: {}'.format(str(e)) '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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:31:37.284033134 +1000 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/requirements.txt 2025-05-15 16:39:37.717181052 +0930
@@ -9,3 +9,4 @@ @@ -9,3 +9,4 @@
remoto remoto
Jinja2 Jinja2
pyfakefs pyfakefs
+pytest<6 +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 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:40:28.000000000 +1100 --- 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 2024-09-24 13:59:41.367487842 +1000 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/rook/rook-client-python/requirements.txt 2025-05-15 16:39:37.719181013 +0930
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-pytest -pytest
+pytest >=2.1.3,<6 +pytest >=2.1.3,<6
...@@ -119,14 +119,14 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/rook/rook-client-python/requirements.txt ce ...@@ -119,14 +119,14 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/rook/rook-client-python/requirements.txt ce
pyyaml pyyaml
markdown 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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.367487842 +1000 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/requirements.txt 2025-05-15 16:39:37.720180993 +0930
@@ -1 +1 @@ @@ -1 +1 @@
-pytest -pytest
+pytest >=2.1.3,<6 +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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.368487821 +1000 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/tox.ini 2025-05-15 16:39:37.720180993 +0930
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
py3: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3:{toxinidir} py3: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3:{toxinidir}
SNAP_SCHED_UNITTEST = true SNAP_SCHED_UNITTEST = true
...@@ -137,8 +137,8 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/snap_schedule/tox.ini ceph-16.2.4-fix_pytes ...@@ -137,8 +137,8 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/snap_schedule/tox.ini ceph-16.2.4-fix_pytes
py27: pathlib py27: pathlib
commands= commands=
diff -uNr ceph-16.2.4/src/pybind/mgr/tox.ini ceph-16.2.4-fix_pytest/src/pybind/mgr/tox.ini 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 03:20:27.000000000 +1000 --- 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 2024-09-24 14:22:16.007390285 +1000 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/tox.ini 2025-05-15 16:39:37.721180973 +0930
@@ -94,11 +94,6 @@ @@ -94,11 +94,6 @@
[testenv:flake8] [testenv:flake8]
basepython = python3 basepython = python3
...@@ -154,9 +154,9 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/tox.ini ceph-16.2.4-fix_pytest/src/pybind/m ...@@ -154,9 +154,9 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/tox.ini ceph-16.2.4-fix_pytest/src/pybind/m
- {posargs:{[testenv:flake8]modules}} - {posargs:{[testenv:flake8]modules}}
+ flake8 --config=tox.ini cephadm/ orchestrator/ prometheus/ + 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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.369487801 +1000 +++ ceph-16.2.4-fix_pytest/src/python-common/requirements.txt 2025-05-15 16:40:15.140436561 +0930
@@ -2,6 +2,6 @@ @@ -2,6 +2,7 @@
mock; python_version < '3.3' mock; python_version < '3.3'
mypy==0.790; python_version >= '3' mypy==0.790; python_version >= '3'
pytest-mypy; python_version >= '3' pytest-mypy; python_version >= '3'
...@@ -164,9 +164,10 @@ diff -uNr ceph-16.2.4/src/python-common/requirements.txt ceph-16.2.4-fix_pytest/ ...@@ -164,9 +164,10 @@ diff -uNr ceph-16.2.4/src/python-common/requirements.txt ceph-16.2.4-fix_pytest/
+pytest >=2.1.3,<6; python_version >= '3' +pytest >=2.1.3,<6; python_version >= '3'
pyyaml pyyaml
typing-extensions; python_version < '3.8' typing-extensions; python_version < '3.8'
+pip <25
diff -uNr ceph-16.2.4/src/tools/cephfs/top/tox.ini ceph-16.2.4-fix_pytest/src/tools/cephfs/top/tox.ini 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.369487801 +1000 +++ ceph-16.2.4-fix_pytest/src/tools/cephfs/top/tox.ini 2025-05-15 16:39:37.723180933 +0930
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
skipsdist = true skipsdist = true
...@@ -175,8 +176,8 @@ diff -uNr ceph-16.2.4/src/tools/cephfs/top/tox.ini ceph-16.2.4-fix_pytest/src/to ...@@ -175,8 +176,8 @@ diff -uNr ceph-16.2.4/src/tools/cephfs/top/tox.ini ceph-16.2.4-fix_pytest/src/to
+deps = flake8==3.9.0 +deps = flake8==3.9.0
commands = flake8 --ignore=W503 --max-line-length=100 cephfs-top 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 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 03:20:27.000000000 +1000 --- 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 2024-09-24 13:59:41.370487781 +1000 +++ ceph-16.2.4-fix_pytest/src/tools/cephfs/tox.ini 2025-05-15 16:39:37.723180933 +0930
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
skipsdist = true skipsdist = 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