feat: add Python 3.12 beta 1 (#1507)

* feat: add Python 3.12 beta 1

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

* fix: try updating some versions to (near) final 3.6 supported version

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

* tests: skip dep check on 3.6

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>

* Update test pip version pin

* Fix expected wheels check

---------

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
Co-authored-by: Joe Rickerby <joerick@mac.com>
This commit is contained in:
Henry Schreiner
2023-05-26 21:14:55 -07:00
committed by GitHub
co-authored by Joe Rickerby
parent b2bc6fdda6
commit 8499628a5b
20 changed files with 112 additions and 49 deletions
+1 -1
View File
@@ -47,7 +47,7 @@ def test_abi3(tmp_path):
expected_wheels = [
w.replace("cp38-cp38", "cp38-abi3")
for w in utils.expected_wheels("spam", "0.1.0")
if "-pp" not in w and "-cp39" not in w and "-cp310" not in w and "-cp311" not in w
if "-pp" not in w and "-cp39" not in w and "-cp31" not in w
]
assert set(actual_wheels) == set(expected_wheels)
+6 -5
View File
@@ -120,10 +120,10 @@ def test_dependency_constraints_file(tmp_path, build_frontend_env):
project_with_expected_version_checks.generate(project_dir)
tool_versions = {
"pip": "20.0.2",
"setuptools": "53.0.0",
"wheel": "0.36.2",
"virtualenv": "20.11.2",
"pip": "23.1.2",
"setuptools": "67.7.2",
"wheel": "0.38.3",
"virtualenv": "20.23.0",
}
constraints_file = tmp_path / "constraints file.txt"
@@ -155,11 +155,12 @@ def test_dependency_constraints_file(tmp_path, build_frontend_env):
add_env={
"CIBW_ENVIRONMENT": cibw_environment_option,
"CIBW_DEPENDENCY_VERSIONS": str(constraints_file),
"CIBW_SKIP": "cp36-*",
**build_frontend_env,
},
)
# also check that we got the right wheels
expected_wheels = utils.expected_wheels("spam", "0.1.0")
expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "-cp36" not in w]
assert set(actual_wheels) == set(expected_wheels)
+14 -3
View File
@@ -84,8 +84,11 @@ def test(manylinux_image, tmp_path):
# We don't have a manylinux1 image for PyPy & CPython 3.10 and above
add_env["CIBW_SKIP"] = "pp* cp31*"
if manylinux_image in {"manylinux2010"}:
# We don't have a manylinux2010 image for PyPy 3.9, CPython 3.11
add_env["CIBW_SKIP"] = "pp39* cp311*"
# We don't have a manylinux2010 image for PyPy 3.9, CPython 3.11+
add_env["CIBW_SKIP"] = "pp39* cp311* cp312*"
if manylinux_image in {"manylinux_2_24"}:
# We don't have a manylinux_2_24 image for CPython 3.12+
add_env["CIBW_SKIP"] = "cp312*"
if manylinux_image == "manylinux_2_28" and platform.machine() == "x86_64":
# We don't have a manylinux_2_28 image for i686
add_env["CIBW_ARCHS"] = "x86_64"
@@ -109,7 +112,15 @@ def test(manylinux_image, tmp_path):
if manylinux_image in {"manylinux2010"}:
# remove PyPy 3.9 & CPython 3.11
expected_wheels = [w for w in expected_wheels if "-pp39" not in w and "-cp311" not in w]
expected_wheels = [
w
for w in expected_wheels
if "-pp39" not in w and "-cp311" not in w and "-cp312" not in w
]
if manylinux_image in {"manylinux_2_24"}:
# remove CPython 3.11 and above
expected_wheels = [w for w in expected_wheels if "-cp312" not in w]
if manylinux_image == "manylinux_2_28" and platform.machine() == "x86_64":
# We don't have a manylinux_2_28 image for i686
+2 -2
View File
@@ -9,7 +9,7 @@ basic_project = test_projects.new_c_project(
"""
# Will fail if PEP 518 does work
import requests
assert requests.__version__ == "2.23.0", "Requests found but wrong version ({0})".format(requests.__version__)
assert requests.__version__ == "2.27.0", "Requests found but wrong version ({0})".format(requests.__version__)
# Just making sure environment is still set
import os
@@ -27,7 +27,7 @@ requires = [
"setuptools >= 42",
"setuptools_scm[toml]>=4.1.2",
"wheel",
"requests==2.23.0"
"requests==2.27.0"
]
build-backend = "setuptools.build_meta"
+2
View File
@@ -170,6 +170,7 @@ def expected_wheels(
"cp39-cp39",
"cp310-cp310",
"cp311-cp311",
"cp312-cp312",
]
if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]:
@@ -182,6 +183,7 @@ def expected_wheels(
"cp39-cp39",
"cp310-cp310",
"cp311-cp311",
"cp312-cp312",
"pp38-pypy38_pp73",
"pp39-pypy39_pp73",
]