summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2023-04-25 07:23:57 -0600
committerGitHub <noreply@github.com>2023-04-25 07:23:57 -0600
commitbb91e8b44950e909c6cfa56b9339ccbcc6c66bfe (patch)
tree5a1222edaeb315bf4ad30181b3de585e2d832652
parente03d583dcb29c653074c160169c890ce01400511 (diff)
downloadcryptography-bb91e8b44950e909c6cfa56b9339ccbcc6c66bfe.tar.gz
See if we can always enable abi3 (#8823)
Previously it wasn't because pypy doesn't support abi3, but maybe the pyo3 feature works.
-rw-r--r--setup.py6
-rw-r--r--src/rust/Cargo.toml2
-rw-r--r--src/rust/cryptography-cffi/Cargo.toml2
3 files changed, 2 insertions, 8 deletions
diff --git a/setup.py b/setup.py
index b05dc2f12..4fe0c027c 100644
--- a/setup.py
+++ b/setup.py
@@ -54,12 +54,6 @@ try:
"cryptography.hazmat.bindings._rust",
"src/rust/Cargo.toml",
py_limited_api=True,
- # Enable abi3 mode if we're not using PyPy.
- features=(
- []
- if platform.python_implementation() == "PyPy"
- else ["pyo3/abi3-py37"]
- ),
rust_version=">=1.56.0",
)
],
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
index bb8f74a84..614bd9967 100644
--- a/src/rust/Cargo.toml
+++ b/src/rust/Cargo.toml
@@ -9,7 +9,7 @@ rust-version = "1.56.0"
[dependencies]
once_cell = "1"
-pyo3 = { version = "0.18" }
+pyo3 = { version = "0.18", features = ["abi3-py37"] }
asn1 = { version = "0.15.0", default-features = false }
cryptography-cffi = { path = "cryptography-cffi" }
cryptography-x509 = { path = "cryptography-x509" }
diff --git a/src/rust/cryptography-cffi/Cargo.toml b/src/rust/cryptography-cffi/Cargo.toml
index f9ae6bc2e..652e621e1 100644
--- a/src/rust/cryptography-cffi/Cargo.toml
+++ b/src/rust/cryptography-cffi/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
rust-version = "1.56.0"
[dependencies]
-pyo3 = { version = "0.18" }
+pyo3 = { version = "0.18", features = ["abi3-py37"] }
openssl-sys = "0.9.87"
[build-dependencies]