diff --git a/Cargo.lock b/Cargo.lock index d772fc311..2229957a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -834,7 +834,7 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "maturin" -version = "0.8.3" +version = "0.9.0-alpha.1" dependencies = [ "anyhow", "base64 0.13.0", diff --git a/Cargo.toml b/Cargo.toml index 01daede9f..ac66ab149 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["konstin "] name = "maturin" -version = "0.8.3" +version = "0.9.0-alpha.1" description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages" exclude = ["test-crates/**/*", "sysconfig/*", "test-data/*", "ci/*", "tests/*"] readme = "Readme.md" diff --git a/Changelog.md b/Changelog.md index 64d3c27ac..f14dd9672 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) (for the cli, not for the crate). -## Unreleased +## 0.9.0 - Unreleased ### Added diff --git a/src/build_options.rs b/src/build_options.rs index 2205b2023..de3c9266a 100644 --- a/src/build_options.rs +++ b/src/build_options.rs @@ -205,10 +205,8 @@ fn has_abi3(cargo_metadata: &Metadata) -> Result { .and_then(|resolve| resolve.root.as_ref()) .context("Expected cargo to return a root package")?; // Check that we have a pyo3 version with abi3 and that abi3 is selected - Ok(pyo3_crate.features.contains_key("unstable-api") - && !cargo_metadata[&root_id] - .features - .contains_key("unstable-api")) + Ok(pyo3_crate.features.contains_key("abi3") + && !cargo_metadata[&root_id].features.contains_key("abi3")) } _ => bail!(format!( "Expected exactly one pyo3 dependency, found {}", @@ -246,7 +244,6 @@ pub fn find_bridge(cargo_metadata: &Metadata, bridge: Option<&str>) -> Result
) -> Result
" "checksum pyo3-derive-backend 0.11.1 (git+https://github.com/PyO3/pyo3?branch=abi3)" = "" "checksum pyo3cls 0.11.1 (git+https://github.com/PyO3/pyo3?branch=abi3)" = "" @@ -280,7 +283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)" = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" "checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" "checksum smallvec 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" -"checksum syn 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b" +"checksum syn 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228" "checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" "checksum unindent 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "af41d708427f8fd0e915dcebb2cae0f0e6acb2a939b2d399c265c39a38a18942" "checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" diff --git a/test-crates/pyo3-pure/Cargo.toml b/test-crates/pyo3-pure/Cargo.toml index 4e89f33c8..2908d5abd 100644 --- a/test-crates/pyo3-pure/Cargo.toml +++ b/test-crates/pyo3-pure/Cargo.toml @@ -11,7 +11,7 @@ get_42 = "pyo3_pure:DummyClass.get_42" [dependencies] # This is temporary until https://github.com/PyO3/pyo3/pull/1152 is merged -pyo3 = { git = "https://github.com/PyO3/pyo3", branch = "abi3", deafult-features = false, features = ["extension-module", "macros"] } +pyo3 = { git = "https://github.com/PyO3/pyo3", branch = "abi3", features = ["extension-module", "abi3"] } [lib] name = "pyo3_pure"