Skip to content

Commit

Permalink
Bump pyo3-arrow to pyo3 0.23 (#265)
Browse files Browse the repository at this point in the history
* separate crate deps

* fix numpy version

* fix half dep

* Bump pyo3-arrow to 0.23

* Bump numpy

* update ci

* comment out assert
  • Loading branch information
kylebarron authored Dec 4, 2024
1 parent 5e44778 commit 54b2526
Show file tree
Hide file tree
Showing 24 changed files with 426 additions and 354 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ jobs:
cargo test --all
cargo test --all --all-features
check-features:
check-features_pyo3_arrow:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
args:
- "-p pyo3-arrow --no-default-features"
- "--no-default-features"
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Test
run: cargo check ${{ matrix.args }}
run: cd pyo3-arrow && cargo check ${{ matrix.args }}
20 changes: 17 additions & 3 deletions Cargo.lock

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

20 changes: 14 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
[workspace]
members = ["arro3-compute", "arro3-core", "arro3-io", "pyo3-arrow"]
members = ["arro3-compute", "arro3-core", "arro3-io"]
# Note: we exclude pyo3-arrow from the top-level workspace because we have a
# circular dependency. pyo3-arrow is depended on by obstore to return arrow
# results as a list, which is depended on by arro3-io. This makes it hard to
# upgrade versions.
exclude = ["pyo3-arrow"]
resolver = "2"

[workspace.package]
Expand All @@ -26,15 +31,18 @@ arrow-select = "53"
bytes = "1.7.0"
half = "2"
indexmap = "2"
numpy = "0.22"
# numpy = "0.22"
numpy = { git = "https://github.com/PyO3/rust-numpy", rev = "b34bc295414015931d6c7bd5350cab2c6c829d6e" }
object_store = "0.11"
parquet = "53"
pyo3 = { version = "0.22", features = ["macros", "indexmap"] }
pyo3-async-runtimes = { git = "https://github.com/PyO3/pyo3-async-runtimes", features = [
"tokio-runtime",
] }
pyo3-arrow = "0.5.1"
# pyo3-arrow = { path = "./pyo3-arrow" }
pyo3-async-runtimes = { version = "0.22", features = ["tokio-runtime"] }
pyo3-file = "0.9"
thiserror = "1"
# pyo3-file = { git = "https://github.com/kylebarron/pyo3-file", rev = "9a87908478538f06642b562547a27450d8c79b05" }
pyo3-object_store = { git = "https://github.com/developmentseed/object-store-rs", rev = "0e48ce2c057ab5cd4f44d7d2816fa01e8802bce2" }
thiserror = "1.0.63"

[profile.release]
lto = true
Expand Down
2 changes: 1 addition & 1 deletion arro3-compute/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ arrow-schema = { workspace = true }
arrow-select = { workspace = true }
arrow = { workspace = true, features = ["ffi"] }
pyo3 = { workspace = true }
pyo3-arrow = { path = "../pyo3-arrow" }
pyo3-arrow = { workspace = true }
thiserror = { workspace = true }
2 changes: 1 addition & 1 deletion arro3-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ crate-type = ["cdylib"]
arrow-array = { workspace = true }
arrow-buffer = { workspace = true }
arrow-schema = { workspace = true }
pyo3-arrow = { path = "../pyo3-arrow" }
pyo3-arrow = { workspace = true }
pyo3 = { workspace = true }
2 changes: 1 addition & 1 deletion arro3-io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ futures = { version = "0.3.30", optional = true }
object_store = { workspace = true, optional = true }
parquet = { workspace = true }
pyo3 = { workspace = true }
pyo3-arrow = { path = "../pyo3-arrow" }
pyo3-arrow = { workspace = true }
pyo3-async-runtimes = { workspace = true, features = [
"tokio-runtime",
], optional = true }
Expand Down
Loading

0 comments on commit 54b2526

Please sign in to comment.