Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
ceph
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
ceph
Commits
ab6753e8
Commit
ab6753e8
authored
Oct 22, 2022
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed 2020-resolver deprecated feature from pip
parent
d77baab8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
0 deletions
+37
-0
Makefile
Makefile
+1
-0
ceph-15.2.15-no_use_feature.patch
ceph-15.2.15-no_use_feature.patch
+36
-0
No files found.
Makefile
View file @
ab6753e8
...
@@ -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
;
\
...
...
ceph-15.2.15-no_use_feature.patch
0 → 100644
View file @
ab6753e8
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment