Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update arrow2, arrow2_convert and polars #1189

Merged
merged 4 commits into from
Feb 11, 2023
Merged

Update arrow2, arrow2_convert and polars #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
beba193
Update arrow2, arrow2_convert and polars
emilk Feb 10, 2023
7f2623c
Patch arrow2-convert again
emilk Feb 10, 2023
ce0991d
Add instructions for how to patch crates to Cargo.toml
emilk Feb 10, 2023
1981e8b
Use trunk polars in patch
emilk Feb 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 76 additions & 33 deletions Cargo.lock
View file
Open in desktop

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

29 changes: 11 additions & 18 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ repository = "https://github.com/rerun-io/rerun"

[workspace.dependencies]
anyhow = "1.0"
arrow2 = "0.15"
arrow2_convert = "0.3"
arrow2 = "0.16"
arrow2_convert = "0.4"
comfy-table = { version = "6.1", default-features = false }
derive_more = "0.99"
ecolor = "0.21.0"
Expand All @@ -40,9 +40,9 @@ image = "0.24"
lazy_static = "1.4"
macaw = "0.18"
ndarray = "0.15"
polars-core = "0.26"
polars-lazy = "0.26"
polars-ops = "0.26"
polars-core = "0.27.1"
polars-lazy = "0.27.1"
polars-ops = "0.27.1"
puffin = "0.14"
reqwest = { version = "0.11", default-features = false }
thiserror = "1.0"
Expand All @@ -67,17 +67,10 @@ debug = true

[patch.crates-io]
# Try to avoid patching crates! It prevents us from publishing the crates on crates.io.
# Prefer to put the crate you want to patch under [workspace.dependencies] above, if possible.
# Of course, if the crates are used transitevly, that is not possible (e.g. polars uses arrow2).
# If you do patch always prefer to patch to a commit on the trunk of the upstream repo.
# If that is not possible, patch to a branch that has a PR open on the upstream repo.
# As a last resport, patch with a commit to our own repository.
# ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.

# Upstream PR https://github.com/jorgecarleitao/arrow2/pull/1360
arrow2 = { git = "https://github.com/rerun-io/arrow2", rev = "c6ef5e3dde4a18c35c8a1d91d9a741835be0305f" }
# Upstream PR https://github.com/DataEngineeringLabs/arrow2-convert/pull/91
arrow2_convert = { git = "https://github.com/rerun-io/arrow2-convert", rev = "7e63de5ce71741aaea3c36572d3e6831658ec3ed" }
# arrow2 = { path = "../arrow2" }
# arrow2_convert = { path = "../arrow2-convert/arrow2_convert" }

# 2023-10-12 - Alpha to coverage support for GLES
# wgpu = { git = "https://github.com/gfx-rs/wgpu.git", ref = "a377ae2b7fe6c1c9412751166f0917e617164e49" }
# wgpu-core = { git = "https://github.com/gfx-rs/wgpu.git", ref = "a377ae2b7fe6c1c9412751166f0917e617164e49" }
# wgpu = { path = "../wgpu/wgpu" }
# From 2023-02-11, includes the merge of https://github.com/DataEngineeringLabs/arrow2-convert/pull/98
arrow2_convert = { git = "https://github.com/DataEngineeringLabs/arrow2-convert", rev = "a270bb6da73afb20dba09f45ce27cd18ddf4838d" }