Skip to content

Commit 0f98dc0

Browse files
committed
Add arm64 mac and linux wheels
1 parent 9825bbb commit 0f98dc0

File tree

3 files changed

+36
-15
lines changed

3 files changed

+36
-15
lines changed

.github/workflows/install-postgres.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,16 @@ if [ "${ID}" = "debian" -o "${ID}" = "ubuntu" ]; then
2727
apt-get install -y --no-install-recommends \
2828
"postgresql-${PGVERSION}" \
2929
"postgresql-contrib-${PGVERSION}"
30+
elif [ "${ID}" = "almalinux" ]; then
31+
yum install -y \
32+
"postgresql-server" \
33+
"postgresql-devel" \
34+
"postgresql-contrib"
3035
elif [ "${ID}" = "centos" ]; then
31-
el="EL-${VERSION_ID}-$(arch)"
36+
el="EL-${VERSION_ID%.*}-$(arch)"
3237
baseurl="https://download.postgresql.org/pub/repos/yum/reporpms"
3338
yum install -y "${baseurl}/${el}/pgdg-redhat-repo-latest.noarch.rpm"
34-
if [ ${VERSION_ID} -ge 8 ]; then
39+
if [ ${VERSION_ID%.*} -ge 8 ]; then
3540
dnf -qy module disable postgresql
3641
fi
3742
yum install -y \

.github/workflows/release.yml

+28-12
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,25 @@ jobs:
7171
build-wheels:
7272
needs: validate-release-request
7373
runs-on: ${{ matrix.os }}
74+
continue-on-error: true
7475
strategy:
7576
matrix:
76-
os: [ubuntu-latest, macos-latest, windows-latest]
77-
cibw_python: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"]
78-
cibw_arch: ["auto64", "auto32"]
79-
exclude:
80-
- os: macos-latest
81-
cibw_arch: "auto32"
82-
- os: ubuntu-latest
83-
cibw_arch: "auto32"
77+
include:
78+
- {os: macos-latest, arch: x86_64, build: "*"}
79+
- {os: macos-latest, arch: arm64, build: "*"}
80+
- {os: windows-latest, arch: AMD64, build: "*"}
81+
- {os: windows-latest, arch: x86, build: "*"}
82+
- {os: ubuntu-latest, arch: x86_64, build: "*"}
83+
- {os: ubuntu-latest, arch: aarch64, build: "*[61]-manylinux*"}
84+
- {os: ubuntu-latest, arch: aarch64, build: "*[72]-manylinux*"}
85+
- {os: ubuntu-latest, arch: aarch64, build: "*[83]-manylinux*"}
86+
- {os: ubuntu-latest, arch: aarch64, build: "*[94]-manylinux*"}
87+
- {os: ubuntu-latest, arch: aarch64, build: "*[05]-manylinux*"}
88+
- {os: ubuntu-latest, arch: aarch64, build: "*[61]-musllinux*"}
89+
- {os: ubuntu-latest, arch: aarch64, build: "*[72]-musllinux*"}
90+
- {os: ubuntu-latest, arch: aarch64, build: "*[83]-musllinux*"}
91+
- {os: ubuntu-latest, arch: aarch64, build: "*[94]-musllinux*"}
92+
- {os: ubuntu-latest, arch: aarch64, build: "*[05]-musllinux*"}
8493

8594
defaults:
8695
run:
@@ -94,20 +103,27 @@ jobs:
94103
with:
95104
fetch-depth: 50
96105
submodules: true
106+
107+
- name: Set up QEMU
108+
if: runner.os == 'Linux'
109+
uses: docker/setup-qemu-action@v2
97110

98-
- uses: pypa/cibuildwheel@v2.8.0
111+
- uses: pypa/cibuildwheel@v2.10.0
99112
env:
100113
CIBW_BUILD_VERBOSITY: 1
101-
CIBW_BUILD: ${{ matrix.cibw_python }}
102-
CIBW_ARCHS: ${{ matrix.cibw_arch }}
114+
CIBW_ARCHS: ${{ matrix.arch }}
115+
CIBW_BUILD: ${{ matrix.build }} # py versions from setup.py -> python_requires
116+
CIBW_SKIP: pp*
117+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
118+
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
103119

104120
- uses: actions/upload-artifact@v2
105121
with:
106122
name: dist
107123
path: wheelhouse/*.whl
108124

109125
publish-docs:
110-
needs: validate-release-request
126+
needs: [build-sdist, build-wheels]
111127
runs-on: ubuntu-latest
112128

113129
env:

tests/test_introspection.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from asyncpg import connection as apg_con
1313

1414

15-
MAX_RUNTIME = 0.1
15+
MAX_RUNTIME = 0.25
1616

1717

1818
class SlowIntrospectionConnection(apg_con.Connection):

0 commit comments

Comments
 (0)