Skip to content

GitLab

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

Fixed cherrypy_backports.py and pinned pytest-cov to 5.0.0

parent da4f13ff
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 29 deletions
ceph-16.2.4-fix_pytest.patch
View file @ c6451f40
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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.147203227 +0930 +++ ceph-16.2.4-fix_pytest/qa/tox.ini 2025-07-06 12:04:56.993732305 +0930
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
[testenv:flake8] [testenv:flake8]
basepython = python3 basepython = python3
...@@ -37,7 +37,7 @@ diff -uNr ceph-16.2.4/qa/tox.ini ceph-16.2.4-fix_pytest/qa/tox.ini ...@@ -37,7 +37,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 \ 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 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/src/cephadm/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/cephadm/tox.ini 2025-07-05 13:12:29.147203227 +0930 +++ ceph-16.2.4-fix_pytest/src/cephadm/tox.ini 2025-07-06 12:04:56.994732285 +0930
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
[testenv] [testenv]
skip_install=true skip_install=true
...@@ -58,7 +58,7 @@ diff -uNr ceph-16.2.4/src/cephadm/tox.ini ceph-16.2.4-fix_pytest/src/cephadm/tox ...@@ -58,7 +58,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} 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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.148203206 +0930 +++ ceph-16.2.4-fix_pytest/src/ceph-volume/plugin/zfs/tox.ini 2025-07-06 12:04:56.995732264 +0930
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
[testenv:flake8] [testenv:flake8]
...@@ -70,7 +70,7 @@ diff -uNr ceph-16.2.4/src/ceph-volume/plugin/zfs/tox.ini ceph-16.2.4-fix_pytest/ ...@@ -70,7 +70,7 @@ 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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.149203186 +0930 +++ ceph-16.2.4-fix_pytest/src/ceph-volume/tox.ini 2025-07-06 12:04:56.996732244 +0930
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
[testenv] [testenv]
...@@ -87,9 +87,30 @@ diff -uNr ceph-16.2.4/src/ceph-volume/tox.ini ceph-16.2.4-fix_pytest/src/ceph-vo ...@@ -87,9 +87,30 @@ diff -uNr ceph-16.2.4/src/ceph-volume/tox.ini ceph-16.2.4-fix_pytest/src/ceph-vo
commands=flake8 {posargs:ceph_volume} commands=flake8 {posargs:ceph_volume}
[tool:pytest] [tool:pytest]
diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/cherrypy_backports.py ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/cherrypy_backports.py
--- ceph-16.2.4/src/pybind/mgr/dashboard/cherrypy_backports.py 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/cherrypy_backports.py 2025-07-06 15:17:43.647031763 +0930
@@ -69,13 +69,12 @@
servers.wait_for_occupied_port = lambda host, port: None
+from cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl
+
+
# cherrypy.wsgiserver was extracted wsgiserver into cheroot in cherrypy v9.0.0
def patch_builtin_ssl_wrap(v, new_wrap):
- if v < StrictVersion("9.0.0"):
- from cherrypy.wsgiserver.ssl_builtin import BuiltinSSLAdapter as builtin_ssl
- else:
- from cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl
- builtin_ssl.wrap = new_wrap(builtin_ssl.wrap)
+ builtin_ssl.wrap = new_wrap(builtin_ssl.wrap) # type: ignore
def accept_exceptions_from_builtin_ssl(v):
diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/constraints.txt ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/constraints.txt 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/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-07-05 13:12:29.149203186 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/constraints.txt 2025-07-06 12:04:56.996732244 +0930
@@ -6,3 +6,4 @@ @@ -6,3 +6,4 @@
python3-saml==1.4.1 python3-saml==1.4.1
requests==2.20.0 requests==2.20.0
...@@ -97,7 +118,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/constraints.txt ceph-16.2.4-fix_p ...@@ -97,7 +118,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/constraints.txt ceph-16.2.4-fix_p
+lxml==5.3.0 +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 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/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-07-05 13:12:29.150203165 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-lint.txt 2025-07-06 12:04:56.997732223 +0930
@@ -8,4 +8,4 @@ @@ -8,4 +8,4 @@
autopep8 autopep8
pyfakefs pyfakefs
...@@ -106,16 +127,17 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-16.2.4 ...@@ -106,16 +127,17 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-16.2.4
+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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.150203165 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-test.txt 2025-07-06 15:00:25.033772035 +0930
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-pytest -pytest
-pytest-cov
+pytest >=2.1.3,<6 +pytest >=2.1.3,<6
pytest-cov +pytest-cov==5.0.0
pytest-instafail pytest-instafail
pyfakefs pyfakefs
diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/tox.ini ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/tox.ini diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/tox.ini ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/tox.ini
--- ceph-16.2.4/src/pybind/mgr/dashboard/tox.ini 2021-05-14 02:50:27.000000000 +0930 --- ceph-16.2.4/src/pybind/mgr/dashboard/tox.ini 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/tox.ini 2025-07-05 13:12:29.151203144 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/tox.ini 2025-07-06 12:04:56.998732203 +0930
@@ -104,6 +104,9 @@ @@ -104,6 +104,9 @@
deps = deps =
{[base]deps} {[base]deps}
...@@ -128,7 +150,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/tox.ini ceph-16.2.4-fix_pytest/sr ...@@ -128,7 +150,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/tox.ini ceph-16.2.4-fix_pytest/sr
flake8 --config=tox.ini ../../../../qa/tasks/mgr/dashboard flake8 --config=tox.ini ../../../../qa/tasks/mgr/dashboard
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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.152203123 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/mgr_util.py 2025-07-06 12:04:56.999732183 +0930
@@ -467,7 +467,7 @@ @@ -467,7 +467,7 @@
# type: (str) -> None # type: (str) -> None
from OpenSSL import crypto from OpenSSL import crypto
...@@ -149,21 +171,15 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/mgr_util.py ceph-16.2.4-fix_pytest/src/pybi ...@@ -149,21 +171,15 @@ 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)) '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 02:50:27.000000000 +0930 --- 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-07-05 13:13:00.353556099 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/requirements.txt 2025-07-06 12:05:26.405131417 +0930
@@ -1,4 +1,5 @@ @@ -9,3 +9,4 @@
pytest-cov==2.7.1
+coverage==7.6.4
-e../../python-common
kubernetes
requests-mock
@@ -9,3 +10,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:10:28.000000000 +1030 --- 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-07-05 13:12:29.154203082 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/rook/rook-client-python/requirements.txt 2025-07-06 12:04:57.112729874 +0930
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-pytest -pytest
+pytest >=2.1.3,<6 +pytest >=2.1.3,<6
...@@ -172,13 +188,13 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/rook/rook-client-python/requirements.txt ce ...@@ -172,13 +188,13 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/rook/rook-client-python/requirements.txt ce
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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.154203082 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/requirements.txt 2025-07-06 12:04:57.113729854 +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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.155203061 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/tox.ini 2025-07-06 12:04:57.114729833 +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
...@@ -190,8 +206,16 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/snap_schedule/tox.ini ceph-16.2.4-fix_pytes ...@@ -190,8 +206,16 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/snap_schedule/tox.ini ceph-16.2.4-fix_pytes
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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.156203040 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/tox.ini 2025-07-06 12:08:15.732671989 +0930
@@ -94,11 +94,6 @@ @@ -59,6 +59,7 @@
cython
-rrequirements.txt
mypy==0.790
+ typing_extensions==4.12.2
commands =
mypy --config-file=../../mypy.ini \
-m cephadm \
@@ -94,11 +95,6 @@
[testenv:flake8] [testenv:flake8]
basepython = python3 basepython = python3
deps = deps =
...@@ -207,7 +231,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/tox.ini ceph-16.2.4-fix_pytest/src/pybind/m ...@@ -207,7 +231,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/ + 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 02:50:27.000000000 +0930 --- 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-07-05 15:21:12.488949304 +0930 +++ ceph-16.2.4-fix_pytest/src/python-common/requirements.txt 2025-07-06 12:07:10.804998485 +0930
@@ -2,6 +2,6 @@ @@ -2,6 +2,6 @@
mock; python_version < '3.3' mock; python_version < '3.3'
mypy==0.790; python_version >= '3' mypy==0.790; python_version >= '3'
...@@ -215,11 +239,10 @@ diff -uNr ceph-16.2.4/src/python-common/requirements.txt ceph-16.2.4-fix_pytest/ ...@@ -215,11 +239,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; python_version >= '3'
+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'
+typing-extensions==4.12.2
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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.158202999 +0930 +++ ceph-16.2.4-fix_pytest/src/tools/cephfs/top/tox.ini 2025-07-06 12:04:57.118729751 +0930
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
skipsdist = true skipsdist = true
...@@ -229,7 +252,7 @@ diff -uNr ceph-16.2.4/src/tools/cephfs/top/tox.ini ceph-16.2.4-fix_pytest/src/to ...@@ -229,7 +252,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 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 02:50:27.000000000 +0930 --- 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-07-05 13:12:29.158202999 +0930 +++ ceph-16.2.4-fix_pytest/src/tools/cephfs/tox.ini 2025-07-06 12:04:57.120729711 +0930
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
skipsdist = true skipsdist = true
...@@ -239,7 +262,7 @@ diff -uNr ceph-16.2.4/src/tools/cephfs/tox.ini ceph-16.2.4-fix_pytest/src/tools/ ...@@ -239,7 +262,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 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 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/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-07-05 13:12:29.159202978 +0930 +++ ceph-16.2.4-fix_pytest/src/tools/setup-virtualenv.sh 2025-07-06 12:04:58.666698126 +0930
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
# older versions of pip will not install wrap_console scripts # older versions of pip will not install wrap_console scripts
......
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