Merge upstream changes (0566338)

.travis.yml

@@ -23,8 +23,7 @@ matrix:
     - env: PLATFORM="x86_64"
 
 script:
-  - bash ./docker/build_scripts/prefetch.sh openssl curl
-  - travis_wait 40 docker build --rm -t quay.io/pypa/manylinux2010_$PLATFORM:$TRAVIS_COMMIT -f docker/Dockerfile-$PLATFORM docker/
+  - PLATFORM=$(uname -m) TRAVIS_COMMIT=$TRAVIS_COMMIT travis_wait 40 ./build.sh
 
 
 deploy:

docker/build_scripts/build_utils.sh

@@ -45,10 +45,7 @@ function do_cpython_build {
     if [ -e ${prefix}/bin/python3 ]; then
         ln -s python3 ${prefix}/bin/python
     fi
-    # --force-reinstall is to work around:
-    #   https://github.com/pypa/pip/issues/5220
-    #   https://github.com/pypa/get-pip/issues/19
-    ${prefix}/bin/python get-pip.py --force-reinstall
+    ${prefix}/bin/python get-pip.py
     if [ -e ${prefix}/bin/pip3 ] && [ ! -e ${prefix}/bin/pip ]; then
         ln -s pip3 ${prefix}/bin/pip
     fi

docker/build_scripts/requirements.txt

@@ -3,9 +3,9 @@
 pip==10.0.1 \
     --hash=sha256:717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7 \
     --hash=sha256:f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68
-wheel==0.30.0 \
-    --hash=sha256:e721e53864f084f956f40f96124a74da0631ac13fbbd1ba99e8e2b5e9cafdf64 \
-    --hash=sha256:9515fe0a94e823fd90b08d22de45d7bde57c90edce705b22f5e1ecf7e1b653c8
+wheel==0.31.0 \
+    --hash=sha256:9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107 \
+    --hash=sha256:1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce
 setuptools==39.1.0 \
     --hash=sha256:0cb8b8625bfdcc2d43ea4b9cdba0b39b2b7befc04f3088897031082aa16ce186 \
     --hash=sha256:c5484e13b89927b44fd15897f7ce19dded8e7f035466a4fa7b946c0bdd86edd7