Skip to content

GitLab

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

Fixed pytest patch

parent 7e399d66
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 108 deletions
ceph-16.2.4-fix_pytest.patch
View file @ 9a21c1d7
...@@ -200,114 +200,6 @@ diff -uNr ceph-16.2.4/src/python-common/requirements.txt ceph-16.2.4-fix_pytest/ ...@@ -200,114 +200,6 @@ 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'
diff -uNr ceph-16.2.4/src/test/centos-8/install-deps.sh ceph-16.2.4-fix_pytest/src/test/centos-8/install-deps.sh
--- ceph-16.2.4/src/test/centos-8/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/centos-8/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr ceph-16.2.4/src/test/debian-jessie/install-deps.sh ceph-16.2.4-fix_pytest/src/test/debian-jessie/install-deps.sh
--- ceph-16.2.4/src/test/debian-jessie/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/debian-jessie/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr ceph-16.2.4/src/test/fedora-31/install-deps.sh ceph-16.2.4-fix_pytest/src/test/fedora-31/install-deps.sh
--- ceph-16.2.4/src/test/fedora-31/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/fedora-31/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr ceph-16.2.4/src/test/fedora-32/install-deps.sh ceph-16.2.4-fix_pytest/src/test/fedora-32/install-deps.sh
--- ceph-16.2.4/src/test/fedora-32/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/fedora-32/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr ceph-16.2.4/src/test/fedora-33/install-deps.sh ceph-16.2.4-fix_pytest/src/test/fedora-33/install-deps.sh
--- ceph-16.2.4/src/test/fedora-33/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/fedora-33/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr ceph-16.2.4/src/test/opensuse-13.2/install-deps.sh ceph-16.2.4-fix_pytest/src/test/opensuse-13.2/install-deps.sh
--- ceph-16.2.4/src/test/opensuse-13.2/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/opensuse-13.2/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr ceph-16.2.4/src/test/ubuntu-16.04/install-deps.sh ceph-16.2.4-fix_pytest/src/test/ubuntu-16.04/install-deps.sh
--- ceph-16.2.4/src/test/ubuntu-16.04/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/ubuntu-16.04/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr ceph-16.2.4/src/test/ubuntu-18.04/install-deps.sh ceph-16.2.4-fix_pytest/src/test/ubuntu-18.04/install-deps.sh
--- ceph-16.2.4/src/test/ubuntu-18.04/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/ubuntu-18.04/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr ceph-16.2.4/src/test/ubuntu-20.04/install-deps.sh ceph-16.2.4-fix_pytest/src/test/ubuntu-20.04/install-deps.sh
--- ceph-16.2.4/src/test/ubuntu-20.04/install-deps.sh 2021-05-14 02:50:27.000000000 +0930
+++ ceph-16.2.4-fix_pytest/src/test/ubuntu-20.04/install-deps.sh 2025-05-26 15:55:51.425564353 +0930
@@ -395,7 +395,7 @@
# of pip matters when it comes to using wheel packages
PIP_OPTS="--timeout 300 --exists-action i"
pip $PIP_OPTS $install \
- 'setuptools >= 0.8' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1' || return 1
+ 'setuptools >= 0.8, <= 75.2.0' 'pip >= 7.0, <= 24.2' 'wheel >= 0.24, <= 0.44.0' 'tox >= 2.9.1, <= 4.23.1' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
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-26 15:49:25.844333403 +0930 +++ ceph-16.2.4-fix_pytest/src/tools/cephfs/top/tox.ini 2025-05-26 15:49:25.844333403 +0930
......
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