Skip to content

Commit

Permalink
Bump version of pyo3/pyo3-export-config and use new API to get config
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashley Anderson committed Mar 22, 2022
1 parent 94d9562 commit a25531a
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 40 deletions.
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -46,7 +46,7 @@
features=(
[]
if platform.python_implementation() == "PyPy"
else ["pyo3/abi3-py36"]
else ["pyo3/abi3-py37"]
),
rust_version=">=1.41.0",
)
Expand Down
76 changes: 43 additions & 33 deletions src/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/rust/Cargo.toml
Expand Up @@ -9,7 +9,7 @@ publish = false
lazy_static = "1"
# pyo3 = { version = "0.15.1" }
# TODO: update after merge/release in pyo3
pyo3 = { git = "https://github.com/aganders3/pyo3", branch = "export-conf", version = "0.15.1" }
pyo3 = { git = "https://github.com/aganders3/pyo3", branch = "export-conf", version = "0.16.2" }
asn1 = { version = "0.8.7", default-features = false, features = ["derive"] }
pem = "1.0"
chrono = { version = "0.4", default-features = false, features = ["alloc", "clock"] }
Expand All @@ -24,8 +24,8 @@ cc = "1.0.72"
[build-dependencies.pyo3-build-config]
git = "https://github.com/aganders3/pyo3"
branch = "export-conf"
version = "0.15.1"
features = ["export-config"]
version = "0.16.2"
features = ["resolve-config"]

[features]
extension-module = ["pyo3/extension-module"]
Expand Down
4 changes: 1 addition & 3 deletions src/rust/build.rs
Expand Up @@ -3,7 +3,6 @@ use std::fs;
use std::path::{Path, MAIN_SEPARATOR};
use std::process::Command;

use pyo3_build_config::InterpreterConfig;

fn main() {
let target = env::var("TARGET").unwrap();
Expand All @@ -21,8 +20,7 @@ fn main() {
}
}

let pyo3_interpreter =
InterpreterConfig::from_pyo3_export_config().expect("could not find pyo3 interpreter");
let pyo3_interpreter = pyo3_build_config::get();

let out_dir = env::var("OUT_DIR").unwrap();

Expand Down

0 comments on commit a25531a

Please sign in to comment.