From 6ca2758f31fb1a4afeb4eb5aca3cd8d6af402169 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Tue, 1 Dec 2015 17:13:20 -0500 Subject: [PATCH] 7839: Stop backporting requests for Python 2. This is no longer needed now that our Keep client is built on top of pycurl. Confirmed by building all our Python packages from source into a fresh virtualenv. requests does not appear in `pip freeze`. requests is still needed for Python 3 because docker-py uses it. Closes #7839. --- jenkins/run-build-packages.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh index 59aa65c05d..84ada48bc6 100755 --- a/jenkins/run-build-packages.sh +++ b/jenkins/run-build-packages.sh @@ -95,8 +95,7 @@ case "$TARGET" in PYTHON3_PKG_PREFIX=python3 PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \ oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \ - rsa uritemplate httplib2 ws4py \ - pykka requests six pyexecjs jsonschema \ + rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \ ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse) PYTHON3_BACKPORTS=(docker-py six requests websocket-client) ;; @@ -108,8 +107,7 @@ case "$TARGET" in PYTHON3_PKG_PREFIX=python3 PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \ oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \ - rsa uritemplate httplib2 ws4py \ - pykka requests six pyexecjs jsonschema \ + rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \ ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse) PYTHON3_BACKPORTS=(docker-py six requests websocket-client) ;; @@ -121,8 +119,7 @@ case "$TARGET" in PYTHON3_PKG_PREFIX=python3 PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \ oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \ - rsa uritemplate httplib2 ws4py \ - pykka requests six pyexecjs jsonschema \ + rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \ ciso8601 pycrypto backports.ssl_match_hostname pycurl llfuse) PYTHON3_BACKPORTS=(docker-py six requests websocket-client) ;; @@ -145,8 +142,7 @@ case "$TARGET" in PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \ oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \ - rsa uritemplate httplib2 ws4py \ - pykka requests six pyexecjs jsonschema \ + rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \ ciso8601 pycrypto backports.ssl_match_hostname pycurl python-daemon lockfile llfuse 'pbr<1.0') PYTHON3_BACKPORTS=(docker-py six requests websocket-client) -- 2.30.2