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:
parent
7767c44ab1
commit
0da792af3c
|
@ -14,7 +14,7 @@ function mkvenv {
|
||||||
|
|
||||||
rm -rf $venv
|
rm -rf $venv
|
||||||
virtualenv $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 a change to PBR is being tested, preinstall the wheel for it
|
||||||
if [ -n "$PBR_CHANGE" ] ; then
|
if [ -n "$PBR_CHANGE" ] ; then
|
||||||
|
@ -106,11 +106,7 @@ EOF
|
||||||
cat <<EOF > setup.py
|
cat <<EOF > setup.py
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
try:
|
from requests import Timeout
|
||||||
from requests import Timeout
|
|
||||||
except ImportError:
|
|
||||||
from pip._vendor.requests import Timeout
|
|
||||||
|
|
||||||
from socket import error as SocketError
|
from socket import error as SocketError
|
||||||
|
|
||||||
# Some environments have network issues that drop connections to pypi
|
# Some environments have network issues that drop connections to pypi
|
||||||
|
|
Loading…
Reference in New Issue