Skip to content

Commit 6ff6d25

Browse files
committed
Fewer wheel build configs
1 parent db6608a commit 6ff6d25

File tree

2 files changed

+60
-61
lines changed

2 files changed

+60
-61
lines changed

.github/workflows/wheels.yaml

+57-59
Original file line numberDiff line numberDiff line change
@@ -59,48 +59,48 @@ jobs:
5959
pythonType: "cp"
6060

6161
# Arm Windows
62-
- os: windows-latest
63-
pythonVersion: 39
64-
bitness: 32
65-
platformID: win_arm64
66-
pythonType: "cp"
67-
68-
- os: windows-latest
69-
pythonVersion: 310
70-
bitness: 32
71-
platformID: win_arm64
72-
pythonType: "cp"
73-
74-
- os: windows-latest
75-
pythonVersion: 311
76-
bitness: 32
77-
platformID: win_arm64
78-
pythonType: "cp"
79-
80-
- os: windows-latest
81-
pythonVersion: 312
82-
bitness: 32
83-
platformID: win_arm64
84-
pythonType: "cp"
62+
# - os: windows-latest
63+
# pythonVersion: 39
64+
# bitness: 32
65+
# platformID: win_arm64
66+
# pythonType: "cp"
67+
68+
# - os: windows-latest
69+
# pythonVersion: 310
70+
# bitness: 32
71+
# platformID: win_arm64
72+
# pythonType: "cp"
73+
74+
# - os: windows-latest
75+
# pythonVersion: 311
76+
# bitness: 32
77+
# platformID: win_arm64
78+
# pythonType: "cp"
79+
80+
# - os: windows-latest
81+
# pythonVersion: 312
82+
# bitness: 32
83+
# platformID: win_arm64
84+
# pythonType: "cp"
8585

8686
# PyPy on Windows
87-
- os: windows-latest
88-
pythonVersion: 37
89-
bitness: 64
90-
platformID: win_amd64
91-
pythonType: "pp"
92-
93-
- os: windows-latest
94-
pythonVersion: 38
95-
bitness: 64
96-
platformID: win_amd64
97-
pythonType: "pp"
98-
99-
- os: windows-latest
100-
pythonVersion: 39
101-
bitness: 64
102-
platformID: win_amd64
103-
pythonType: "pp"
87+
# - os: windows-latest
88+
# pythonVersion: 37
89+
# bitness: 64
90+
# platformID: win_amd64
91+
# pythonType: "pp"
92+
93+
# - os: windows-latest
94+
# pythonVersion: 38
95+
# bitness: 64
96+
# platformID: win_amd64
97+
# pythonType: "pp"
98+
99+
# - os: windows-latest
100+
# pythonVersion: 39
101+
# bitness: 64
102+
# platformID: win_amd64
103+
# pythonType: "pp"
104104

105105
- os: windows-latest
106106
pythonVersion: 310
@@ -249,23 +249,23 @@ jobs:
249249
pythonType: "cp"
250250

251251
# Apple-Silicon MacOS PyPy
252-
- os: macos-latest
253-
pythonVersion: 38
254-
bitness: 64
255-
platformID: macosx_arm64
256-
pythonType: "pp"
257-
258-
- os: macos-latest
259-
pythonVersion: 39
260-
bitness: 64
261-
platformID: macosx_arm64
262-
pythonType: "pp"
263-
264-
- os: macos-latest
265-
pythonVersion: 310
266-
bitness: 64
267-
platformID: macosx_arm64
268-
pythonType: "pp"
252+
# - os: macos-latest
253+
# pythonVersion: 38
254+
# bitness: 64
255+
# platformID: macosx_arm64
256+
# pythonType: "pp"
257+
258+
# - os: macos-latest
259+
# pythonVersion: 39
260+
# bitness: 64
261+
# platformID: macosx_arm64
262+
# pythonType: "pp"
263+
264+
# - os: macos-latest
265+
# pythonVersion: 310
266+
# bitness: 64
267+
# platformID: macosx_arm64
268+
# pythonType: "pp"
269269

270270
steps:
271271
- name: Checkout LibRapid
@@ -291,8 +291,6 @@ jobs:
291291
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux_image }}
292292
CIBW_MANYLINUX_PYPY_I686_IMAGE: ${{ matrix.manylinux_image }}
293293
CIBW_BUILD_VERBOSITY: 1
294-
CC: gcc-11
295-
CXX: g++-11
296294
CMAKE_BUILD_PARALLEL_LEVEL: 1
297295
GITHUB_ACTIONS: ON
298296
LIBRAPID_GET_BLAS: OFF

CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,13 @@ if (${SKBUILD})
111111
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/librapid/bindings/generators"
112112
)
113113

114-
115114
# Since it is not possible to set the CMake options in setup.py (we have to use pyproject.toml), we have to manually
116115
# read from the environment to set everything correctly:
117116

118117
# Enable BLAS
119-
set(LIBRAPID_USE_BLAS ON)
118+
if (NOT ${LIBRAPID_NO_BLAS})
119+
set(LIBRAPID_USE_BLAS ON)
120+
endif()
120121

121122
# Get BLAS if the environment variable is set
122123
if ($ENV{LIBRAPID_GET_BLAS})

0 commit comments

Comments
 (0)