Skip to content

Commit 1b922c7

Browse files
authored
Use the current Python version as the abi3 default when building from source (#12896)
* Use the current Python version as the abi3 default when building from source * fixes
1 parent 52c03cd commit 1b922c7

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
PYTHON:
2727
- {VERSION: "3.13", NOXSESSION: "flake"}
2828
- {VERSION: "3.13", NOXSESSION: "rust"}
29-
- {VERSION: "3.13", NOXSESSION: "tests-abi3-py311"}
3029
- {VERSION: "3.12", NOXSESSION: "docs", OPENSSL: {TYPE: "openssl", VERSION: "3.5.0"}}
3130
- {VERSION: "3.14-dev", NOXSESSION: "tests"}
3231
- {VERSION: "pypy-3.10", NOXSESSION: "tests-nocoverage"}
@@ -135,6 +134,8 @@ jobs:
135134
nox -v --install-only
136135
env:
137136
NOXSESSION: ${{ matrix.PYTHON.NOXSESSION }}
137+
# Needed until https://github.com/PyO3/pyo3/issues/5093
138+
PYO3_USE_ABI3_FORWARD_COMPATIBILITY: 1
138139
- name: Tests
139140
run: |
140141
nox --no-install -- --color=yes --wycheproof-root=wycheproof --x509-limbo-root=x509-limbo ${{ matrix.PYTHON.NOXARGS }}

noxfile.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ def load_pyproject_toml() -> dict:
4949
@nox.session(name="tests-randomorder")
5050
@nox.session(name="tests-nocoverage")
5151
@nox.session(name="tests-rust-debug")
52-
@nox.session(name="tests-abi3-py311")
5352
def tests(session: nox.Session) -> None:
5453
extras = "test"
5554
if session.name == "tests-ssh":
@@ -77,12 +76,6 @@ def tests(session: nox.Session) -> None:
7776
"--config-settings=build-args=--profile=dev",
7877
f".[{extras}]",
7978
)
80-
elif session.name == "tests-abi3-py311":
81-
install(
82-
session,
83-
"--config-settings=build-args=--features=pyo3/abi3-py311",
84-
f".[{extras}]",
85-
)
8679
else:
8780
install(session, f".[{extras}]")
8881

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# These requirements must be kept sync with the requirements in
33
# ./.github/requirements/build-requirements.{in,txt}
44
requires = [
5-
"maturin>=1,<2",
5+
"maturin>=1.8.6,<2",
66

77
# Must be kept in sync with `project.dependencies`
88
"cffi>=1.14; platform_python_implementation != 'PyPy'",
@@ -100,7 +100,6 @@ manifest-path = "src/rust/Cargo.toml"
100100
module-name = "cryptography.hazmat.bindings._rust"
101101
locked = true
102102
sdist-generator = "git"
103-
features = ["pyo3/abi3-py37"]
104103
include = [
105104
"CHANGELOG.rst",
106105
"CONTRIBUTING.rst",

0 commit comments

Comments
 (0)