Skip to content

Commit

Permalink
Merge pull request pypa#188 from trishankatdatadog/trishankatdatadog/…
Browse files Browse the repository at this point in the history
…wheel-0.30.0-to-0.31.0

Update wheel from 0.30.0 to 0.31.0
  • Loading branch information
njsmith authored May 2, 2018
2 parents 4132165 + e0ed7e5 commit 0566338
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 22 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ matrix:
- env: PLATFORM="x86_64"

script:
- bash ./docker/build_scripts/prefetch.sh openssl curl
- docker build --rm -t quay.io/pypa/manylinux1_$PLATFORM:$TRAVIS_COMMIT -f docker/Dockerfile-$PLATFORM docker/
- PLATFORM=$(uname -m) TRAVIS_COMMIT=$TRAVIS_COMMIT ./build.sh


deploy:
Expand Down
5 changes: 5 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

docker/build_scripts/prefetch.sh openssl curl
docker build --rm -t quay.io/pypa/manylinux1_$PLATFORM:$TRAVIS_COMMIT -f docker/Dockerfile-$PLATFORM docker/
docker system prune -f
16 changes: 0 additions & 16 deletions docker/README.rst

This file was deleted.

2 changes: 1 addition & 1 deletion docker/build_scripts/build_env.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# source me

PYTHON_DOWNLOAD_URL=https://www.python.org/ftp/python
CPYTHON_VERSIONS="2.7.14 3.3.7 3.4.7 3.5.4 3.6.4"
CPYTHON_VERSIONS="2.7.14 3.4.8 3.5.5 3.6.5"

# openssl version to build, with expected sha256 hash of .tar.gz
# archive.
Expand Down
6 changes: 3 additions & 3 deletions docker/build_scripts/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 0566338

Please sign in to comment.