Skip to content

Commit 870cb72

Browse files
eriknweriknw
committed
update and test building wheels too
1 parent b0d1b07 commit 870cb72

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
- "pypy3.10"
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
- name: Set up Python
33-
uses: actions/setup-python@v4
33+
uses: actions/setup-python@v5
3434
with:
3535
python-version: ${{ matrix.python-version }}
3636
- name: Install dependencies

‎.github/workflows/wheels.yml

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Build wheels
22

33
on:
4-
# pull_request: # Uncomment to debug wheel building in a PR
4+
pull_request: # Uncomment to debug wheel building in a PR
55
push:
66
branches:
77
- master
@@ -27,8 +27,8 @@ jobs:
2727
# # PyPy may have issues. Intermittent failures have been seen on:
2828
# # pp37-manylinux_aarch64 pp38-win_amd64
2929
#
30-
# pys = ['cp36', 'cp37', 'cp38', 'cp39', 'cp310', 'cp311']
31-
# pys_arm = ['cp38', 'cp39', 'cp310', 'cp311']
30+
# pys = ['cp37', 'cp38', 'cp39', 'cp310', 'cp311', 'cp312']
31+
# pys_arm = ['cp38', 'cp39', 'cp310', 'cp311', 'cp312']
3232
# pypys = ['pp37', 'pp38', 'pp39', 'pp310']
3333
# SKIP = set() # {"pp37-manylinux_aarch64", "pp38-win_amd64"}
3434
# combos = []
@@ -60,10 +60,9 @@ jobs:
6060
# combos.append(('windows', f'{py}-win_amd64', 'AMD64'))
6161
#
6262
# # Sort, filter, and print combinations
63-
# for os, build, arch in sorted(combos, key=lambda x: (x[0], x[1].replace('310', '390').replace('311', '391'), x[2])):
63+
# for os, build, arch in sorted(combos, key=lambda x: (x[0], x[1].replace('310', '390').replace('311', '391').replace('312', '392'), x[2])):
6464
# skip = "# " if build in SKIP else ""
6565
# print(f' {skip}- {{"os": "{os}", "build": "{build}", "arch": "{arch}"}}')
66-
- {"os": "macos", "build": "cp36-macosx_x86_64", "arch": "x86_64"}
6766
- {"os": "macos", "build": "cp37-macosx_x86_64", "arch": "x86_64"}
6867
- {"os": "macos", "build": "cp38-macosx_arm64", "arch": "arm64"}
6968
- {"os": "macos", "build": "cp38-macosx_x86_64", "arch": "x86_64"}
@@ -73,20 +72,12 @@ jobs:
7372
- {"os": "macos", "build": "cp310-macosx_x86_64", "arch": "x86_64"}
7473
- {"os": "macos", "build": "cp311-macosx_arm64", "arch": "arm64"}
7574
- {"os": "macos", "build": "cp311-macosx_x86_64", "arch": "x86_64"}
75+
- {"os": "macos", "build": "cp312-macosx_arm64", "arch": "arm64"}
76+
- {"os": "macos", "build": "cp312-macosx_x86_64", "arch": "x86_64"}
7677
- {"os": "macos", "build": "pp37-macosx_x86_64", "arch": "x86_64"}
7778
- {"os": "macos", "build": "pp38-macosx_x86_64", "arch": "x86_64"}
78-
# - {"os": "macos", "build": "pp39-macosx_x86_64", "arch": "x86_64"}
79-
# - {"os": "macos", "build": "pp310-macosx_x86_64", "arch": "x86_64"}
80-
- {"os": "ubuntu", "build": "cp36-manylinux_aarch64", "arch": "aarch64"}
81-
- {"os": "ubuntu", "build": "cp36-manylinux_i686", "arch": "i686"}
82-
- {"os": "ubuntu", "build": "cp36-manylinux_ppc64le", "arch": "ppc64le"}
83-
- {"os": "ubuntu", "build": "cp36-manylinux_s390x", "arch": "s390x"}
84-
- {"os": "ubuntu", "build": "cp36-manylinux_x86_64", "arch": "x86_64"}
85-
- {"os": "ubuntu", "build": "cp36-musllinux_aarch64", "arch": "aarch64"}
86-
- {"os": "ubuntu", "build": "cp36-musllinux_i686", "arch": "i686"}
87-
- {"os": "ubuntu", "build": "cp36-musllinux_ppc64le", "arch": "ppc64le"}
88-
- {"os": "ubuntu", "build": "cp36-musllinux_s390x", "arch": "s390x"}
89-
- {"os": "ubuntu", "build": "cp36-musllinux_x86_64", "arch": "x86_64"}
79+
- {"os": "macos", "build": "pp39-macosx_x86_64", "arch": "x86_64"}
80+
- {"os": "macos", "build": "pp310-macosx_x86_64", "arch": "x86_64"}
9081
- {"os": "ubuntu", "build": "cp37-manylinux_aarch64", "arch": "aarch64"}
9182
- {"os": "ubuntu", "build": "cp37-manylinux_i686", "arch": "i686"}
9283
- {"os": "ubuntu", "build": "cp37-manylinux_ppc64le", "arch": "ppc64le"}
@@ -137,21 +128,28 @@ jobs:
137128
- {"os": "ubuntu", "build": "cp311-musllinux_ppc64le", "arch": "ppc64le"}
138129
- {"os": "ubuntu", "build": "cp311-musllinux_s390x", "arch": "s390x"}
139130
- {"os": "ubuntu", "build": "cp311-musllinux_x86_64", "arch": "x86_64"}
140-
# Intermittent segfault on pp37-manylinux_aarch64 in test_dicttoolz.py:test_merge_with
131+
- {"os": "ubuntu", "build": "cp312-manylinux_aarch64", "arch": "aarch64"}
132+
- {"os": "ubuntu", "build": "cp312-manylinux_i686", "arch": "i686"}
133+
- {"os": "ubuntu", "build": "cp312-manylinux_ppc64le", "arch": "ppc64le"}
134+
- {"os": "ubuntu", "build": "cp312-manylinux_s390x", "arch": "s390x"}
135+
- {"os": "ubuntu", "build": "cp312-manylinux_x86_64", "arch": "x86_64"}
136+
- {"os": "ubuntu", "build": "cp312-musllinux_aarch64", "arch": "aarch64"}
137+
- {"os": "ubuntu", "build": "cp312-musllinux_i686", "arch": "i686"}
138+
- {"os": "ubuntu", "build": "cp312-musllinux_ppc64le", "arch": "ppc64le"}
139+
- {"os": "ubuntu", "build": "cp312-musllinux_s390x", "arch": "s390x"}
140+
- {"os": "ubuntu", "build": "cp312-musllinux_x86_64", "arch": "x86_64"}
141141
- {"os": "ubuntu", "build": "pp37-manylinux_aarch64", "arch": "aarch64"}
142142
- {"os": "ubuntu", "build": "pp37-manylinux_i686", "arch": "i686"}
143143
- {"os": "ubuntu", "build": "pp37-manylinux_x86_64", "arch": "x86_64"}
144144
- {"os": "ubuntu", "build": "pp38-manylinux_aarch64", "arch": "aarch64"}
145145
- {"os": "ubuntu", "build": "pp38-manylinux_i686", "arch": "i686"}
146146
- {"os": "ubuntu", "build": "pp38-manylinux_x86_64", "arch": "x86_64"}
147-
# - {"os": "ubuntu", "build": "pp39-manylinux_aarch64", "arch": "aarch64"}
148-
# - {"os": "ubuntu", "build": "pp310-manylinux_aarch64", "arch": "aarch64"}
149-
# - {"os": "ubuntu", "build": "pp39-manylinux_i686", "arch": "i686"}
150-
# - {"os": "ubuntu", "build": "pp310-manylinux_i686", "arch": "i686"}
151-
# - {"os": "ubuntu", "build": "pp39-manylinux_x86_64", "arch": "x86_64"}
152-
# - {"os": "ubuntu", "build": "pp310-manylinux_x86_64", "arch": "x86_64"}
153-
- {"os": "windows", "build": "cp36-win32", "arch": "x86"}
154-
- {"os": "windows", "build": "cp36-win_amd64", "arch": "AMD64"}
147+
- {"os": "ubuntu", "build": "pp39-manylinux_aarch64", "arch": "aarch64"}
148+
- {"os": "ubuntu", "build": "pp39-manylinux_i686", "arch": "i686"}
149+
- {"os": "ubuntu", "build": "pp39-manylinux_x86_64", "arch": "x86_64"}
150+
- {"os": "ubuntu", "build": "pp310-manylinux_aarch64", "arch": "aarch64"}
151+
- {"os": "ubuntu", "build": "pp310-manylinux_i686", "arch": "i686"}
152+
- {"os": "ubuntu", "build": "pp310-manylinux_x86_64", "arch": "x86_64"}
155153
- {"os": "windows", "build": "cp37-win32", "arch": "x86"}
156154
- {"os": "windows", "build": "cp37-win_amd64", "arch": "AMD64"}
157155
- {"os": "windows", "build": "cp38-win32", "arch": "x86"}
@@ -162,10 +160,12 @@ jobs:
162160
- {"os": "windows", "build": "cp310-win_amd64", "arch": "AMD64"}
163161
- {"os": "windows", "build": "cp311-win32", "arch": "x86"}
164162
- {"os": "windows", "build": "cp311-win_amd64", "arch": "AMD64"}
163+
- {"os": "windows", "build": "cp312-win32", "arch": "x86"}
164+
- {"os": "windows", "build": "cp312-win_amd64", "arch": "AMD64"}
165165
- {"os": "windows", "build": "pp37-win_amd64", "arch": "AMD64"}
166166
- {"os": "windows", "build": "pp38-win_amd64", "arch": "AMD64"}
167-
# - {"os": "windows", "build": "pp39-win_amd64", "arch": "AMD64"}
168-
# - {"os": "windows", "build": "pp310-win_amd64", "arch": "AMD64"}
167+
- {"os": "windows", "build": "pp39-win_amd64", "arch": "AMD64"}
168+
- {"os": "windows", "build": "pp310-win_amd64", "arch": "AMD64"}
169169

170170
steps:
171171
- name: Setup QEMU
@@ -174,11 +174,11 @@ jobs:
174174
with:
175175
platforms: all
176176
- name: Checkout
177-
uses: actions/checkout@v3
177+
uses: actions/checkout@v4
178178
with:
179179
fetch-depth: 0
180180
- name: Set up Python
181-
uses: actions/setup-python@v4
181+
uses: actions/setup-python@v5
182182
with:
183183
python-version: "3.x"
184184
- name: Build wheels
@@ -204,11 +204,11 @@ jobs:
204204
shell: bash -l {0}
205205
steps:
206206
- name: Checkout
207-
uses: actions/checkout@v3
207+
uses: actions/checkout@v4
208208
with:
209209
fetch-depth: 0
210210
- name: Set up Python
211-
uses: actions/setup-python@v4
211+
uses: actions/setup-python@v5
212212
with:
213213
python-version: "3.8"
214214
- name: Install build dependencies

0 commit comments

Comments
 (0)