Skip to content

Commit

Permalink
Fix rye build (#748)
Browse files Browse the repository at this point in the history
Fixes #695.

`rye build` failed when it tried to build the sdist to produce a wheel.
This failed because some _transitive_ workspace dependencies (e.g.
vortex-proto) were not present in the sdist.

The root cause appears to be a bug in maturin. I saw [a similar issue on
their
repo](PyO3/maturin#2117 (comment)).
I shared a branch with them that reproduces the behavior.

Until this issue is resolved, we can work around it by explicitly
depending on every workspace crate.

Two unrelated issues are also fixed here:

1. We must propagate the Rust toolchain to the sdist build environment.

2. `vortex-bytebool` was misnamed in the root Cargo.toml. I'm not sure
why this isn't a problem for other crates?
  • Loading branch information
danking authored Sep 5, 2024
1 parent 2f0a710 commit fa1833a
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 8 deletions.
9 changes: 9 additions & 0 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ uuid = "1.8.0"
vortex-alp = { version = "0.7.0", path = "./encodings/alp" }
vortex-array = { version = "0.7.0", path = "./vortex-array" }
vortex-buffer = { version = "0.7.0", path = "./vortex-buffer" }
vortex-byte-bool = { version = "0.7.0", path = "./encodings/byte-bool" }
vortex-bytebool = { version = "0.7.0", path = "./encodings/byte-bool" }
vortex-datafusion = { version = "0.7.0", path = "./vortex-datafusion" }
vortex-datetime-dtype = { version = "0.7.0", path = "./vortex-datetime-dtype" }
vortex-datetime-parts = { version = "0.7.0", path = "./encodings/datetime-parts" }
Expand Down
16 changes: 13 additions & 3 deletions pyvortex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,28 @@ paste = { workspace = true }
pyo3 = { workspace = true }
pyo3-log = { workspace = true }
tokio = { workspace = true, features = ["fs"] }

vortex-alp = { workspace = true }
vortex-array = { workspace = true }
vortex-buffer = { workspace = true }
vortex-bytebool = { workspace = true }
vortex-datafusion = { workspace = true }
vortex-datetime-dtype = { workspace = true }
vortex-datetime-parts = { workspace = true }
vortex-dict = { workspace = true }
vortex-dtype = { workspace = true }
vortex-dtype = { workspace = true, default-features = false }
vortex-error = { workspace = true }
vortex-expr = { workspace = true }
vortex-fastlanes = { workspace = true }
vortex-flatbuffers = { workspace = true }
vortex-fsst = { workspace = true }
vortex-proto = { workspace = true }
vortex-roaring = { workspace = true }
vortex-runend = { workspace = true }
vortex-runend-bool = { workspace = true }
vortex-scalar = { workspace = true, default-features = false }
vortex-serde = { workspace = true, default-features = false, features = ["tokio"] }
vortex-sampling-compressor = { workspace = true }
vortex-serde = { workspace = true, features = ["tokio"] }
vortex-scalar = { workspace = true }
vortex-zigzag = { workspace = true }
itertools = { workspace = true }

Expand Down
9 changes: 5 additions & 4 deletions pyvortex/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = [
{ name = "Nicholas Gates", email = "[email protected]" }
]
dependencies = [
"pydata-sphinx-theme>=0.15.4",
"pyarrow>=15.0.0",
]
requires-python = ">= 3.11"
classifiers = ["Private :: Do Not Upload"]
Expand All @@ -18,14 +18,15 @@ build-backend = "maturin"
[tool.rye]
managed = true
dev-dependencies = [
"pyarrow>=15.0.0",
"pip",
"sphinx>=8.0.2",
"ipython>=8.26.0",
"pandas>=2.2.2",
"pip",
"pydata-sphinx-theme>=0.15.4",
"sphinx>=8.0.2",
]

[tool.maturin]
python-source = "python"
module-name = "vortex._lib"
features = ["pyo3/extension-module"]
include = [{ path = "rust-toolchain.toml", format = "sdist" }]
1 change: 1 addition & 0 deletions pyvortex/rust-toolchain.toml

0 comments on commit fa1833a

Please sign in to comment.