Merge branch 'main' into field_ids

Author: mbutrovich

.asf.yaml

@@ -40,7 +40,7 @@ github:
 
       required_pull_request_reviews:
         required_approving_review_count: 1
-        dismiss_stale_reviews: true
+        dismiss_stale_reviews: false
 
       required_linear_history: true
   del_branch_on_merge: true

.github/workflows/bindings_python_ci.yml

@@ -56,17 +56,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version: "0.9.3"
+          enable-cache: true
       - name: Install tools
         run: |
-          pip install ruff
+          uv tool install ruff
       - name: Check format
         working-directory: "bindings/python"
         run: |
-          ruff format . --diff
+          uvx ruff format . --diff
       - name: Check style
         working-directory: "bindings/python"
         run: |
-          ruff check .
+          uvx ruff check .
 
   test:
     runs-on: ${{ matrix.os }}
@@ -80,17 +84,28 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: 3.12
       - uses: PyO3/maturin-action@v1
         with:
           working-directory: "bindings/python"
           command: build
           args: --out dist --sdist
+      - uses: astral-sh/setup-uv@v6
+        with:
+          version: "0.9.3"
+          enable-cache: true
+      - name: Sync dependencies
+        working-directory: "bindings/python"
+        shell: bash
+        run: |
+          make install
+      - name: Install built wheel
+        working-directory: "bindings/python"
+        shell: bash
+        run: |
+          uv pip install --reinstall dist/pyiceberg_core-*.whl
       - name: Run tests
         working-directory: "bindings/python"
         shell: bash
         run: |
-          set -e
-          pip install hatch==1.14.2
-          hatch run dev:pip install dist/pyiceberg_core-*.whl --force-reinstall
-          hatch run dev:test
+          make test

.licenserc.yaml

@@ -21,16 +21,17 @@ header:
     copyright-owner: Apache Software Foundation
 
   paths-ignore:
-    - 'LICENSE'
-    - 'NOTICE'
-    - '.gitattributes'
-    - '**/*.json'
+    - "LICENSE"
+    - "NOTICE"
+    - ".gitattributes"
+    - "**/*.json"
     # Generated content by mdbook
-    - 'website/book'
+    - "website/book"
     # Generated content by scripts
-    - '**/DEPENDENCIES.*.tsv'
+    - "**/DEPENDENCIES.*.tsv"
     # Release distributions
-    - 'dist/*'
-    - 'Cargo.lock'
-    - '.github/PULL_REQUEST_TEMPLATE.md'
+    - "dist/*"
+    - "Cargo.lock"
+    - "bindings/python/uv.lock"
+    - ".github/PULL_REQUEST_TEMPLATE.md"
   comment: on-failure

Makefile

@@ -45,10 +45,7 @@ NIGHTLY_VERSION := $(shell awk -F'"' '/^channel/ {print $$2}' rust-toolchain.tom
 MSRV_VERSION    := $(shell awk -F'"' '/^rust-version/ {print $$2}' Cargo.toml)
 
 check-msrv:
-	@set -e; \
-	trap 'git restore Cargo.lock' EXIT; \
-	cargo +$(NIGHTLY_VERSION) generate-lockfile -Z direct-minimal-versions; \
-	cargo +$(MSRV_VERSION) check --locked --workspace
+	cargo +$(MSRV_VERSION) check --workspace
 
 check: check-fmt check-clippy check-toml cargo-machete
 

bindings/python/Makefile

@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+install:
+	uv sync --group dev --no-install-project
+
+build:
+	uv run maturin develop
+
+test:
+	uv run --no-sync pytest

bindings/python/README.md

@@ -23,22 +23,26 @@ This project is used to build an Iceberg-rust powered core for [PyIceberg](https
 
 ## Setup
 
-Install Hatch:
+Install [uv](https://docs.astral.sh/uv/getting-started/installation/):
 
 ```shell
-pip install hatch==1.12.0
+pip install uv==0.9.3
 ```
 
-Hatch uses [uv](https://docs.astral.sh/uv/) as a backend by default, so [make sure that it is installed](https://docs.astral.sh/uv/getting-started/installation/) as well.
+Set up the development environment:
+
+```shell
+make install
+```
 
 ## Build
 
 ```shell
-hatch run dev:develop
+make build
 ```
 
 ## Test
 
 ```shell
-hatch run dev:test
+make test
 ```

bindings/python/pyproject.toml

@@ -25,14 +25,13 @@ classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: Apache Software License",
   "Operating System :: OS Independent",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
 ]
 name = "pyiceberg-core"
 readme = "project-description.md"
-requires-python = "~=3.9"
+requires-python = ">=3.10,<3.13"
 dynamic = ["version"]
 license = { file = "LICENSE" }
 
@@ -48,10 +47,11 @@ include = [
 [tool.ruff.lint]
 ignore = ["F403", "F405"]
 
-[tool.hatch.envs.dev]
-dependencies = ["maturin>=1.0,<2.0", "pytest>=8.3.2", "datafusion==50.*", "pyiceberg[sql-sqlite,pyarrow]>=0.10.0", "fastavro>=1.11.1"]
-
-[tool.hatch.envs.dev.scripts]
-build = "maturin build --out dist --sdist"
-develop = "maturin develop"
-test = "pytest"
+[dependency-groups]
+dev = [
+    "maturin>=1.0,<2.0",
+    "pytest>=8.3.2",
+    "datafusion==50.*",
+    "pyiceberg[sql-sqlite,pyarrow] @ git+https://github.com/apache/iceberg-python.git@d3eb149fe99b14e714a06e727b69cd617c6c052d",
+    "fastavro>=1.11.1",
+]