diff options
| author | Ian Wienand <iwienand@redhat.com> | 2018-04-30 11:29:58 +1000 |
|---|---|---|
| committer | Ian Wienand <iwienand@redhat.com> | 2018-04-30 11:29:58 +1000 |
| commit | 0da792af3c320b287297787edb7ec67795606b12 (patch) | |
| tree | 7d82d2644c6df2358acfa721fb6dfe65e044a0d4 | |
| parent | 7767c44ab1289ed7d1cc4f9e12986bef07865d5c (diff) | |
| download | pbr-0da792af3c320b287297787edb7ec67795606b12.tar.gz | |
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
| -rw-r--r-- | tools/integration.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/integration.sh b/tools/integration.sh index a7111be..2a7e772 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -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 |