Skip to content

Commit

Permalink
Merge pull request ceph#1566 from toabctl/fix-pip-new-resolver
Browse files Browse the repository at this point in the history
bootstrap: Do not use --use-feature=2020-resolver for pip upgrade

Reviewed-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov authored Oct 5, 2020
2 parents 75888fc + 87a68d8 commit 45e6b8a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,14 @@ if [ -z "$NO_CLOBBER" ] || [ ! -e ./$VENV ]; then
fi


# Upgrade pip first
./$VENV/bin/pip install --use-feature=2020-resolver --upgrade pip
# be compatible with pip shipped by distro older v20.2
if $vdir/bin/pip --use-feature=2020-resolver >/dev/null 2>&1 ; then
PIP_INSTALL="./$VENV/bin/pip install --use-feature=2020-resolver"
else
PIP_INSTALL="./$VENV/bin/pip install"
fi
# Upgrade pip first - then we have a new pip version with the --use-feature flag
$PIP_INSTALL --upgrade pip

# Ensure setuptools is installed
./$VENV/bin/pip install --use-feature=2020-resolver setuptools --upgrade
Expand Down

0 comments on commit 45e6b8a

Please sign in to comment.