Skip to content

Commit ea5bc96

Browse files
committed
Merge branch 'development'
2 parents 4a9c457 + 69b537a commit ea5bc96

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

dev/build_wheels.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
# to be run from within manylinux1 docker container
1+
# to be run from within manylinux2010 docker container
22
# run the command below from the root of the source folder
3-
# sudo docker run -ti -v $(pwd):/io quay.io/pypa/manylinux1_x86_64 /bin/bash
3+
# sudo docker run -ti -v $(pwd):/io quay.io/pypa/manylinux2010_x86_64 /bin/bash
44
# in the container run dev/build_wheels.sh
55

6-
PLAT=manylinux1_x86_64
6+
VERSION=0.8.1
7+
PLAT=manylinux2010_x86_64
78
CORES=32
89

910
cd /io || exit
@@ -12,16 +13,22 @@ cd /io || exit
1213
/opt/python/cp37-cp37m/bin/python -m pip install cython numpy==1.14.6
1314
/opt/python/cp37-cp37m/bin/python setup.py build_ext -j$CORES
1415
/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
15-
auditwheel repair dist/raysect-0.7.1-cp37-cp37m-linux_x86_64.whl --plat $PLAT
16+
auditwheel repair dist/raysect-$VERSION-cp37-cp37m-linux_x86_64.whl --plat $PLAT
1617

1718
# python 3.8
1819
/opt/python/cp38-cp38/bin/python -m pip install cython numpy==1.17.5
1920
/opt/python/cp38-cp38/bin/python setup.py build_ext -j$CORES
2021
/opt/python/cp38-cp38/bin/python setup.py bdist_wheel
21-
auditwheel repair dist/raysect-0.7.1-cp38-cp38-linux_x86_64.whl --plat $PLAT
22+
auditwheel repair dist/raysect-$VERSION-cp38-cp38-linux_x86_64.whl --plat $PLAT
2223

2324
# python 3.9
2425
/opt/python/cp39-cp39/bin/python -m pip install cython numpy==1.19.5
2526
/opt/python/cp39-cp39/bin/python setup.py build_ext -j$CORES
2627
/opt/python/cp39-cp39/bin/python setup.py bdist_wheel
27-
auditwheel repair dist/raysect-0.7.1-cp39-cp39-linux_x86_64.whl --plat $PLAT
28+
auditwheel repair dist/raysect-$VERSION-cp39-cp39-linux_x86_64.whl --plat $PLAT
29+
30+
# python 3.10
31+
/opt/python/cp310-cp310/bin/python -m pip install cython numpy==1.19.5
32+
/opt/python/cp310-cp310/bin/python setup.py build_ext -j$CORES
33+
/opt/python/cp310-cp310/bin/python setup.py bdist_wheel
34+
auditwheel repair dist/raysect-$VERSION-cp310-cp310-linux_x86_64.whl --plat $PLAT

dev/notes/building_bdist_with_manylinux.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ Create a temporary folder, enter it and clone the new release:
88

99
Start the manylinux docker container (this will download the container, mount the current folder as "io", and start an interactive session):
1010

11-
sudo docker run -ti -v $(pwd):/io quay.io/pypa/manylinux1_x86_64 /bin/bash
11+
sudo docker run -ti -v $(pwd):/io quay.io/pypa/manylinux2010_x86_64 /bin/bash
1212

1313
This will drop you into the manylinux container terminal. The /opt/python folder in the container holds the various versions of python. This example targets python 3.7. Adjust the paths as appropriate to build bdists for different python versions.
1414

1515
cd io/source
1616
/opt/python/cp37-cp37m/bin/python -m pip install cython numpy==1.14.6
1717
/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
18-
auditwheel repair dist/raysect-0.7.1-cp37-cp37m-linux_x86_64.whl --plat manylinux1_x86_64
18+
auditwheel repair dist/raysect-0.8.1-cp37-cp37m-linux_x86_64.whl --plat manylinux2010_x86_64
1919

20-
This will compile the wheel and repair any library references to produce the manylinux wheel files in a folder ./wheelhouse. e.g. raysect-0.7.1-cp37-cp37m-manylinux1_x86_64.whl and raysect-0.6.0-cp37-cp37m-manylinux2010_x86_64.whl.
20+
This will compile the wheel and repair any library references to produce the manylinux wheel files in a folder ./wheelhouse. e.g. raysect-0.8.1-cp37-cp37m-manylinux1_x86_64.whl and raysect-0.8.1-cp37-cp37m-manylinux2010_x86_64.whl.
2121

22-
These can then be uploaded to pypi (just the manylinux1 packages for now).
22+
These can then be uploaded to pypi (just the manylinux2010 packages for now).
2323

2424
For more info see:
2525
https://realpython.com/python-wheels/#building-a-platform-wheel-macos-and-windows

0 commit comments

Comments
 (0)