Skip to content

Commit e57cf77

Browse files
authored
Merge branch 'apache:main' into main
2 parents 97d8a32 + 59fffe3 commit e57cf77

Some content is hidden

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

78 files changed

+5348
-4630
lines changed

.asf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ github:
3838
required_approving_review_count: 1
3939

4040
required_linear_history: true
41+
del_branch_on_merge: true
4142
features:
4243
wiki: true
4344
issues: true

.codespellrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
[codespell]
18+
ignore-words-list = BoundIn,fo,MoR,NotIn,notIn,oT

.github/ISSUE_TEMPLATE/iceberg_bug_report.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ body:
2828
description: What Apache Iceberg version are you using?
2929
multiple: false
3030
options:
31-
- "0.8.0 (latest release)"
31+
- "0.8.1 (latest release)"
32+
- "0.8.0"
3233
- "0.7.1"
3334
- "0.7.0"
3435
- "0.6.1"

.github/workflows/check-md-link.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ name: Check Markdown links
2222
on:
2323
push:
2424
paths:
25-
- mkdocs/**
25+
- '.github/workflows/check-md-link.yml'
26+
- 'mkdocs/**'
2627
branches:
2728
- 'main'
2829
pull_request:
30+
paths:
31+
- '.github/workflows/check-md-link.yml'
32+
- 'mkdocs/**'
2933

3034
jobs:
3135
markdown-link-check:

.github/workflows/python-ci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,19 @@ on:
2424
branches:
2525
- 'main'
2626
pull_request:
27+
paths:
28+
- '**' # Include all files and directories in the repository by default.
29+
- '!.github/workflows/**' # Exclude all workflow files
30+
- '.github/workflows/python-ci.yml' # except the current file.
31+
- '!.github/ISSUE_TEMPLATE/**' # Exclude files and directories that don't impact tests or code like templates, metadata, and documentation.
32+
- '!.gitignore'
33+
- '!.asf.yml'
34+
- '!mkdocs/**'
35+
- '!.gitattributes'
36+
- '!README.md'
37+
- '!CONTRIBUTING.md'
38+
- '!LICENSE'
39+
- '!NOTICE'
2740

2841
concurrency:
2942
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/python-integration.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,19 @@ on:
2424
branches:
2525
- 'main'
2626
pull_request:
27+
paths:
28+
- '**' # Include all files and directories in the repository by default.
29+
- '!.github/workflows/**' # Exclude all workflow files
30+
- '.github/workflows/python-integration.yml' # except the current file.
31+
- '!.github/ISSUE_TEMPLATE/**' # Exclude files and directories that don't impact tests or code like templates, metadata, and documentation.
32+
- '!.gitignore'
33+
- '!.asf.yml'
34+
- '!mkdocs/**'
35+
- '!.gitattributes'
36+
- '!README.md'
37+
- '!CONTRIBUTING.md'
38+
- '!LICENSE'
39+
- '!NOTICE'
2740

2841
concurrency:
2942
group: ${{ github.workflow }}-${{ github.ref }}

.pre-commit-config.yaml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,19 @@ repos:
2828
- id: check-yaml
2929
- id: check-ast
3030
- repo: https://github.com/astral-sh/ruff-pre-commit
31-
# Ruff version (Used for linting)
32-
rev: v0.7.4
31+
rev: v0.8.6
3332
hooks:
3433
- id: ruff
35-
args: [ --fix, --exit-non-zero-on-fix, --preview ]
34+
args: [ --fix, --exit-non-zero-on-fix ]
3635
- id: ruff-format
37-
args: [ --preview ]
3836
- repo: https://github.com/pre-commit/mirrors-mypy
39-
rev: v1.8.0
37+
rev: v1.14.1
4038
hooks:
4139
- id: mypy
4240
args:
4341
[--install-types, --non-interactive, --config=pyproject.toml]
44-
- repo: https://github.com/hadialqattan/pycln
45-
rev: v2.4.0
46-
hooks:
47-
- id: pycln
48-
args: [--config=pyproject.toml]
4942
- repo: https://github.com/igorshubovych/markdownlint-cli
50-
rev: v0.42.0
43+
rev: v0.43.0
5144
hooks:
5245
- id: markdownlint
5346
args: ["--fix"]
@@ -69,6 +62,10 @@ repos:
6962
# --line-length is set to a high value to deal with very long lines
7063
- --line-length
7164
- '99999'
65+
- repo: https://github.com/codespell-project/codespell
66+
rev: v2.3.0
67+
hooks:
68+
- id: codespell
7269
ci:
7370
autofix_commit_msg: |
7471
[pre-commit.ci] auto fixes from pre-commit.com hooks

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ help: ## Display this help
2222
install-poetry: ## Install poetry if the user has not done that yet.
2323
@if ! command -v poetry &> /dev/null; then \
2424
echo "Poetry could not be found. Installing..."; \
25-
pip install --user poetry==1.8.4; \
25+
pip install --user poetry==1.8.5; \
2626
else \
2727
echo "Poetry is already installed."; \
2828
fi

dev/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,22 @@ ENV PYTHONPATH=$SPARK_HOME/python:$SPARK_HOME/python/lib/py4j-0.10.9.7-src.zip:$
3636
RUN mkdir -p ${HADOOP_HOME} && mkdir -p ${SPARK_HOME} && mkdir -p /home/iceberg/spark-events
3737
WORKDIR ${SPARK_HOME}
3838

39+
# Remember to also update `tests/conftest`'s spark setting
3940
ENV SPARK_VERSION=3.5.3
4041
ENV ICEBERG_SPARK_RUNTIME_VERSION=3.5_2.12
4142
ENV ICEBERG_VERSION=1.6.0
42-
ENV PYICEBERG_VERSION=0.8.0
43+
ENV PYICEBERG_VERSION=0.8.1
4344

44-
RUN curl --retry 3 -s -C - https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.tgz -o spark-${SPARK_VERSION}-bin-hadoop3.tgz \
45+
RUN curl --retry 5 -s -C - https://dlcdn.apache.org/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.tgz -o spark-${SPARK_VERSION}-bin-hadoop3.tgz \
4546
&& tar xzf spark-${SPARK_VERSION}-bin-hadoop3.tgz --directory /opt/spark --strip-components 1 \
4647
&& rm -rf spark-${SPARK_VERSION}-bin-hadoop3.tgz
4748

4849
# Download iceberg spark runtime
49-
RUN curl -s https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}/${ICEBERG_VERSION}/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar -Lo iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar \
50+
RUN curl --retry 5 -s https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}/${ICEBERG_VERSION}/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar -Lo iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar \
5051
&& mv iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar /opt/spark/jars
5152

5253
# Download AWS bundle
53-
RUN curl -s https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-aws-bundle/${ICEBERG_VERSION}/iceberg-aws-bundle-${ICEBERG_VERSION}.jar -Lo /opt/spark/jars/iceberg-aws-bundle-${ICEBERG_VERSION}.jar
54+
RUN curl --retry 5 -s https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-aws-bundle/${ICEBERG_VERSION}/iceberg-aws-bundle-${ICEBERG_VERSION}.jar -Lo /opt/spark/jars/iceberg-aws-bundle-${ICEBERG_VERSION}.jar
5455

5556
COPY spark-defaults.conf /opt/spark/conf
5657
ENV PATH="/opt/spark/sbin:/opt/spark/bin:${PATH}"

dev/docker-compose-azurite.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
version: "3"
1817

1918
services:
2019
azurite:

0 commit comments

Comments
 (0)