Skip to content

Commit cc0ead3

Browse files
authored
ci(toml): check toml fmt (#2504)
## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123. --> - Closes #2503 ## What changes are included in this PR? <!-- Provide a summary of the modifications in this PR. List the main changes such as new features, bug fixes, refactoring, or any other updates. --> Taplo fmt check is added in `check-fmt` target in `Makefile`. Format all TOML files. ## Are these changes tested? <!-- Specify what test covers (unit test, integration test, etc.). If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> Yes.
1 parent 32cfbe0 commit cc0ead3

12 files changed

Lines changed: 74 additions & 48 deletions

File tree

.typos.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
extend-ignore-identifiers-re = ["^bimap$"]
2020

2121
[default.extend-words]
22-
ags = "ags"
2322
AGS = "AGS"
23+
ags = "ags"
2424

2525
[files]
2626
extend-exclude = ["**/testdata", "CHANGELOG.md"]

Cargo.toml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,14 @@ arrow-string = "58"
5656
as-any = "0.3.2"
5757
async-trait = "0.1.89"
5858
aws-config = "1.8.7"
59-
aws-sdk-glue = { version = "1.85", default-features = false, features = ["default-https-client", "rt-tokio"] }
60-
aws-sdk-s3tables = { version = "1.28", default-features = false, features = ["default-https-client", "rt-tokio"] }
59+
aws-sdk-glue = { version = "1.85", default-features = false, features = [
60+
"default-https-client",
61+
"rt-tokio",
62+
] }
63+
aws-sdk-s3tables = { version = "1.28", default-features = false, features = [
64+
"default-https-client",
65+
"rt-tokio",
66+
] }
6167
backon = "1.5.1"
6268
base64 = "0.22.1"
6369
bimap = "0.6"
@@ -74,6 +80,10 @@ dirs = "6"
7480
enum-ordinalize = "4.3.0"
7581
env_logger = "0.11.8"
7682
expect-test = "1"
83+
fastnum = { version = "0.7", default-features = false, features = [
84+
"std",
85+
"serde",
86+
] }
7787
faststr = "0.2.31"
7888
flate2 = "1.1.5"
7989
fnv = "1.0.7"
@@ -113,7 +123,6 @@ regex = "1.11.3"
113123
reqwest = { version = "0.12.12", default-features = false, features = ["json"] }
114124
roaring = { version = "0.11" }
115125
rstest = "0.26"
116-
fastnum = { version = "0.7", default-features = false, features = ["std", "serde"] }
117126
serde = { version = "1.0.219", features = ["rc"] }
118127
serde_bytes = "0.11.17"
119128
serde_derive = "1.0.219"
@@ -126,7 +135,10 @@ stacker = "0.1.20"
126135
strum = "0.27.2"
127136
tempfile = "3.18"
128137
thrift = "0.17.0"
129-
tokio = { version = "1.47", default-features = false, features = ["sync", "rt-multi-thread"] }
138+
tokio = { version = "1.47", default-features = false, features = [
139+
"sync",
140+
"rt-multi-thread",
141+
] }
130142
toml = "0.8"
131143
tracing = "0.1.41"
132144
tracing-subscriber = "0.3.20"

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ build:
2121
cargo build --all-targets --all-features --workspace
2222

2323
check-fmt:
24-
cargo fmt --all -- --check
24+
cargo fmt --all -- --check
2525

2626
check-clippy:
27-
cargo clippy --all-targets --all-features --workspace -- -D warnings
27+
cargo clippy --all-targets --all-features --workspace -- -D warnings
2828

2929
install-cargo-machete:
3030
cargo install cargo-machete@0.7.0
@@ -45,7 +45,7 @@ fix-toml: install-taplo-cli
4545
taplo fmt
4646

4747
check-toml: install-taplo-cli
48-
taplo check
48+
taplo fmt --check
4949

5050
NIGHTLY_VERSION := $(shell awk -F'"' '/^channel/ {print $$2}' rust-toolchain.toml)
5151
MSRV_VERSION := $(shell awk -F'"' '/^rust-version/ {print $$2}' Cargo.toml)

bindings/python/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ crate-type = ["cdylib"]
3232

3333
[dependencies]
3434
arrow = { version = "58", features = ["pyarrow", "chrono-tz"] }
35+
datafusion-ffi = "53.0.0"
3536
iceberg = { path = "../../crates/iceberg" }
36-
iceberg-storage-opendal = { path = "../../crates/storage/opendal", features = ["opendal-all"] }
37-
pyo3 = { version = "0.28", features = ["extension-module", "abi3-py310"] }
3837
iceberg-datafusion = { path = "../../crates/integrations/datafusion" }
39-
datafusion-ffi = "53.0.0"
38+
iceberg-storage-opendal = { path = "../../crates/storage/opendal", features = [
39+
"opendal-all",
40+
] }
41+
pyo3 = { version = "0.28", features = ["extension-module", "abi3-py310"] }
4042
tokio = { version = "1.46.1", default-features = false }
4143

4244
[profile.release]

bindings/python/pyproject.toml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,26 @@ classifiers = [
3333
"Programming Language :: Python :: 3.13",
3434
"Programming Language :: Rust",
3535
]
36+
dynamic = ["version"]
37+
license = { file = "LICENSE" }
3638
name = "pyiceberg-core"
3739
readme = "project-description.md"
3840
requires-python = ">=3.10,<4"
39-
dynamic = ["version"]
40-
license = { file = "LICENSE" }
4141

4242
[tool.maturin]
4343
features = ["pyo3/extension-module"]
44-
module-name = "pyiceberg_core.pyiceberg_core_rust"
45-
python-source = "python"
4644
include = [
47-
{ path = "LICENSE", format = ["sdist", "wheel"] },
48-
{ path = "NOTICE", format = ["sdist", "wheel"] }
45+
{ path = "LICENSE", format = [
46+
"sdist",
47+
"wheel",
48+
] },
49+
{ path = "NOTICE", format = [
50+
"sdist",
51+
"wheel",
52+
] },
4953
]
54+
module-name = "pyiceberg_core.pyiceberg_core_rust"
55+
python-source = "python"
5056

5157
[tool.ruff.lint]
5258
ignore = ["F403", "F405"]
@@ -60,15 +66,15 @@ filterwarnings = [
6066

6167
[dependency-groups]
6268
dev = [
63-
"maturin>=1.0,<2.0",
64-
"pytest>=8.3.2",
65-
"datafusion==52.*",
66-
# Set a PyIceberg lower bound; otherwise the resolver may select the
67-
# unrelated 0.0.2 stub.
68-
# Keep pyarrow direct because current pyiceberg[pyarrow] releases depend on
69-
# pyiceberg-core, which conflicts with this local pyiceberg-core project.
70-
"pyiceberg[sql-sqlite]>=0.11",
71-
"pyarrow>=17",
72-
"fastavro>=1.11.1",
73-
"huggingface_hub>=0.20",
69+
"maturin>=1.0,<2.0",
70+
"pytest>=8.3.2",
71+
"datafusion==52.*",
72+
# Set a PyIceberg lower bound; otherwise the resolver may select the
73+
# unrelated 0.0.2 stub.
74+
# Keep pyarrow direct because current pyiceberg[pyarrow] releases depend on
75+
# pyiceberg-core, which conflicts with this local pyiceberg-core project.
76+
"pyiceberg[sql-sqlite]>=0.11",
77+
"pyarrow>=17",
78+
"fastavro>=1.11.1",
79+
"huggingface_hub>=0.20",
7480
]

crates/catalog/loader/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ license = { workspace = true }
2929
repository = { workspace = true }
3030

3131
[dependencies]
32+
async-trait = { workspace = true }
3233
iceberg = { workspace = true }
33-
iceberg-catalog-rest = { workspace = true }
3434
iceberg-catalog-glue = { workspace = true }
35-
iceberg-catalog-s3tables = { workspace = true }
3635
iceberg-catalog-hms = { workspace = true }
36+
iceberg-catalog-rest = { workspace = true }
37+
iceberg-catalog-s3tables = { workspace = true }
3738
iceberg-catalog-sql = { workspace = true }
3839
tokio = { workspace = true }
39-
async-trait = { workspace = true }
4040

4141
[dev-dependencies]
42-
iceberg_test_utils = { path = "../../test_utils", features = ["tests"] }
4342
iceberg-storage-opendal = { workspace = true }
43+
iceberg_test_utils = { path = "../../test_utils", features = ["tests"] }
4444
reqwest = { workspace = true }
4545
rstest = { workspace = true }
4646
sqlx = { workspace = true, features = ["runtime-tokio", "sqlite", "migrate"] }

crates/catalog/s3tables/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
edition = { workspace = true }
2020
homepage = { workspace = true }
2121
name = "iceberg-catalog-s3tables"
22+
readme = "README.md"
2223
rust-version = { workspace = true }
2324
version = { workspace = true }
24-
readme = "README.md"
2525

2626
categories = ["database"]
2727
description = "Apache Iceberg Rust S3Tables Catalog"
@@ -37,7 +37,6 @@ aws-sdk-s3tables = { workspace = true }
3737
iceberg = { workspace = true }
3838
iceberg-storage-opendal = { workspace = true, features = ["opendal-s3"] }
3939

40-
4140
[dev-dependencies]
4241
arrow-array = { workspace = true }
4342
arrow-schema = { workspace = true }

crates/iceberg/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ repository = { workspace = true }
3131
[features]
3232
default = []
3333

34-
3534
[dependencies]
3635
aes-gcm = { workspace = true }
3736
anyhow = { workspace = true }
@@ -54,6 +53,7 @@ bytes = { workspace = true }
5453
chrono = { workspace = true }
5554
derive_builder = { workspace = true }
5655
expect-test = { workspace = true }
56+
fastnum = { workspace = true }
5757
flate2 = { workspace = true }
5858
fnv = { workspace = true }
5959
futures = { workspace = true }
@@ -66,7 +66,6 @@ parquet = { workspace = true, features = ["async", "encryption"] }
6666
rand = { workspace = true }
6767
reqwest = { workspace = true }
6868
roaring = { workspace = true }
69-
fastnum = { workspace = true }
7069
serde = { workspace = true }
7170
serde_bytes = { workspace = true }
7271
serde_derive = { workspace = true }
@@ -85,13 +84,13 @@ zstd = { workspace = true }
8584
[dev-dependencies]
8685
expect-test = { workspace = true }
8786
iceberg_test_utils = { path = "../test_utils", features = ["tests"] }
87+
minijinja = { workspace = true }
8888
mockall = { workspace = true }
8989
pretty_assertions = { workspace = true }
9090
rand = { workspace = true }
9191
regex = { workspace = true }
92-
tempfile = { workspace = true }
93-
minijinja = { workspace = true }
9492
serde_arrow = { version = "0.14", features = ["arrow-58"] }
93+
tempfile = { workspace = true }
9594

9695
[package.metadata.cargo-machete]
9796
# These dependencies are added to ensure minimal dependency version

crates/integration_tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ iceberg = { workspace = true }
3232
iceberg-catalog-rest = { workspace = true }
3333
iceberg-storage-opendal = { workspace = true, features = ["opendal-s3"] }
3434
iceberg_test_utils = { path = "../test_utils", features = ["tests"] }
35+
ordered-float = "2.10.1"
3536
parquet = { workspace = true }
3637
tokio = { workspace = true }
3738
uuid = { workspace = true }
38-
ordered-float = "2.10.1"

crates/sqllogictest/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ iceberg = { workspace = true }
3535
iceberg-datafusion = { workspace = true }
3636
indicatif = { workspace = true }
3737
log = { workspace = true }
38+
serde = { workspace = true }
3839
sqllogictest = { workspace = true }
40+
tokio = { workspace = true }
3941
toml = { workspace = true }
40-
serde = { workspace = true }
4142
tracing = { workspace = true }
42-
tokio = { workspace = true }
4343

4444
[dev-dependencies]
4545
libtest-mimic = { workspace = true }

0 commit comments

Comments
 (0)