Skip to content

Commit d82e8c7

Browse files
authored
Merge branch 'main' into feature/implement-repartition-node-for-insert-into-datafusion
2 parents e16991f + 915778e commit d82e8c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3699
-787
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
uses: ./.github/actions/setup-builder
5959

6060
- name: Check License Header
61-
uses: apache/skywalking-eyes/header@v0.7.0
61+
uses: apache/skywalking-eyes/header@v0.8.0
6262

6363
- name: Check toml format
6464
run: make check-toml

.github/workflows/ci_typos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@v5
4444
- name: Check typos
45-
uses: crate-ci/typos@v1.36.3
45+
uses: crate-ci/typos@v1.38.1

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
if: github.repository_owner == 'apache'
3232
runs-on: ubuntu-22.04
3333
steps:
34-
- uses: actions/stale@v10.0.0
34+
- uses: actions/stale@v10.1.0
3535
with:
3636
stale-issue-label: 'stale'
3737
exempt-issue-labels: 'not-stale'

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ cargo 1.69.0 (6e9a83356 2023-04-12)
103103

104104
Currently, iceberg-rust uses Docker to set up environment for integration tests. Native Docker has some limitations, please check (https://github.com/apache/iceberg-rust/pull/748). Please use Orbstack or Podman.
105105

106-
For MacOS users, you can install [OrbStack as a docker alternative](reference/orbstack.md).
107-
For Podman users, refer to [Using Podman instead of Docker](reference/podman.md)
106+
For MacOS users, you can install [OrbStack as a docker alternative](website/src/reference/orbstack.md).
107+
For Podman users, refer to [Using Podman instead of Docker](website/src/reference/podman.md)
108108

109109
## Build
110110

Cargo.lock

Lines changed: 34 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,11 @@ futures = "0.3"
7676
hive_metastore = "0.2.0"
7777
http = "1.2"
7878
iceberg = { version = "0.7.0", path = "./crates/iceberg" }
79-
iceberg-catalog-rest = { version = "0.7.0", path = "./crates/catalog/rest" }
8079
iceberg-catalog-glue = { version = "0.7.0", path = "./crates/catalog/glue" }
81-
iceberg-catalog-s3tables = { version = "0.7.0", path = "./crates/catalog/s3tables" }
8280
iceberg-catalog-hms = { version = "0.7.0", path = "./crates/catalog/hms" }
81+
iceberg-catalog-sql = { version = "0.7.0", path = "./crates/catalog/sql" }
82+
iceberg-catalog-rest = { version = "0.7.0", path = "./crates/catalog/rest" }
83+
iceberg-catalog-s3tables = { version = "0.7.0", path = "./crates/catalog/s3tables" }
8384
iceberg-datafusion = { version = "0.7.0", path = "./crates/integrations/datafusion" }
8485
indicatif = "0.17"
8586
itertools = "0.13"
@@ -111,6 +112,7 @@ serde_repr = "0.1.16"
111112
serde_with = "3.4"
112113
smol = "2.0.2"
113114
sqllogictest = "0.28.3"
115+
sqlx = { version = "0.8.1", default-features = false }
114116
stacker = "0.1.20"
115117
strum = "0.27.2"
116118
tempfile = "3.18"

bindings/python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ include = [
4949
ignore = ["F403", "F405"]
5050

5151
[tool.hatch.envs.dev]
52-
dependencies = ["maturin>=1.0,<2.0", "pytest>=8.3.2", "datafusion==45.*", "pyiceberg[sql-sqlite,pyarrow]>=0.10.0", "fastavro>=1.11.1"]
52+
dependencies = ["maturin>=1.0,<2.0", "pytest>=8.3.2", "datafusion==45.*", "pyiceberg[sql-sqlite,pyarrow]>=0.10.0", "fastavro>=1.11.1", "pydantic<2.12.0"]
5353

5454
[tool.hatch.envs.dev.scripts]
5555
build = "maturin build --out dist --sdist"

0 commit comments

Comments
 (0)