Skip to content

Commit 24dba29

Browse files
zebra-luckyzebra-lucky
committed
version to 0.1.10 (python 3.9-3.10 wheels)
1 parent f1adb3d commit 24dba29

11 files changed

+130
-176
lines changed

‎.github/workflows/build_wheels.yml

+88-13
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Create github release
1313
outputs:
1414
upload_url: ${{ steps.create_release.outputs.upload_url }}
15-
pkg_v: '0.1.9'
15+
pkg_v: '0.1.10'
1616
steps:
1717
- name: Create Release
1818
id: create_release
@@ -30,12 +30,17 @@ jobs:
3030
runs-on: ubuntu-18.04
3131
strategy:
3232
matrix:
33-
envs: [['manylinux2010_x86_64', ''],
34-
['manylinux1_x86_64', ''],
35-
['manylinux1_i686', 'linux32']]
33+
envs: [
34+
['manylinux_2_28_x86_64', '', 'manylinux_2_28_x86_64'],
35+
['manylinux2014_x86_64', '',
36+
'manylinux_2_17_x86_64.manylinux2014_x86_64'],
37+
['manylinux2014_i686', 'linux32',
38+
'manylinux_2_17_i686.manylinux2014_i686']
39+
]
3640
env:
3741
PLAT: ${{ matrix.envs[0] }}
3842
PRE_CMD: ${{ matrix.envs[1] }}
43+
PLAT_TAGS: ${{ matrix.envs[2] }}
3944
name: Build wheels on linux
4045
steps:
4146
- name: Checkout
@@ -54,26 +59,44 @@ jobs:
5459
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5560
with:
5661
upload_url: ${{ needs.create_release.outputs.upload_url }}
57-
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp36-cp36m-${{ matrix.envs[0] }}.whl
58-
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp36-cp36m-${{ matrix.envs[0] }}.whl
62+
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp36-cp36m-${{ matrix.envs[2] }}.whl
63+
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp36-cp36m-${{ matrix.envs[2] }}.whl
5964
asset_content_type: application/zip
6065
- name: Upload Release Asset Python3.7
6166
uses: actions/upload-release-asset@v1
6267
env:
6368
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6469
with:
6570
upload_url: ${{ needs.create_release.outputs.upload_url }}
66-
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp37-cp37m-${{ matrix.envs[0] }}.whl
67-
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp37-cp37m-${{ matrix.envs[0] }}.whl
71+
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp37-cp37m-${{ matrix.envs[2] }}.whl
72+
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp37-cp37m-${{ matrix.envs[2] }}.whl
6873
asset_content_type: application/zip
6974
- name: Upload Release Asset Python3.8
7075
uses: actions/upload-release-asset@v1
7176
env:
7277
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7378
with:
7479
upload_url: ${{ needs.create_release.outputs.upload_url }}
75-
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp38-cp38-${{ matrix.envs[0] }}.whl
76-
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp38-cp38-${{ matrix.envs[0] }}.whl
80+
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp38-cp38-${{ matrix.envs[2] }}.whl
81+
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp38-cp38-${{ matrix.envs[2] }}.whl
82+
asset_content_type: application/zip
83+
- name: Upload Release Asset Python3.9
84+
uses: actions/upload-release-asset@v1
85+
env:
86+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
87+
with:
88+
upload_url: ${{ needs.create_release.outputs.upload_url }}
89+
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp39-cp39-${{ matrix.envs[2] }}.whl
90+
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp39-cp39-${{ matrix.envs[2] }}.whl
91+
asset_content_type: application/zip
92+
- name: Upload Release Asset Python3.10
93+
uses: actions/upload-release-asset@v1
94+
env:
95+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
96+
with:
97+
upload_url: ${{ needs.create_release.outputs.upload_url }}
98+
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp310-cp310-${{ matrix.envs[2] }}.whl
99+
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp310-cp310-${{ matrix.envs[2] }}.whl
77100
asset_content_type: application/zip
78101
- name: Upload Release Asset sdist
79102
if: ${{ matrix.envs[0] == 'manylinux2010_x86_64' }}
@@ -161,15 +184,67 @@ jobs:
161184
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp38-cp38-macosx_10_9_x86_64.whl
162185
asset_content_type: application/zip
163186

187+
build_osx_39:
188+
needs: create_release
189+
runs-on: macos-10.15
190+
name: Build wheel on macOS Python3.9
191+
env:
192+
PYTHON_VERSION: '3.9.13'
193+
steps:
194+
- name: Checkout
195+
uses: actions/checkout@v1
196+
- name: Prepare build
197+
run: |
198+
./contrib/install_osx.sh
199+
- name: Build wheel
200+
run: |
201+
source contrib/version_env.sh && ./contrib/script_osx.sh
202+
- name: Upload Release Asset
203+
uses: actions/upload-release-asset@v1
204+
env:
205+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
206+
with:
207+
upload_url: ${{ needs.create_release.outputs.upload_url }}
208+
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp39-cp39-macosx_10_9_x86_64.whl
209+
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp39-cp39-macosx_10_9_x86_64.whl
210+
asset_content_type: application/zip
211+
212+
build_osx_310:
213+
needs: create_release
214+
runs-on: macos-10.15
215+
name: Build wheel on macOS Python3.10
216+
env:
217+
PYTHON_VERSION: '3.10.10'
218+
steps:
219+
- name: Checkout
220+
uses: actions/checkout@v1
221+
- name: Prepare build
222+
run: |
223+
./contrib/install_osx.sh
224+
- name: Build wheel
225+
run: |
226+
source contrib/version_env.sh && ./contrib/script_osx.sh
227+
- name: Upload Release Asset
228+
uses: actions/upload-release-asset@v1
229+
env:
230+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
231+
with:
232+
upload_url: ${{ needs.create_release.outputs.upload_url }}
233+
asset_path: dist/python_bls-${{ needs.create_release.outputs.pkg_v }}-cp310-cp310-macosx_10_9_universal2.whl
234+
asset_name: python_bls-${{ needs.create_release.outputs.pkg_v }}-cp310-cp310-macosx_10_9_universal2.whl
235+
asset_content_type: application/zip
236+
164237
build_win:
165238
needs: create_release
166239
runs-on: windows-2019
167240
name: Build wheels on Win
168241
strategy:
169242
matrix:
170-
python-version: [[3.6, 'cp36-cp36m'],
171-
[3.7, 'cp37-cp37m'],
172-
[3.8, 'cp38-cp38']]
243+
python-version: [['3.6', 'cp36-cp36m'],
244+
['3.7', 'cp37-cp37m'],
245+
['3.8', 'cp38-cp38'],
246+
['3.9', 'cp39-cp39'],
247+
['3.10', 'cp310-cp310']]
173248
python-arch: [['x86', 'win32'], ['x64', 'win_amd64']]
174249
env:
175250
PYVER1: ${{ matrix.python-version[1] }}

‎contrib/build_wheels_linux.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -ev
33

4-
cd /io/gmp-6.1.2
4+
cd /io/gmp-6.2.1
55
./configure --enable-fat
66
make
77
make check
@@ -11,22 +11,22 @@ cd /io/
1111
mkdir tests
1212
cp bls_py/tests.py tests/
1313

14-
for PYV in cp36-cp36m cp37-cp37m cp38-cp38
14+
for PYV in cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310
1515
do
1616
cd /io
17-
/opt/python/$PYV/bin/pip install Cython==0.29.13
17+
/opt/python/$PYV/bin/pip install Cython==0.29.33
1818
/opt/python/$PYV/bin/pip wheel . -w dist/
1919
auditwheel repair dist/python_bls-$PKG_VERSION-$PYV-linux*.whl --plat $PLAT -w dist/
2020
rm dist/python_bls-$PKG_VERSION-$PYV-linux*.whl
2121

2222
# Tests
2323
/opt/python/$PYV/bin/pip install pytest
24-
/opt/python/$PYV/bin/pip install dist/python_bls-$PKG_VERSION-$PYV-$PLAT.whl
24+
/opt/python/$PYV/bin/pip install dist/python_bls-$PKG_VERSION-$PYV-$PLAT_TAGS.whl
2525
cd tests
2626
/opt/python/$PYV/bin/pytest -vvv tests.py
2727
done
2828

29-
if [[ $PLAT == manylinux2010_x86_64 ]]; then
29+
if [[ $PLAT == manylinux2014_x86_64 ]]; then
3030
cd /io
3131
/opt/python/cp37-cp37m/bin/python setup.py sdist
3232
fi

‎contrib/install_linux.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ set -ev
33

44
docker pull quay.io/pypa/$PLAT
55

6-
wget https://gmplib.org/download/gmp/gmp-6.1.2.tar.lz
7-
wget https://gmplib.org/download/gmp/gmp-6.1.2.tar.lz.sig
8-
gpg --keyserver keys.gnupg.net --recv-keys 28C67298
9-
gpg --verify gmp-6.1.2.tar.lz.sig
10-
tar --lzip -xf gmp-6.1.2.tar.lz
6+
wget https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz
7+
wget https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz.sig
8+
gpg --keyserver hkps://keyserver.ubuntu.com \
9+
--recv-keys 343C2FF0FBEE5EC2EDBEF399F3599FF828C67298
10+
gpg --verify gmp-6.2.1.tar.lz.sig
11+
tar --lzip -xf gmp-6.2.1.tar.lz

‎contrib/install_osx.sh

+14-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
set -ev
33

44

5-
GMP_BOTTLE=gmp-6.1.2_2.el_capitan.bottle.tar.gz
6-
BINTRAY_URI=https://bintray.com/homebrew/bottles/
7-
wget -O $GMP_BOTTLE ${BINTRAY_URI}download_file?file_path=${GMP_BOTTLE}
5+
GMP_BOTTLE="gmp-6.2.1.high_sierra.bottle.tar.gz"
6+
TOKEN="QQ=="
7+
GHCR_AUTH="Authorization: Bearer $TOKEN"
8+
GHCR_URI="https://ghcr.io/v2/homebrew/core/gmp/blobs/sha256"
9+
GHCR_HASH="54191ce7fa888df64b9c52870531ac0ce2e8cbd40a7c4cdec74cb2c4a421af97"
10+
curl -o $GMP_BOTTLE -L -H "$GHCR_AUTH" "$GHCR_URI:$GHCR_HASH"
811
brew uninstall --ignore-dependencies gmp
912
brew install $GMP_BOTTLE
1013

@@ -22,6 +25,14 @@ case $PYTHON_VERSION in
2225
PY_SHA256=c8195f8b056aff380f1e89dc7dd4c37372c37e5163b91c9391f4256bf5b44fe8
2326
PYPKG_NAME=python-$PYTHON_VERSION-macosx10.9.pkg
2427
;;
28+
3.9.13)
29+
PY_SHA256=167c4e2d9f172a617ba6f3b08783cf376dec429386378066eb2f865c98030dd7
30+
PYPKG_NAME=python-$PYTHON_VERSION-macosx10.9.pkg
31+
;;
32+
3.10.10)
33+
PY_SHA256=1c24eb452065f285249f94965f916f6a5422ec88c131e53597ded4507aa627f7
34+
PYPKG_NAME=python-$PYTHON_VERSION-macos11.pkg
35+
;;
2536
esac
2637
echo "$PY_SHA256 $PYPKG_NAME" > $PYPKG_NAME.sha256
2738

‎contrib/install_win.sh

-21
This file was deleted.

‎contrib/install_win_ga.sh

100644100755
File mode changed.

‎contrib/script_linux.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/bash
22
set -ev
33

4-
docker run --rm -e PLAT=$PLAT -e PKG_VERSION=$PKG_VERSION \
4+
docker run --rm \
5+
-e PLAT=$PLAT \
6+
-e PLAT_TAGS=$PLAT_TAGS \
7+
-e PKG_VERSION=$PKG_VERSION \
58
-v `pwd`:/io quay.io/pypa/$PLAT \
69
$PRE_CMD /io/contrib/build_wheels_linux.sh

‎contrib/script_osx.sh

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -ev
33

4-
sudo pip3 install --upgrade pip wheel delocate==0.7.4 cython==0.29.13
4+
sudo pip3 install --upgrade pip wheel==0.37.1 delocate==0.10.2 cython==0.29.33
55
python3 setup.py build_ext
66
python3 setup.py bdist_wheel
77

@@ -23,6 +23,16 @@ case $PYTHON_VERSION in
2323
delocate-wheel -v dist/python_bls-$PKG_VERSION-cp38-cp38-macosx_10_9_x86_64.whl
2424
sudo pip3 install dist/python_bls-$PKG_VERSION-cp38-cp38-macosx_10_9_x86_64.whl
2525
;;
26+
3.9.13)
27+
export PATH=/Library/Frameworks/Python.framework/Versions/3.9/bin:$PATH
28+
delocate-wheel -v dist/python_bls-$PKG_VERSION-cp39-cp39-macosx_10_9_x86_64.whl
29+
sudo pip3 install dist/python_bls-$PKG_VERSION-cp39-cp39-macosx_10_9_x86_64.whl
30+
;;
31+
3.10.10)
32+
export PATH=/Library/Frameworks/Python.framework/Versions/3.10/bin:$PATH
33+
delocate-wheel -v dist/python_bls-$PKG_VERSION-cp310-cp310-macosx_10_9_universal2.whl
34+
sudo pip3 install dist/python_bls-$PKG_VERSION-cp310-cp310-macosx_10_9_universal2.whl
35+
;;
2636
esac
2737
mkdir tests
2838
cp bls_py/tests.py tests/

0 commit comments

Comments
 (0)