Merge branch 'main' into dm/crypto

.github/workflows/tests.yml

@@ -19,6 +19,7 @@ jobs:
           - "3.11"
           - "3.12"
           - "3.13"
+          - "pypy"
 
     runs-on: ${{ matrix.platform }}
     steps:

CHANGELOG.md

@@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Relax cryptography version requirement ([91](https://github.com/trailofbits/rfc3161-client/pull/91))
 
+### Fixed
+
+- The project now correctly runs tests with PyPy
+  ([89](https://github.com/trailofbits/rfc3161-client/pull/89))
+
 ## [0.1.1] - 2024-12-10
 
 ### Changed

rust/Cargo.toml

@@ -21,5 +21,8 @@ rand = "0.8.5"
 cryptography-x509.workspace = true
 openssl = { version = "0.10.68", features = ["vendored"] }
 
+[build-dependencies]
+pyo3-build-config = { version = "0.23.1", features = ["resolve-config"] }
+
 [features]
 extension-module = ["pyo3/extension-module"]

rust/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    pyo3_build_config::use_pyo3_cfgs();
+}

rust/src/lib.rs

@@ -760,6 +760,9 @@ mod _rust {
     }
 }
 
+// We cannot run tests when used with PyPy because it lacks Py_Initialize
+// https://github.com/pypy/pypy/issues/3836
+#[cfg(not(PyPy))]
 #[cfg(test)]
 mod tests {
     use super::OwnedTimeStampResp;