Skip to content

Commit a838a9c

Browse files
authored
Merge branch 'apache:main' into add-cwd-config-route
2 parents fe029fe + 0e5086c commit a838a9c

File tree

5 files changed

+1615
-1573
lines changed

5 files changed

+1615
-1573
lines changed

dev/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ 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

mkdocs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
mkdocs==1.6.1
1919
griffe==1.5.1
20-
jinja2==3.1.4
20+
jinja2==3.1.5
2121
mkdocstrings==0.27.0
2222
mkdocstrings-python==1.12.2
2323
mkdocs-literate-nav==0.6.1

0 commit comments

Comments
 (0)