From 235d192a4e2bc7f635d2f58fdd4d77fc5c27e26d Mon Sep 17 00:00:00 2001 From: bwoodsend Date: Wed, 24 Feb 2021 10:58:41 +0000 Subject: [PATCH] Remove explicit handling of manylinux platform tag The manylinux docker images now have an $AUDITWHEEL_PLAT environment variable baked into them which auditwheel detects automatically. Therefore we no longer need to remind each image which image they are. --- .github/workflows/deploy-wheels.yml | 4 ++-- scripts/Dockerfile_aarch64 | 1 - scripts/build-manylinux-wheels.sh | 7 ++----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-wheels.yml b/.github/workflows/deploy-wheels.yml index 87254416..bd987b09 100644 --- a/.github/workflows/deploy-wheels.yml +++ b/.github/workflows/deploy-wheels.yml @@ -70,8 +70,8 @@ jobs: - name: Build x86 Linux wheels if: matrix.wheel == 'x86' run: | - docker run -e PLAT=manylinux1_x86_64 -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh - docker run -e PLAT=manylinux1_i686 -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/scripts/build-manylinux-wheels.sh + docker run -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh + docker run -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/scripts/build-manylinux-wheels.sh - name: Upload as build artifacts uses: actions/upload-artifact@v2 diff --git a/scripts/Dockerfile_aarch64 b/scripts/Dockerfile_aarch64 index f0aa8528..afb65645 100644 --- a/scripts/Dockerfile_aarch64 +++ b/scripts/Dockerfile_aarch64 @@ -1,6 +1,5 @@ FROM quay.io/pypa/manylinux2014_aarch64 as build -ENV PLAT=manylinux2014_aarch64 RUN mkdir -p /io/ COPY . /io/ WORKDIR /io/ diff --git a/scripts/build-manylinux-wheels.sh b/scripts/build-manylinux-wheels.sh index 4b2aaf33..637d4be2 100755 --- a/scripts/build-manylinux-wheels.sh +++ b/scripts/build-manylinux-wheels.sh @@ -4,10 +4,7 @@ set -e -x # This is to be run by Docker inside a Docker image. # You can test it locally on a Linux machine by installing Docker and running from this # repo's root: -# $ docker run -e PLAT=manylinux1_x86_64 -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh - -# The -e just defines an environment variable PLAT=[docker name] inside the Docker: -# auditwheel can't detect the Docker name automatically. +# $ docker run -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh # The -v gives a directory alias for passing files in and out of the Docker. # (/io is arbitrary). E.g the setup.py script can be accessed in the Docker via @@ -39,5 +36,5 @@ done mkdir -p /io/dist/ for whl in /io/temp-wheels/*.whl; do - auditwheel repair "$whl" --plat $PLAT -w /io/dist/ + auditwheel repair "$whl" -w /io/dist/ done