diff --git a/src/build_options.rs b/src/build_options.rs index c8aa6db6e..65b06a55b 100644 --- a/src/build_options.rs +++ b/src/build_options.rs @@ -176,7 +176,7 @@ pub struct BuildOptions { pub find_interpreter: bool, /// Which kind of bindings to use. - #[arg(short, long, value_parser = ["pyo3", "pyo3-ffi", "rust-cpython", "cffi", "uniffi", "bin"])] + #[arg(short, long, value_parser = ["pyo3", "pyo3-ffi", "cffi", "uniffi", "bin"])] pub bindings: Option, /// The directory to store the built wheels in. Defaults to a new "wheels" @@ -920,8 +920,6 @@ fn find_bindings( let minor = pyo3_ffi_minimum_python_minor_version(ver.major, ver.minor) .unwrap_or(MINIMUM_PYTHON_MINOR); Some(("pyo3-ffi".to_string(), minor)) - } else if deps.contains_key("cpython") { - Some(("rust-cpython".to_string(), MINIMUM_PYTHON_MINOR)) } else if deps.contains_key("uniffi") { Some(("uniffi".to_string(), MINIMUM_PYTHON_MINOR)) } else { @@ -1365,8 +1363,6 @@ mod test { find_bridge(&pyo3_mixed, Some("pyo3")), Ok(BridgeModel::Bindings(..)) )); - - assert!(find_bridge(&pyo3_mixed, Some("rust-cpython")).is_err()); } #[test] @@ -1384,7 +1380,6 @@ mod test { find_bridge(&pyo3_pure, Some("pyo3")), Ok(BridgeModel::BindingsAbi3(3, 7)) )); - assert!(find_bridge(&pyo3_pure, Some("rust-cpython")).is_err()); } #[test] @@ -1421,7 +1416,6 @@ mod test { ); assert_eq!(find_bridge(&cffi_pure, None).unwrap(), BridgeModel::Cffi); - assert!(find_bridge(&cffi_pure, Some("rust-cpython")).is_err()); assert!(find_bridge(&cffi_pure, Some("pyo3")).is_err()); } @@ -1441,7 +1435,6 @@ mod test { BridgeModel::Bin(None) ); - assert!(find_bridge(&hello_world, Some("rust-cpython")).is_err()); assert!(find_bridge(&hello_world, Some("pyo3")).is_err()); let pyo3_bin = MetadataCommand::new() diff --git a/src/develop.rs b/src/develop.rs index 3ec51026d..b404755cd 100644 --- a/src/develop.rs +++ b/src/develop.rs @@ -98,7 +98,7 @@ pub struct DevelopOptions { short = 'b', long = "bindings", alias = "binding-crate", - value_parser = ["pyo3", "pyo3-ffi", "rust-cpython", "cffi", "uniffi", "bin"] + value_parser = ["pyo3", "pyo3-ffi", "cffi", "uniffi", "bin"] )] pub bindings: Option, /// Pass --release to cargo diff --git a/tests/cmd/build.stdout b/tests/cmd/build.stdout index 0e2b600f3..9651fe736 100644 --- a/tests/cmd/build.stdout +++ b/tests/cmd/build.stdout @@ -37,7 +37,7 @@ Options: -b, --bindings Which kind of bindings to use - [possible values: pyo3, pyo3-ffi, rust-cpython, cffi, uniffi, bin] + [possible values: pyo3, pyo3-ffi, cffi, uniffi, bin] -o, --out The directory to store the built wheels in. Defaults to a new "wheels" directory in the diff --git a/tests/cmd/develop.stdout b/tests/cmd/develop.stdout index cb8ada219..0521154be 100644 --- a/tests/cmd/develop.stdout +++ b/tests/cmd/develop.stdout @@ -10,7 +10,7 @@ Options: -b, --bindings Which kind of bindings to use - [possible values: pyo3, pyo3-ffi, rust-cpython, cffi, uniffi, bin] + [possible values: pyo3, pyo3-ffi, cffi, uniffi, bin] --strip Strip the library for minimum file size diff --git a/tests/cmd/publish.stdout b/tests/cmd/publish.stdout index 8009f5f0d..c6c9dba83 100644 --- a/tests/cmd/publish.stdout +++ b/tests/cmd/publish.stdout @@ -83,7 +83,7 @@ Options: -b, --bindings Which kind of bindings to use - [possible values: pyo3, pyo3-ffi, rust-cpython, cffi, uniffi, bin] + [possible values: pyo3, pyo3-ffi, cffi, uniffi, bin] -o, --out The directory to store the built wheels in. Defaults to a new "wheels" directory in the