Merge branch 'main' of https://github.com/Kaggle/docker-python into lsp-versions

Author: jplotts

Dockerfile.tmpl

@@ -270,7 +270,8 @@ RUN apt-get install -y libfreetype6-dev && \
 RUN pip install opencv-contrib-python opencv-python && \
     /tmp/clean-layer.sh
 
-RUN pip install scipy \
+# Pin scipy until we update JAX b/335003097
+RUN pip install scipy==1.12.0 \
         # Scikit-learn accelerated library for x86
         scikit-learn-intelex>=2023.0.1 \
         # HDF5 support

tests/test_geoviews.py

@@ -1,11 +1,12 @@
 import unittest
 
 import geoviews.feature as gf
-
+import holoviews as hv
 from cartopy import crs
 
 class TestGeoviews(unittest.TestCase):
     def test_viz(self):
+        hv.extension('matplotlib')
         (gf.ocean + gf.land + gf.ocean * gf.land * gf.coastline * gf.borders).options(
             'Feature', projection=crs.Geostationary(), global_extent=True
         ).cols(3)

tpu/Dockerfile

@@ -65,14 +65,10 @@ RUN pip install tensorflow_hub https://storage.googleapis.com/cloud-tpu-tpuvm-ar
     papermill jupyterlab python-lsp-server[all] "jupyter-lsp==1.5.1" \
     pandas matplotlib opencv-python-headless librosa accelerate diffusers scikit-learn transformers \
     seaborn timm albumentations einops pyarrow fastparquet opencv-python \
+    "keras>3" keras-cv keras-nlp \
     kagglehub && \
     /tmp/clean-layer.sh
 
-# b/318672157 Install Keras 3 for loading models.
-# We ignore dependencies for now since tf2.15 should work despite pip saying it won't.
-RUN pip install --no-dependencies "keras>3" keras-cv keras-nlp && \
-    /tmp/clean-layer.sh
-
 # Tensorflow libtpu:
 RUN curl --output /lib/libtpu.so https://storage.googleapis.com/cloud-tpu-tpuvm-artifacts/libtpu/${TF_LIBTPU_VERSION}/libtpu.so
 

tpu/config.txt

@@ -1,9 +1,10 @@
 BASE_IMAGE=python:3.10
 PYTHON_WHEEL_VERSION=cp310
 PYTHON_VERSION_PATH=python3.10
+# gsutil ls gs://cloud-tpu-tpuvm-artifacts/tensorflow
 # https://cloud.google.com/tpu/docs/supported-tpu-configurations#libtpu_versions
-TENSORFLOW_VERSION=2.15.0
-TF_LIBTPU_VERSION=1.9.0
+TENSORFLOW_VERSION=2.16.1
+TF_LIBTPU_VERSION=1.10.1
 TF_LINUX_WHEEL_VERSION=manylinux_2_17_x86_64.manylinux2014_x86_64
 JAX_VERSION=0.4.26
 # gsutil ls gs://pytorch-xla-releases/wheels/tpuvm/* | grep libtpu | grep -v -E ".*rc[0-9].*"