diff --git a/repositories/hail/0.2.126--spark-3.4.0-patch/0001-spark-to-3.4.0.patch b/repositories/hail/0.2.126--spark-3.4.1-patch/0001-spark-to-3.4.1.patch similarity index 97% rename from repositories/hail/0.2.126--spark-3.4.0-patch/0001-spark-to-3.4.0.patch rename to repositories/hail/0.2.126--spark-3.4.1-patch/0001-spark-to-3.4.1.patch index bcf42db..24762e6 100644 --- a/repositories/hail/0.2.126--spark-3.4.0-patch/0001-spark-to-3.4.0.patch +++ b/repositories/hail/0.2.126--spark-3.4.1-patch/0001-spark-to-3.4.1.patch @@ -1,7 +1,7 @@ From ff5aa8bd5ae37d64ad9e37a45f76f6fcaced01c1 Mon Sep 17 00:00:00 2001 From: Alexis Lucattini Date: Fri, 1 Dec 2023 04:48:08 +0000 -Subject: [PATCH] spark-to-3.4.0 +Subject: [PATCH] spark-to-3.4.1 --- hail/build.gradle | 2 +- @@ -31,7 +31,7 @@ index 9f8492a2a..a4c11f8ea 100644 plotly>=5.5.0,<6 protobuf==3.20.2 -pyspark>=3.3.0,<3.4 -+pyspark==3.4.0,<3.5 ++pyspark==3.4.1,<3.5 requests>=2.25.1,<3 scipy>1.2,<1.12 diff --git a/hail/src/main/scala/is/hail/HailContext.scala b/hail/src/main/scala/is/hail/HailContext.scala diff --git a/repositories/hail/0.2.126--spark-3.4.0-patch/Dockerfile b/repositories/hail/0.2.126--spark-3.4.1-patch/Dockerfile similarity index 66% rename from repositories/hail/0.2.126--spark-3.4.0-patch/Dockerfile rename to repositories/hail/0.2.126--spark-3.4.1-patch/Dockerfile index f777150..1c6dbc6 100644 --- a/repositories/hail/0.2.126--spark-3.4.0-patch/Dockerfile +++ b/repositories/hail/0.2.126--spark-3.4.1-patch/Dockerfile @@ -2,7 +2,7 @@ FROM databricksruntime/python:13.3-LTS ARG HAIL_COMMIT_ID="5b718e1" # https://github.com/hail-is/hail/commit/5b718e1d3e1d72fad15cc57801601a6e35df41dd ARG SCALA_VERSION="2.12.0" -ARG SPARK_VERSION="3.4.0" +ARG SPARK_VERSION="3.4.1" ARG BREEZE_VERSION="2.1.0" RUN apt update -y && \ @@ -15,23 +15,26 @@ RUN apt update -y && \ liblapack3 \ git \ rsync \ - liblz4-dev && \ - pip3 install ipython + liblz4-dev -COPY 0001-spark-to-3.4.0.patch /root/0001-spark-to-3.4.0.patch +COPY 0001-spark-to-3.4.1.patch /root/0001-spark-to-3.4.1.patch RUN \ git clone "https://github.com/hail-is/hail.git" && \ ( \ cd hail && \ git checkout "${HAIL_COMMIT_ID}" && \ - git apply /root/0001-spark-to-3.4.0.patch && \ + git apply /root/0001-spark-to-3.4.1.patch && \ ( \ cd hail/ && \ + . /databricks/python3/bin/activate && \ make install \ HAIL_COMPILE_NATIVES=1 \ SCALA_VERSION="${SCALA_VERSION}" \ - SPARK_VERSION="${SPARK_VERSION}"\ + SPARK_VERSION="${SPARK_VERSION}"\ && \ + pip install markupsafe==2.0.1 \ ) \ ) && \ - rm /root/0001-spark-to-3.4.0.patch + rm -rf hail && \ + rm /root/0001-spark-to-3.4.1.patch + diff --git a/repositories/hail/0.2.126--spark-3.4.0-patch/Readme.md b/repositories/hail/0.2.126--spark-3.4.1-patch/Readme.md similarity index 100% rename from repositories/hail/0.2.126--spark-3.4.0-patch/Readme.md rename to repositories/hail/0.2.126--spark-3.4.1-patch/Readme.md