Skip to content

Commit

Permalink
Update manylinux1 to manylinux2014 for Python 3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugovk
hugovk committed Sep 5, 2021
1 parent 1e59968 commit cd897fd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-wheels.yml
View file
Expand Up @@ -70,8 +70,8 @@ jobs:
- name: Build x86 Linux wheels
if: matrix.wheel == 'x86'
run: |
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
docker run -v `pwd`:/io quay.io/pypa/manylinux2014_x86_64 /io/scripts/build-manylinux-wheels.sh
docker run -v `pwd`:/io quay.io/pypa/manylinux2014_i686 /io/scripts/build-manylinux-wheels.sh
- name: Upload as build artifacts
uses: actions/upload-artifact@v2
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-manylinux-wheels.sh
View file
Expand Up @@ -4,11 +4,11 @@ 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 -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/scripts/build-manylinux-wheels.sh
# $ docker run -v `pwd`:/io quay.io/pypa/manylinux2014_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
# /io/setup.py quay.io/pypa/manylinux1_x86_64 is the full Docker image name. Docker
# /io/setup.py quay.io/pypa/manylinux2014_x86_64 is the full Docker image name. Docker
# downloads it automatically.

# The last argument is a shell command that the Docker will execute. Filenames must be
Expand All @@ -22,7 +22,7 @@ mkdir -p /io/temp-wheels
# Clean out any old existing wheels.
find /io/temp-wheels/ -type f -delete

for PYBIN in /opt/python/cp3[6789]*/bin; do
for PYBIN in /opt/python/cp3[678910]*/bin; do

This comment has been minimized.

Sign in to view

Copy link
@mrluanma

mrluanma Sep 7, 2021 •
edited

Maybe this won't work?

This comment has been minimized.

Sign in to view

Copy link
@hugovk

hugovk Sep 7, 2021

Author Member

Yeah, it works right now, but it will stop working at some point!

Right now, /opt/python/ contains:

cp310-cp310
cp36-cp36m
cp37-cp37m
cp38-cp38
cp39-cp39
pp37-pypy37_pp73

And $PYBIN expands to these:

/opt/python/cp310-cp310/bin
/opt/python/cp36-cp36m/bin
/opt/python/cp37-cp37m/bin
/opt/python/cp38-cp38/bin
/opt/python/cp39-cp39/bin

So it'll also start to pick up 3.11 when that becomes available in around a year.

I'll update it to:

-for PYBIN in /opt/python/cp3[678910]*/bin; do
+for PYBIN in /opt/python/cp3{6..10}*/bin; do

Thanks!
"${PYBIN}/pip" install -q -U setuptools wheel pytest --cache-dir /io/pip-cache
(cd /io/ && "${PYBIN}/python" -m pip install .)
(cd /io/ && "${PYBIN}/python" -m pytest)
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-manylinux.py
View file
Expand Up @@ -37,7 +37,7 @@ def main():
# so files are not root-owned
"--user", f"{os.getuid()}:{os.getgid()}",
"--volume", f'{os.path.abspath("dist")}:/dist:rw',
"quay.io/pypa/manylinux1_x86_64:latest",
"quay.io/pypa/manylinux2014_x86_64:latest",
"bash", "-euxc",
f"{pip} wheel -w /tmp/wheels --no-deps {pkg} && "
f"auditwheel repair -w /dist /tmp/wheels/*.whl",
Expand Down

0 comments on commit cd897fd

Please sign in to comment.