Merge #1352

1352: Run `uniffi-bindgen` command instead of depending on `uniffi_bindgen` crates r=messense a=messense `uniffi_bindgen` crate is too heavy weight and people uses `uniffi` usually have already installed uniffi-bindgen. Part of #1337, reduces `--no-default-features` compile time on M2 MacBook Air from 26.2s to 22.3s. Co-authored-by: messense <[email protected]>
PyO3 · Dec 13, 2022 · cdc3251 · cdc3251
2 parents e7b8c22 + 7d19d79
commit cdc3251
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 242 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -53,6 +53,7 @@ macos_arm64_task:
       - cat Cargo.lock
   install_script:
     - brew install python3
+    - python3 -m pip install uniffi-bindgen
   <<: *BUILD_AND_TEST
 
 linux_aarch64_task:
@@ -73,4 +74,6 @@ linux_aarch64_task:
     fingerprint_script:
       - echo $CIRRUS_OS
       - cat Cargo.lock
+  install_script:
+    - python3 -m pip install uniffi-bindgen
   <<: *BUILD_AND_TEST
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -132,7 +132,7 @@ jobs:
         if: ${{ !contains(matrix.python-version, 'pypy') }}
         run: pip install cffi
       - name: Install python packages
-        run: pip install virtualenv ziglang~=0.10.0 twine
+        run: pip install virtualenv ziglang~=0.10.0 twine uniffi-bindgen
       - uses: dtolnay/rust-toolchain@stable
         id: rustup
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,6 @@ glob = "0.3.0"
 cargo_metadata = "0.15.2"
 cargo-options = "0.5.2"
 cbindgen = { version = "0.24.2", default-features = false }
-uniffi_bindgen = "0.21.0"
 flate2 = "1.0.18"
 goblin = "0.6.0"
 platform-info = "1.0.0"
@@ -88,6 +87,7 @@ indoc = "1.0.3"
 pretty_assertions = "1.3.0"
 rustversion = "1.0.9"
 trycmd = "0.14.0"
+which = "4.3.0"
 
 [features]
 default = ["full", "rustls"]

diff --git a/Changelog.md b/Changelog.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * **Breaking Change**: Remove deprecated `sdist-include` option in `pyproject.toml` in [#1335](https://github.com/PyO3/maturin/pull/1335)
 * **Breaking Change**: Remove deprecated `python-source` option in `Cargo.toml` in [#1335](https://github.com/PyO3/maturin/pull/1335)
 * **Breaking Change**: Turn `patchelf` version warning into a hard error in [#1335](https://github.com/PyO3/maturin/pull/1335)
+* **Breaking Change**: [`uniffi_bindgen` CLI](https://mozilla.github.io/uniffi-rs/tutorial/Prerequisites.html#the-uniffi-bindgen-cli-tool) is required for building `uniffi` bindings wheels in [#1352](https://github.com/PyO3/maturin/pull/1352)
 * Allow Rust crate to be placed outside of the directory containing `pyproject.toml` in [#1347](https://github.com/PyO3/maturin/pull/1347)
 
 ## [0.14.5] - 2022-12-08