Skip to content

Commit

Permalink
Use workspace dependencies (apache#3936)
Browse files Browse the repository at this point in the history 
* Use workspace dependencies

* Fix rustfmt

* Fix pyarrow integration test
  • Loading branch information
@tustvold
tustvold authored Mar 30, 2023
1 parent e5a1676 commit 0f13a66
Show file tree
Hide file tree
Showing 24 changed files with 295 additions and 317 deletions.
33 changes: 33 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ members = [
"parquet_derive",
"parquet_derive_test",
]

# Enable the version 2 feature resolver, which avoids unifying features for targets that are not being built
#
# Critically this prevents dev-dependencies from enabling features even when not building a target that
Expand All @@ -54,3 +55,35 @@ resolver = "2"
# how it is compiled within the workspace, causing the whole workspace to be compiled from scratch
# this way, this is a stand-alone package that compiles independently of the others.
exclude = ["arrow-pyarrow-integration-testing"]

[workspace.package]
version = "36.0.0"
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = ["arrow"]
include = [
"benches/*.rs",
"src/**/*.rs",
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"

[workspace.dependencies]
arrow = { version = "36.0.0", path = "./arrow", default-features = false }
arrow-arith = { version = "36.0.0", path = "./arrow-arith" }
arrow-array = { version = "36.0.0", path = "./arrow-array" }
arrow-buffer = { version = "36.0.0", path = "./arrow-buffer" }
arrow-cast = { version = "36.0.0", path = "./arrow-cast" }
arrow-csv = { version = "36.0.0", path = "./arrow-csv" }
arrow-data = { version = "36.0.0", path = "./arrow-data" }
arrow-ipc = { version = "36.0.0", path = "./arrow-ipc" }
arrow-json = { version = "36.0.0", path = "./arrow-json" }
arrow-ord = { version = "36.0.0", path = "./arrow-ord" }
arrow-row = { version = "36.0.0", path = "./arrow-row" }
arrow-schema = { version = "36.0.0", path = "./arrow-schema" }
arrow-select = { version = "36.0.0", path = "./arrow-select" }
arrow-string = { version = "36.0.0", path = "./arrow-string" }
parquet = { version = "36.0.0", path = "./parquet", default-features = false }
30 changes: 13 additions & 17 deletions arrow-arith/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,27 @@

[package]
name = "arrow-arith"
version = "36.0.0"
version = { workspace = true }
description = "Arrow arithmetic kernels"
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = ["arrow"]
include = [
"benches/*.rs",
"src/**/*.rs",
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "arrow_arith"
path = "src/lib.rs"
bench = false

[dependencies]
arrow-array = { version = "36.0.0", path = "../arrow-array" }
arrow-buffer = { version = "36.0.0", path = "../arrow-buffer" }
arrow-data = { version = "36.0.0", path = "../arrow-data" }
arrow-schema = { version = "36.0.0", path = "../arrow-schema" }
arrow-array = { workspace = true }
arrow-buffer = { workspace = true }
arrow-data = { workspace = true }
arrow-schema = { workspace = true }
chrono = { version = "0.4.23", default-features = false }
half = { version = "2.1", default-features = false }
num = { version = "0.4", default-features = false, features = ["std"] }
Expand Down
28 changes: 12 additions & 16 deletions arrow-array/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@

[package]
name = "arrow-array"
version = "36.0.0"
version = { workspace = true }
description = "Array abstractions for Apache Arrow"
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = ["arrow"]
include = [
"benches/*.rs",
"src/**/*.rs",
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "arrow_array"
Expand All @@ -45,9 +41,9 @@ ahash = { version = "0.8", default-features = false, features = ["compile-time-r
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }

[dependencies]
arrow-buffer = { version = "36.0.0", path = "../arrow-buffer" }
arrow-schema = { version = "36.0.0", path = "../arrow-schema" }
arrow-data = { version = "36.0.0", path = "../arrow-data" }
arrow-buffer = { workspace = true }
arrow-schema = { workspace = true }
arrow-data = { workspace = true }
chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
chrono-tz = { version = "0.8", optional = true }
num = { version = "0.4", default-features = false, features = ["std"] }
Expand Down
22 changes: 9 additions & 13 deletions arrow-buffer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@

[package]
name = "arrow-buffer"
version = "36.0.0"
version = { workspace = true }
description = "Buffer abstractions for Apache Arrow"
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = ["arrow"]
include = [
"benches/*.rs",
"src/**/*.rs",
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "arrow_buffer"
Expand Down
32 changes: 14 additions & 18 deletions arrow-cast/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@

[package]
name = "arrow-cast"
version = "36.0.0"
version = { workspace = true }
description = "Cast kernel and utilities for Apache Arrow"
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = ["arrow"]
include = [
"benches/*.rs",
"src/**/*.rs",
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "arrow_cast"
Expand All @@ -44,11 +40,11 @@ features = ["prettyprint"]
prettyprint = ["comfy-table"]

[dependencies]
arrow-array = { version = "36.0.0", path = "../arrow-array" }
arrow-buffer = { version = "36.0.0", path = "../arrow-buffer" }
arrow-data = { version = "36.0.0", path = "../arrow-data" }
arrow-schema = { version = "36.0.0", path = "../arrow-schema" }
arrow-select = { version = "36.0.0", path = "../arrow-select" }
arrow-array = { workspace = true }
arrow-buffer = { workspace = true }
arrow-data = { workspace = true }
arrow-schema = { workspace = true }
arrow-select = { workspace = true }
chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
num = { version = "0.4", default-features = false, features = ["std"] }
lexical-core = { version = "^0.8", default-features = false, features = ["write-integers", "write-floats", "parse-integers", "parse-floats"] }
Expand Down
34 changes: 15 additions & 19 deletions arrow-csv/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,31 @@

[package]
name = "arrow-csv"
version = "36.0.0"
version = { workspace = true }
description = "Support for parsing CSV format into the Arrow format"
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = ["arrow"]
include = [
"benches/*.rs",
"src/**/*.rs",
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "arrow_csv"
path = "src/lib.rs"
bench = false

[dependencies]
arrow-array = { version = "36.0.0", path = "../arrow-array" }
arrow-buffer = { version = "36.0.0", path = "../arrow-buffer" }
arrow-cast = { version = "36.0.0", path = "../arrow-cast" }
arrow-data = { version = "36.0.0", path = "../arrow-data" }
arrow-schema = { version = "36.0.0", path = "../arrow-schema" }
arrow-array = { workspace = true }
arrow-buffer = { workspace = true }
arrow-cast = { workspace = true }
arrow-data = { workspace = true }
arrow-schema = { workspace = true }
chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
csv = { version = "1.1", default-features = false }
csv-core = { version = "0.1"}
csv-core = { version = "0.1" }
lazy_static = { version = "1.4", default-features = false }
lexical-core = { version = "^0.8", default-features = false }
regex = { version = "1.7.0", default-features = false, features = ["std", "unicode", "perf"] }
Expand Down
26 changes: 11 additions & 15 deletions arrow-data/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@

[package]
name = "arrow-data"
version = "36.0.0"
version = { workspace = true }
description = "Array data abstractions for Apache Arrow"
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
authors = ["Apache Arrow <[email protected]>"]
license = "Apache-2.0"
keywords = ["arrow"]
include = [
"benches/*.rs",
"src/**/*.rs",
"Cargo.toml",
]
edition = "2021"
rust-version = "1.62"
homepage = { workspace = true }
repository = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
keywords = { workspace = true }
include = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }

[lib]
name = "arrow_data"
Expand All @@ -50,8 +46,8 @@ features = ["ffi"]

[dependencies]

arrow-buffer = { version = "36.0.0", path = "../arrow-buffer" }
arrow-schema = { version = "36.0.0", path = "../arrow-schema" }
arrow-buffer = { workspace = true }
arrow-schema = { workspace = true }

num = { version = "0.4", default-features = false, features = ["std"] }
half = { version = "2.1", default-features = false }
Expand Down
26 changes: 13 additions & 13 deletions arrow-flight/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
[package]
name = "arrow-flight"
description = "Apache Arrow Flight"
version = "36.0.0"
edition = "2021"
rust-version = "1.62"
authors = ["Apache Arrow <[email protected]>"]
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
license = "Apache-2.0"
version = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }

[dependencies]
arrow-array = { version = "36.0.0", path = "../arrow-array" }
arrow-buffer = { version = "36.0.0", path = "../arrow-buffer" }
arrow-array = { workspace = true }
arrow-buffer = { workspace = true }
# Cast is needed to work around https://github.com/apache/arrow-rs/issues/3389
arrow-cast = { version = "36.0.0", path = "../arrow-cast" }
arrow-ipc = { version = "36.0.0", path = "../arrow-ipc" }
arrow-schema = { version = "36.0.0", path = "../arrow-schema" }
arrow-cast = { workspace = true }
arrow-ipc = { workspace = true }
arrow-schema = { workspace = true }
base64 = { version = "0.21", default-features = false, features = ["std"] }
tonic = { version = "0.8", default-features = false, features = ["transport", "codegen", "prost"] }
bytes = { version = "1", default-features = false }
Expand All @@ -58,7 +58,7 @@ tls = ["tonic/tls"]
cli = ["arrow-cast/prettyprint", "clap", "tracing-log", "tracing-subscriber", "tonic/tls-webpki-roots"]

[dev-dependencies]
arrow-cast = { version = "36.0.0", path = "../arrow-cast", features = ["prettyprint"] }
arrow-cast = { workspace = true, features = ["prettyprint"] }
assert_cmd = "2.0.8"
tempfile = "3.3"
tokio-stream = { version = "0.1", features = ["net"] }
Expand Down
12 changes: 6 additions & 6 deletions arrow-flight/gen/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
name = "gen"
description = "Code generation for arrow-flight"
version = "0.1.0"
edition = "2021"
rust-version = "1.62"
authors = ["Apache Arrow <[email protected]>"]
homepage = "https://github.com/apache/arrow-rs"
repository = "https://github.com/apache/arrow-rs"
license = "Apache-2.0"
edition = { workspace = true }
rust-version = { workspace = true }
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
license = { workspace = true }
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
Loading

0 comments on commit 0f13a66

Please sign in to comment.