Commit 941b2d1c authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed pip to be less than 23.0

parent 452dc412
...@@ -39,7 +39,7 @@ all: ceph-config ceph-sudoer ...@@ -39,7 +39,7 @@ all: ceph-config ceph-sudoer
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_librbd_duplicate.patch patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_librbd_duplicate.patch
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_ErasureCodeShec.patch patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_ErasureCodeShec.patch
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_mypy.patch patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_mypy.patch
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-no_use_feature.patch patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_pip.patch
if [ `uname -m` = 'armv7l' ] ; then \ if [ `uname -m` = 'armv7l' ] ; then \
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-arm32_fix.patch ; \ patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-arm32_fix.patch ; \
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-arm32_fix_tests.patch ; \ patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-arm32_fix_tests.patch ; \
......
diff -uNr ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-no_use_feature/src/tools/setup-virtualenv.sh diff -uNr ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-fix_pip/src/tools/setup-virtualenv.sh
--- ceph-15.2.15/src/tools/setup-virtualenv.sh 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/tools/setup-virtualenv.sh 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-no_use_feature/src/tools/setup-virtualenv.sh 2022-10-22 14:37:25.298526207 +1030 +++ ceph-15.2.15-fix_pip/src/tools/setup-virtualenv.sh 2023-02-06 01:11:48.050823469 +1030
@@ -66,16 +66,9 @@ @@ -66,17 +66,10 @@
DISABLE_PIP_VERSION_CHECK= DISABLE_PIP_VERSION_CHECK=
fi fi
...@@ -15,16 +15,18 @@ diff -uNr ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-no_use_feature ...@@ -15,16 +15,18 @@ diff -uNr ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-no_use_feature
# when using wheel packages # when using wheel packages
pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \ pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
- $USE_FEATURE \ - $USE_FEATURE \
--upgrade 'pip >= 6.1' - --upgrade 'pip >= 6.1'
+ --upgrade 'pip >=6.1,<23.0'
if pip --help | grep -q disable-pip-version-check; then if pip --help | grep -q disable-pip-version-check; then
DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
@@ -89,7 +82,6 @@ @@ -89,7 +82,6 @@
fi fi
pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \ pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
- $USE_FEATURE \ - $USE_FEATURE \
$NO_INDEX \ $NO_INDEX \
--find-links=file://$(pwd)/wheelhouse 'tox>=2.9.1,<=4.4.2' --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
@@ -103,7 +95,6 @@ @@ -103,7 +95,6 @@
NO_INDEX='' NO_INDEX=''
......
diff -uNr --no-dereference ceph-15.2.15/install-deps.sh ceph-15.2.15-fix_tests/install-deps.sh
--- ceph-15.2.15/install-deps.sh 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/install-deps.sh 2023-02-03 23:18:14.091353261 +1030
@@ -432,7 +432,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' 'pip >= 7.0' 'wheel >= 0.24' 'tox >= 2.9.1, <= 4.4.2' || return 1
if test $# != 0 ; then
pip $PIP_OPTS $install $@ || return 1
fi
diff -uNr --no-dereference ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t diff -uNr --no-dereference ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t
--- ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2023-02-03 23:15:37.499879540 +1030 +++ ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2023-02-03 23:15:37.499879540 +1030
...@@ -178,15 +166,3 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/test_ipaddr.cc ceph-15.2.15-fix ...@@ -178,15 +166,3 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/test_ipaddr.cc ceph-15.2.15-fix
ipv6(&a_one, "::1"); ipv6(&a_one, "::1");
one.ifa_addr = (struct sockaddr*)&a_one; one.ifa_addr = (struct sockaddr*)&a_one;
one.ifa_name = lo; one.ifa_name = lo;
diff -uNr --no-dereference ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-fix_tests/src/tools/setup-virtualenv.sh
--- ceph-15.2.15/src/tools/setup-virtualenv.sh 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-fix_tests/src/tools/setup-virtualenv.sh 2023-02-03 23:18:46.781452157 +1030
@@ -91,7 +91,7 @@
pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
$USE_FEATURE \
$NO_INDEX \
- --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
+ --find-links=file://$(pwd)/wheelhouse 'tox>=2.9.1,<=4.4.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