Skip to content

GitLab

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

Limited typing-extensions to <= 4.12.2

parent e94acc80
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 18 deletions
ceph-16.2.4-fix_pytest.patch
View file @ a9386fc9
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-05-27 20:45:23.701790448 +0930 +++ ceph-16.2.4-fix_pytest/qa/tox.ini 2025-05-29 09:45:13.898300401 +0930
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
[testenv:flake8] [testenv:flake8]
basepython = python3 basepython = python3
...@@ -28,7 +28,7 @@ diff -uNr ceph-16.2.4/qa/tox.ini ceph-16.2.4-fix_pytest/qa/tox.ini ...@@ -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 \ 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-05-27 20:45:23.701790448 +0930 +++ ceph-16.2.4-fix_pytest/src/cephadm/tox.ini 2025-05-29 09:45:13.899300380 +0930
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
[testenv] [testenv]
skip_install=true 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 ...@@ -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} 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-05-27 20:45:23.701790448 +0930 +++ ceph-16.2.4-fix_pytest/src/ceph-volume/plugin/zfs/tox.ini 2025-05-29 09:45:14.241293409 +0930
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
[testenv:flake8] [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/ ...@@ -61,7 +61,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-05-27 20:45:23.702790427 +0930 +++ ceph-16.2.4-fix_pytest/src/ceph-volume/tox.ini 2025-05-29 09:45:14.241293409 +0930
@@ -4,13 +4,13 @@ @@ -4,13 +4,13 @@
[testenv] [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 ...@@ -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] [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 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-05-27 20:49:50.885366795 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/constraints.txt 2025-05-29 09:45:14.241293409 +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
...@@ -88,7 +88,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/constraints.txt ceph-16.2.4-fix_p ...@@ -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 +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-05-27 20:45:23.703790407 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-lint.txt 2025-05-29 09:45:14.241293409 +0930
@@ -8,4 +8,4 @@ @@ -8,4 +8,4 @@
autopep8 autopep8
pyfakefs pyfakefs
...@@ -97,7 +97,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-16.2.4 ...@@ -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 +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-05-27 20:45:23.704790387 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/dashboard/requirements-test.txt 2025-05-29 09:45:14.241293409 +0930
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-pytest -pytest
+pytest >=2.1.3,<6 +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 ...@@ -106,7 +106,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/dashboard/requirements-test.txt ceph-16.2.4
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 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-05-27 20:45:23.705790366 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/mgr_util.py 2025-05-29 09:45:14.243293368 +0930
@@ -467,7 +467,7 @@ @@ -467,7 +467,7 @@
# type: (str) -> None # type: (str) -> None
from OpenSSL import crypto 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 ...@@ -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)) '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-05-27 20:45:23.705790366 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/requirements.txt 2025-05-29 09:45:14.243293368 +0930
@@ -9,3 +9,4 @@ @@ -9,3 +9,4 @@
remoto remoto
Jinja2 Jinja2
...@@ -135,7 +135,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/requirements.txt ceph-16.2.4-fix_pytest/src ...@@ -135,7 +135,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/requirements.txt ceph-16.2.4-fix_pytest/src
+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-05-27 20:45:23.706790346 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/rook/rook-client-python/requirements.txt 2025-05-29 09:45:14.244293347 +0930
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-pytest -pytest
+pytest >=2.1.3,<6 +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 ...@@ -144,13 +144,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-05-27 20:45:23.706790346 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/requirements.txt 2025-05-29 09:45:14.244293347 +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-05-27 20:45:23.706790346 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/snap_schedule/tox.ini 2025-05-29 09:45:14.246293307 +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
...@@ -162,7 +162,7 @@ diff -uNr ceph-16.2.4/src/pybind/mgr/snap_schedule/tox.ini ceph-16.2.4-fix_pytes ...@@ -162,7 +162,7 @@ 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-05-27 20:45:23.706790346 +0930 +++ ceph-16.2.4-fix_pytest/src/pybind/mgr/tox.ini 2025-05-29 09:45:14.246293307 +0930
@@ -94,11 +94,6 @@ @@ -94,11 +94,6 @@
[testenv:flake8] [testenv:flake8]
basepython = python3 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 ...@@ -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/ + 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-05-27 20:45:23.707790326 +0930 +++ ceph-16.2.4-fix_pytest/src/python-common/requirements.txt 2025-05-29 10:30:40.736681431 +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'
...@@ -187,10 +187,11 @@ diff -uNr ceph-16.2.4/src/python-common/requirements.txt ceph-16.2.4-fix_pytest/ ...@@ -187,10 +187,11 @@ 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-05-27 20:45:23.707790326 +0930 +++ ceph-16.2.4-fix_pytest/src/tools/cephfs/top/tox.ini 2025-05-29 09:45:14.247293286 +0930
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
skipsdist = true skipsdist = true
...@@ -200,7 +201,7 @@ diff -uNr ceph-16.2.4/src/tools/cephfs/top/tox.ini ceph-16.2.4-fix_pytest/src/to ...@@ -200,7 +201,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-05-27 20:45:23.707790326 +0930 +++ ceph-16.2.4-fix_pytest/src/tools/cephfs/tox.ini 2025-05-29 09:45:14.247293286 +0930
@@ -3,5 +3,5 @@ @@ -3,5 +3,5 @@
skipsdist = true skipsdist = true
...@@ -210,7 +211,7 @@ diff -uNr ceph-16.2.4/src/tools/cephfs/tox.ini ceph-16.2.4-fix_pytest/src/tools/ ...@@ -210,7 +211,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-05-27 20:46:28.099484094 +0930 +++ ceph-16.2.4-fix_pytest/src/tools/setup-virtualenv.sh 2025-05-29 09:45:14.247293286 +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