Skip to content

Commit 0566338

Browse files
authored
Merge pull request pypa#188 from trishankatdatadog/trishankatdatadog/wheel-0.30.0-to-0.31.0
Update wheel from 0.30.0 to 0.31.0
2 parents 4132165 + e0ed7e5 commit 0566338

File tree

5 files changed

+10
-22
lines changed

5 files changed

+10
-22
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ matrix:
2323
- env: PLATFORM="x86_64"
2424

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

2928

3029
deploy:

build.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
docker/build_scripts/prefetch.sh openssl curl
4+
docker build --rm -t quay.io/pypa/manylinux1_$PLATFORM:$TRAVIS_COMMIT -f docker/Dockerfile-$PLATFORM docker/
5+
docker system prune -f

docker/README.rst

-16
This file was deleted.

docker/build_scripts/build_env.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# source me
22

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

66
# openssl version to build, with expected sha256 hash of .tar.gz
77
# archive.

docker/build_scripts/requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
pip==10.0.1 \
44
--hash=sha256:717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7 \
55
--hash=sha256:f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68
6-
wheel==0.30.0 \
7-
--hash=sha256:e721e53864f084f956f40f96124a74da0631ac13fbbd1ba99e8e2b5e9cafdf64 \
8-
--hash=sha256:9515fe0a94e823fd90b08d22de45d7bde57c90edce705b22f5e1ecf7e1b653c8
6+
wheel==0.31.0 \
7+
--hash=sha256:9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107 \
8+
--hash=sha256:1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce
99
setuptools==39.1.0 \
1010
--hash=sha256:0cb8b8625bfdcc2d43ea4b9cdba0b39b2b7befc04f3088897031082aa16ce186 \
1111
--hash=sha256:c5484e13b89927b44fd15897f7ce19dded8e7f035466a4fa7b946c0bdd86edd7

0 commit comments

Comments
 (0)