Skip to content

Commit 9eddc8d

Browse files
kevinjqliuCopilot
andcommitted
Bump integration infra to Iceberg 1.12.0 and Spark 4.1.3
Also bump hadoop-aws, AWS SDK, Hive metastore client, aws-cli, and pyspark. Hive 4.2 moved IMetaStoreClient into the new hive-standalone-metastore-client artifact, so download it as well. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent ea139cc commit 9eddc8d

5 files changed

Lines changed: 51 additions & 49 deletions

File tree

‎dev/docker-compose-integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ services:
8585
retries: 10
8686
start_period: 5s
8787
aws-cli:
88-
image: amazon/aws-cli:2.37.2
88+
image: amazon/aws-cli:2.38.5
8989
container_name: pyiceberg-aws-cli
9090
networks:
9191
iceberg_net:

‎dev/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ services:
3333
retries: 10
3434
start_period: 5s
3535
aws-cli:
36-
image: amazon/aws-cli:2.37.2
36+
image: amazon/aws-cli:2.38.5
3737
container_name: pyiceberg-aws-cli
3838
depends_on:
3939
object-store:

‎dev/spark/Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
ARG BASE_IMAGE_SPARK_VERSION=4.0.1
16+
ARG BASE_IMAGE_SPARK_VERSION=4.1.3
1717

1818
FROM apache/spark:${BASE_IMAGE_SPARK_VERSION}
1919

2020
# Dependency versions - keep these compatible
2121
# Changing these will invalidate the JAR download cache layer
22-
ARG ICEBERG_VERSION=1.11.0
23-
ARG ICEBERG_SPARK_RUNTIME_VERSION=4.0_2.13
24-
ARG HADOOP_VERSION=3.4.1
25-
ARG AWS_SDK_VERSION=2.24.6
26-
ARG HIVE_METASTORE_VERSION=4.0.1
22+
ARG ICEBERG_VERSION=1.12.0
23+
ARG ICEBERG_SPARK_RUNTIME_VERSION=4.1_2.13
24+
ARG HADOOP_VERSION=3.4.2
25+
ARG AWS_SDK_VERSION=2.57.3
26+
ARG HIVE_METASTORE_VERSION=4.2.1
2727
ARG MAVEN_MIRROR=https://repo.maven.apache.org/maven2
2828

2929
USER root
@@ -51,6 +51,7 @@ RUN set -e && \
5151
"org/apache/iceberg/iceberg-aws-bundle/${ICEBERG_VERSION}/iceberg-aws-bundle-${ICEBERG_VERSION}.jar" \
5252
"org/apache/hadoop/hadoop-aws/${HADOOP_VERSION}/hadoop-aws-${HADOOP_VERSION}.jar" \
5353
"org/apache/hive/hive-standalone-metastore-common/${HIVE_METASTORE_VERSION}/hive-standalone-metastore-common-${HIVE_METASTORE_VERSION}.jar" \
54+
"org/apache/hive/hive-standalone-metastore-client/${HIVE_METASTORE_VERSION}/hive-standalone-metastore-client-${HIVE_METASTORE_VERSION}.jar" \
5455
"software/amazon/awssdk/bundle/${AWS_SDK_VERSION}/bundle-${AWS_SDK_VERSION}.jar"; \
5556
do \
5657
jar_name=$(basename "${jar_path}") && \

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ dev = [
116116
"moto[server]>=5.0.2",
117117
"typing-extensions==4.16.0",
118118
"pytest-mock==3.15.1",
119-
"pyspark[connect]==4.0.1",
119+
"pyspark[connect]==4.1.3",
120120
"protobuf==7.36.2", # match Spark Connect's gencode
121121
"cython>=3.0.0",
122122
"deptry>=0.14",
@@ -258,7 +258,7 @@ filterwarnings = [
258258
"ignore:subprocess.*is still running:ResourceWarning",
259259
# Ignore google-crc32c C extension missing warning (common on Python 3.14+)
260260
"ignore:As the c extension couldn't be imported:RuntimeWarning:google_crc32c",
261-
# Ignore Spark 4.0.1 pandas conversion warning under pandas 3.0
261+
# Ignore Spark pandas conversion warning under pandas 3.0
262262
"ignore:The copy keyword is deprecated and will be removed in a future version.*",
263263
]
264264

‎uv.lock‎

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

0 commit comments

Comments
 (0)