Skip to content

Commit 47e5d3c

Browse files
authored
Merge pull request #1565 from henryiii/henryiii/feat/312rc
feat: build using 3.12 RC by default
2 parents df94b5d + a63e11a commit 47e5d3c

File tree

5 files changed

+22
-8
lines changed

5 files changed

+22
-8
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ What does it do?
4141
<sup>² Windows arm64 support is experimental.</sup><br>
4242
<sup>³ Alpine 3.14 and very briefly 3.15's default python3 [was not able to load](https://github.com/pypa/cibuildwheel/issues/934) musllinux wheels. This has been fixed; please upgrade the python package if using Alpine from before the fix.</sup><br>
4343
<sup>⁴ Cross-compilation not supported with PyPy - to build these wheels you need to run cibuildwheel on an Apple Silicon machine.</sup><br>
44-
<sup>⁵ CPython 3.12 is available using the [CIBW_PRERELEASE_PYTHONS](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons) option.</sup><br>
44+
<sup>⁵ CPython 3.12 is built by default using Python RCs, starting with cibuildwheel 2.15.</sup><br>
4545

4646
- Builds manylinux, musllinux, macOS 10.9+, and Windows wheels for CPython and PyPy
4747
- Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, GitLab CI, and Cirrus CI

cibuildwheel/util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class BuildSelector:
250250
requires_python: SpecifierSet | None = None
251251

252252
# a pattern that skips prerelease versions, when include_prereleases is False.
253-
PRERELEASE_SKIP: ClassVar[str] = "cp312-*"
253+
PRERELEASE_SKIP: ClassVar[str] = ""
254254
prerelease_pythons: bool = False
255255

256256
def __call__(self, build_id: str) -> bool:

unit_test/build_selector_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_build():
1212
assert build_selector("cp37-manylinux_x86_64")
1313
assert build_selector("cp310-manylinux_x86_64")
1414
assert build_selector("cp311-manylinux_x86_64")
15-
assert not build_selector("cp312-manylinux_x86_64")
15+
assert build_selector("cp312-manylinux_x86_64")
1616
assert build_selector("pp36-manylinux_x86_64")
1717
assert build_selector("pp37-manylinux_x86_64")
1818
assert build_selector("cp36-manylinux_i686")
@@ -32,7 +32,7 @@ def test_build():
3232
assert build_selector("cp37-win_amd64")
3333
assert build_selector("cp310-win_amd64")
3434
assert build_selector("cp311-win_amd64")
35-
assert not build_selector("cp312-win_amd64")
35+
assert build_selector("cp312-win_amd64")
3636
assert not build_selector("pp36-win_amd64")
3737
assert not build_selector("pp37-win_amd64")
3838

unit_test/linux_build_steps_test.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ def before_alls(step):
6262
"cp36-manylinux_x86_64",
6363
"cp37-manylinux_x86_64",
6464
"cp311-manylinux_x86_64",
65+
"cp312-manylinux_x86_64",
6566
]
66-
assert before_alls(build_steps[0]) == ["", "", ""]
67+
assert before_alls(build_steps[0]) == ["", "", "", ""]
6768

6869
assert build_steps[1].container_image == "other_container_image"
6970
assert identifiers(build_steps[1]) == ["cp38-manylinux_x86_64", "cp310-manylinux_x86_64"]

unit_test/option_prepare_test.py

+16-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,19 @@
1313
from cibuildwheel import linux, util
1414
from cibuildwheel.__main__ import main
1515

16-
ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "cp311", "pp37", "pp38", "pp39", "pp310"}
16+
ALL_IDS = {
17+
"cp36",
18+
"cp37",
19+
"cp38",
20+
"cp39",
21+
"cp310",
22+
"cp311",
23+
"cp312",
24+
"pp37",
25+
"pp38",
26+
"pp39",
27+
"pp310",
28+
}
1729

1830

1931
@pytest.fixture()
@@ -143,7 +155,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path):
143155
identifiers = {x.identifier for x in kwargs["platform_configs"]}
144156
assert identifiers == {
145157
f"{x}-manylinux_x86_64"
146-
for x in ALL_IDS - {"cp36", "cp310", "cp311", "pp37", "pp38", "pp39", "pp310"}
158+
for x in ALL_IDS - {"cp36", "cp310", "cp311", "cp312", "pp37", "pp38", "pp39", "pp310"}
147159
}
148160
assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == ""
149161

@@ -153,7 +165,8 @@ def test_build_with_override_launches(monkeypatch, tmp_path):
153165
assert not kwargs["container"]["simulate_32_bit"]
154166
identifiers = {x.identifier for x in kwargs["platform_configs"]}
155167
assert identifiers == {
156-
f"{x}-manylinux_x86_64" for x in ["cp310", "cp311", "pp37", "pp38", "pp39", "pp310"]
168+
f"{x}-manylinux_x86_64"
169+
for x in ["cp310", "cp311", "cp312", "pp37", "pp38", "pp39", "pp310"]
157170
}
158171

159172
kwargs = build_in_container.call_args_list[3][1]

0 commit comments

Comments
 (0)