Commit ab6753e8 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Removed 2020-resolver deprecated feature from pip

parent d77baab8
...@@ -39,6 +39,7 @@ all: ceph-config ceph-sudoer ...@@ -39,6 +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
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
--- 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
@@ -66,16 +66,9 @@
DISABLE_PIP_VERSION_CHECK=
fi
-if pip --help | grep -q use-feature; then
- USE_FEATURE=--use-feature=2020-resolver
-else
- USE_FEATURE=
-fi
-
# older versions of pip will not install wrap_console scripts
# when using wheel packages
pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
- $USE_FEATURE \
--upgrade 'pip >= 6.1'
if pip --help | grep -q disable-pip-version-check; then
@@ -89,7 +82,6 @@
fi
pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
- $USE_FEATURE \
$NO_INDEX \
--find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
@@ -103,7 +95,6 @@
NO_INDEX=''
fi
pip --exists-action i $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
- $USE_FEATURE \
$NO_INDEX \
--find-links=file://$(pwd)/wheelhouse $require $constraint
fi
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