openstack
/
pbr
Code Issues Proposed changes

Don't poke in pip for requests 

Pip10 has removed the ability to poke inside it for things like
requests.  Explicitly add it to the venv.

Change-Id: Ie12168091dc4c737f3913720c1743bea666b5d9c
This commit is contained in:
Ian Wienand 2018-04-30 11:29:58 +10:00
parent 7767c44ab1
commit 0da792af3c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/integration.sh
View File

@ -14,7 +14,7 @@ function mkvenv {
rm -rf $venv
virtualenv $venv
$venv/bin/pip install $PIPFLAGS -U $PIPVERSION wheel
$venv/bin/pip install $PIPFLAGS -U $PIPVERSION wheel requests
# If a change to PBR is being tested, preinstall the wheel for it
if [ -n "$PBR_CHANGE" ] ; then
@ -106,11 +106,7 @@ EOF
cat <<EOF > setup.py
import setuptools
try:
from requests import Timeout
except ImportError:
from pip._vendor.requests import Timeout
from requests import Timeout
from socket import error as SocketError
# Some environments have network issues that drop connections to pypi