From 8cc5837cfa38995e3829213ae8d40c9145910e96 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 24 Oct 2023 15:45:43 +0200 Subject: [PATCH] Update `arrow` and `pyo3` dependencies to latest versions --- Cargo.lock | 103 ++++++++++-------- Cargo.toml | 6 + apis/c/node/Cargo.toml | 2 +- apis/python/node/Cargo.toml | 6 +- apis/python/operator/Cargo.toml | 6 +- apis/rust/node/Cargo.toml | 4 +- apis/rust/operator/types/Cargo.toml | 2 +- binaries/daemon/Cargo.toml | 2 +- binaries/runtime/Cargo.toml | 8 +- libraries/arrow-convert/Cargo.toml | 2 +- .../extensions/ros2-bridge/python/Cargo.toml | 4 +- libraries/message/Cargo.toml | 4 +- 12 files changed, 82 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dd2dc32b..ebcb6f05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -136,9 +136,9 @@ checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc" [[package]] name = "arrow" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7104b9e9761613ae92fe770c741d6bbf1dbc791a0fe204400aebdd429875741" +checksum = "edb738d83750ec705808f6d44046d165e6bb8623f64e29a4d53fcb136ab22dfb" dependencies = [ "ahash", "arrow-arith", @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e597a8e8efb8ff52c50eaf8f4d85124ce3c1bf20fab82f476d73739d9ab1c2" +checksum = "c5c3d17fc5b006e7beeaebfb1d2edfc92398b981f82d9744130437909b72a468" dependencies = [ "arrow-array", "arrow-buffer", @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a86d9c1473db72896bd2345ebb6b8ad75b8553ba390875c76708e8dc5c5492d" +checksum = "55705ada5cdde4cb0f202ffa6aa756637e33fea30e13d8d0d0fd6a24ffcee1e3" dependencies = [ "ahash", "arrow-buffer", @@ -190,19 +190,20 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234b3b1c8ed00c874bf95972030ac4def6f58e02ea5a7884314388307fb3669b" +checksum = "a722f90a09b94f295ab7102542e97199d3500128843446ef63e410ad546c5333" dependencies = [ + "bytes", "half", "num", ] [[package]] name = "arrow-cast" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22f61168b853c7faea8cea23a2169fdff9c82fb10ae5e2c07ad1cab8f6884931" +checksum = "af01fc1a06f6f2baf31a04776156d47f9f31ca5939fe6d00cd7a059f95a46ff1" dependencies = [ "arrow-array", "arrow-buffer", @@ -217,9 +218,9 @@ dependencies = [ [[package]] name = "arrow-csv" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b545c114d9bf8569c84d2fbe2020ac4eea8db462c0a37d0b65f41a90d066fe" +checksum = "83cbbfde86f9ecd3f875c42a73d8aeab3d95149cd80129b18d09e039ecf5391b" dependencies = [ "arrow-array", "arrow-buffer", @@ -236,9 +237,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b6852635e7c43e5b242841c7470606ff0ee70eef323004cacc3ecedd33dd8f" +checksum = "d0a547195e607e625e7fafa1a7269b8df1a4a612c919efd9b26bd86e74538f3a" dependencies = [ "arrow-buffer", "arrow-schema", @@ -248,9 +249,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66da9e16aecd9250af0ae9717ae8dd7ea0d8ca5a3e788fe3de9f4ee508da751" +checksum = "e36bf091502ab7e37775ff448413ef1ffff28ff93789acb669fffdd51b394d51" dependencies = [ "arrow-array", "arrow-buffer", @@ -262,9 +263,9 @@ dependencies = [ [[package]] name = "arrow-json" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60ee0f9d8997f4be44a60ee5807443e396e025c23cf14d2b74ce56135cb04474" +checksum = "7ac346bc84846ab425ab3c8c7b6721db90643bc218939677ed7e071ccbfb919d" dependencies = [ "arrow-array", "arrow-buffer", @@ -282,9 +283,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcab05410e6b241442abdab6e1035177dc082bdb6f17049a4db49faed986d63" +checksum = "4502123d2397319f3a13688432bc678c61cb1582f2daa01253186da650bf5841" dependencies = [ "arrow-array", "arrow-buffer", @@ -297,9 +298,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a847dd9eb0bacd7836ac63b3475c68b2210c2c96d0ec1b808237b973bd5d73" +checksum = "249fc5a07906ab3f3536a6e9f118ec2883fbcde398a97a5ba70053f0276abda4" dependencies = [ "ahash", "arrow-array", @@ -312,9 +313,9 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54df8c47918eb634c20e29286e69494fdc20cafa5173eb6dad49c7f6acece733" +checksum = "9d7a8c3f97f5ef6abd862155a6f39aaba36b029322462d72bbcfa69782a50614" dependencies = [ "bitflags 2.4.0", "serde", @@ -322,10 +323,11 @@ dependencies = [ [[package]] name = "arrow-select" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941dbe481da043c4bd40c805a19ec2fc008846080c4953171b62bcad5ee5f7fb" +checksum = "f868f4a5001429e20f7c1994b5cd1aa68b82e3db8cf96c559cdb56dc8be21410" dependencies = [ + "ahash", "arrow-array", "arrow-buffer", "arrow-data", @@ -335,9 +337,9 @@ dependencies = [ [[package]] name = "arrow-string" -version = "45.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359b2cd9e071d5a3bcf44679f9d85830afebc5b9c98a08019a570a65ae933e0f" +checksum = "a27fdf8fc70040a2dee78af2e217479cb5b263bd7ab8711c7999e74056eb688a" dependencies = [ "arrow-array", "arrow-buffer", @@ -346,7 +348,7 @@ dependencies = [ "arrow-select", "num", "regex", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -2508,9 +2510,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.9" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inotify" @@ -4070,9 +4072,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" dependencies = [ "cfg-if 1.0.0", "eyre", @@ -4089,9 +4091,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" dependencies = [ "once_cell", "target-lexicon", @@ -4099,9 +4101,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" dependencies = [ "libc", "pyo3-build-config", @@ -4109,32 +4111,33 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" dependencies = [ + "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "pythonize" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e35b716d430ace57e2d1b4afb51c9e5b7c46d2bce72926e07f9be6a98ced03e" +checksum = "ffd1c3ef39c725d63db5f9bc455461bafd80540cb7824c61afb823501921a850" dependencies = [ "pyo3", "serde", @@ -4356,6 +4359,12 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + [[package]] name = "reqwest" version = "0.11.22" @@ -5668,9 +5677,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "uninit" diff --git a/Cargo.toml b/Cargo.toml index c9621572..cd8a6fa5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,6 +58,12 @@ dora-daemon = { version = "0.2.6", path = "binaries/daemon" } dora-coordinator = { version = "0.2.6", path = "binaries/coordinator" } dora-ros2-bridge = { path = "libraries/extensions/ros2-bridge" } dora-ros2-bridge-python = { path = "libraries/extensions/ros2-bridge/python" } +arrow = "48.0.0" +arrow-schema = "48.0.0" +arrow-data = "48.0.0" +arrow-array = "48.0.0" +pyo3 = "0.20.0" +pythonize = "0.20.0" [package] name = "dora-examples" diff --git a/apis/c/node/Cargo.toml b/apis/c/node/Cargo.toml index 22c03512..f5346dda 100644 --- a/apis/c/node/Cargo.toml +++ b/apis/c/node/Cargo.toml @@ -21,7 +21,7 @@ tracing = ["dora-node-api/tracing"] eyre = "0.6.8" flume = "0.10.14" tracing = "0.1.33" -arrow-array = "45.0.0" +arrow-array = { workspace = true } [dependencies.dora-node-api] workspace = true diff --git a/apis/python/node/Cargo.toml b/apis/python/node/Cargo.toml index 229d8d9a..71bc9a10 100644 --- a/apis/python/node/Cargo.toml +++ b/apis/python/node/Cargo.toml @@ -16,13 +16,13 @@ telemetry = ["dora-runtime/telemetry"] [dependencies] dora-node-api = { workspace = true } dora-operator-api-python = { workspace = true } -pyo3 = { version = "0.19", features = ["eyre", "abi3-py37"] } +pyo3 = { workspace = true, features = ["eyre", "abi3-py37"] } eyre = "0.6" serde_yaml = "0.8.23" flume = "0.10.14" dora-runtime = { workspace = true, features = ["tracing", "python"] } -arrow = { version = "45.0.0", features = ["pyarrow"] } -pythonize = "0.19.0" +arrow = { workspace = true, features = ["pyarrow"] } +pythonize = { workspace = true } futures = "0.3.28" dora-ros2-bridge-python = { workspace = true } diff --git a/apis/python/operator/Cargo.toml b/apis/python/operator/Cargo.toml index 897e8693..1ddd00aa 100644 --- a/apis/python/operator/Cargo.toml +++ b/apis/python/operator/Cargo.toml @@ -11,9 +11,9 @@ license.workspace = true [dependencies] dora-node-api = { workspace = true } -pyo3 = { version = "0.19", features = ["eyre", "abi3-py37"] } +pyo3 = { workspace = true, features = ["eyre", "abi3-py37"] } eyre = "0.6" serde_yaml = "0.8.23" flume = "0.10.14" -arrow = { version = "45.0.0", features = ["pyarrow"] } -arrow-schema = "45.0.0" +arrow = { workspace = true, features = ["pyarrow"] } +arrow-schema = { workspace = true } diff --git a/apis/rust/node/Cargo.toml b/apis/rust/node/Cargo.toml index 698f4f65..1ecb41b1 100644 --- a/apis/rust/node/Cargo.toml +++ b/apis/rust/node/Cargo.toml @@ -26,8 +26,8 @@ capnp = "0.14.11" bincode = "1.3.3" shared_memory_extended = "0.13.0" dora-tracing = { workspace = true, optional = true } -arrow = "45.0.0" -arrow-schema = "45.0.0" +arrow = { workspace = true } +arrow-schema = { workspace = true } futures = "0.3.28" futures-concurrency = "7.3.0" dora-arrow-convert = { workspace = true } diff --git a/apis/rust/operator/types/Cargo.toml b/apis/rust/operator/types/Cargo.toml index 919de908..499a02ed 100644 --- a/apis/rust/operator/types/Cargo.toml +++ b/apis/rust/operator/types/Cargo.toml @@ -9,7 +9,7 @@ license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -arrow = { version = "45.0.0", features = ["ffi"] } +arrow = { workspace = true, features = ["ffi"] } dora-arrow-convert = { workspace = true } [dependencies.safer-ffi] diff --git a/binaries/daemon/Cargo.toml b/binaries/daemon/Cargo.toml index 222de656..3644018b 100644 --- a/binaries/daemon/Cargo.toml +++ b/binaries/daemon/Cargo.toml @@ -37,4 +37,4 @@ shared-memory-server = { workspace = true } ctrlc = "3.2.5" bincode = "1.3.3" async-trait = "0.1.64" -arrow-schema = "45.0.0" +arrow-schema = { workspace = true } diff --git a/binaries/runtime/Cargo.toml b/binaries/runtime/Cargo.toml index ecacef96..a4bfe700 100644 --- a/binaries/runtime/Cargo.toml +++ b/binaries/runtime/Cargo.toml @@ -28,16 +28,16 @@ serde_yaml = "0.8.23" tokio = { version = "1.24.2", features = ["full"] } tokio-stream = "0.1.8" # pyo3-abi3 flag allow simpler linking. See: https://pyo3.rs/v0.13.2/building_and_distribution.html -pyo3 = { version = "0.19", features = ["eyre", "abi3-py37"], optional = true } +pyo3 = { workspace = true, features = ["eyre", "abi3-py37"], optional = true } tracing = "0.1.36" tracing-subscriber = "0.3.15" dora-download = { workspace = true } flume = "0.10.14" clap = { version = "4.0.3", features = ["derive"] } tracing-opentelemetry = { version = "0.18.0", optional = true } -pythonize = { version = "0.19.0", optional = true } -arrow-schema = "45.0.0" -arrow = { version = "45.0.0", features = ["ffi"] } +pythonize = { workspace = true, optional = true } +arrow-schema = { workspace = true } +arrow = { workspace = true, features = ["ffi"] } [features] default = ["tracing"] diff --git a/libraries/arrow-convert/Cargo.toml b/libraries/arrow-convert/Cargo.toml index e6fe0973..8307d72f 100644 --- a/libraries/arrow-convert/Cargo.toml +++ b/libraries/arrow-convert/Cargo.toml @@ -9,5 +9,5 @@ license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -arrow = { version = "45.0.0" } +arrow = { workspace = true } eyre = "0.6.8" diff --git a/libraries/extensions/ros2-bridge/python/Cargo.toml b/libraries/extensions/ros2-bridge/python/Cargo.toml index 2b06a593..8c07908f 100644 --- a/libraries/extensions/ros2-bridge/python/Cargo.toml +++ b/libraries/extensions/ros2-bridge/python/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] dora-ros2-bridge = { path = "..", default-features = false } dora-ros2-bridge-msg-gen = { path = "../msg-gen" } -pyo3 = { version = "0.19", features = ["eyre", "abi3-py37", "serde"] } +pyo3 = { workspace = true, features = ["eyre", "abi3-py37", "serde"] } eyre = "0.6" serde = "1.0.166" flume = "0.10.14" -arrow = { version = "45.0.0", features = ["pyarrow"] } +arrow = { workspace = true, features = ["pyarrow"] } futures = "0.3.28" diff --git a/libraries/message/Cargo.toml b/libraries/message/Cargo.toml index 02793e7a..a9dd3c04 100644 --- a/libraries/message/Cargo.toml +++ b/libraries/message/Cargo.toml @@ -10,8 +10,8 @@ license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -arrow-data = { version = "45.0.0" } +arrow-data = { workspace = true } uhlc = "0.5.1" serde = { version = "1.0.136", features = ["derive"] } eyre = "0.6.8" -arrow-schema = { version = "45.0.0", features = ["serde"] } +arrow-schema = { workspace = true, features = ["serde"] }