Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove explicit handling of manylinux platform tag #452

Merged
merged 1 commit into from Feb 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy-wheels.yml
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion 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/
Expand Down
7 changes: 2 additions & 5 deletions scripts/build-manylinux-wheels.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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