From b38e564785ccdad5f62ad670b0e340e06616dfe7 Mon Sep 17 00:00:00 2001
From: Jonathan Calderon Chavez <chavezcalderon@google.com>
Date: Wed, 13 Mar 2024 17:09:33 +0000
Subject: [PATCH 1/3] bad work

---
 Dockerfile.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index 29d25c78..232106ed 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE_REPO
+ARG BASE_IMAGE_REPOtpo
 ARG BASE_IMAGE_TAG
 ARG CPU_BASE_IMAGE_NAME
 ARG GPU_BASE_IMAGE_NAME
@@ -318,7 +318,6 @@ RUN pip install mpld3 \
         path.py \
         Geohash && \
     pip install deap \
-        tpot \
         scikit-optimize \
         haversine \
         toolz cytoolz \

From 9196e666553782b0a8adb470af8b5186f95ae644 Mon Sep 17 00:00:00 2001
From: Jonathan Calderon Chavez <chavezcalderon@google.com>
Date: Wed, 13 Mar 2024 17:09:36 +0000
Subject: [PATCH 2/3] Revert "bad work"

This reverts commit b38e564785ccdad5f62ad670b0e340e06616dfe7.
---
 Dockerfile.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index 232106ed..29d25c78 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE_REPOtpo
+ARG BASE_IMAGE_REPO
 ARG BASE_IMAGE_TAG
 ARG CPU_BASE_IMAGE_NAME
 ARG GPU_BASE_IMAGE_NAME
@@ -318,6 +318,7 @@ RUN pip install mpld3 \
         path.py \
         Geohash && \
     pip install deap \
+        tpot \
         scikit-optimize \
         haversine \
         toolz cytoolz \

From a72afb08dfc219d6eacc56287bf639631561f5b9 Mon Sep 17 00:00:00 2001
From: Jonathan Calderon Chavez <chavezcalderon@google.com>
Date: Wed, 13 Mar 2024 23:55:20 +0000
Subject: [PATCH 3/3] fix learntool x sklearn

---
 Dockerfile.tmpl | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
index 29d25c78..5b078767 100644
--- a/Dockerfile.tmpl
+++ b/Dockerfile.tmpl
@@ -190,7 +190,7 @@ RUN JAXVER=$(pip freeze | grep -e "^jax==") && \
     pip install --upgrade \
         "matplotlib<3.8.0" \
         seaborn \
-        python-dateutil dask igraph \
+        python-dateutil dask dask-expr igraph \
         pyyaml joblib husl geopy mne pyshp \
         pandas \
         polars \
@@ -269,8 +269,6 @@ RUN pip install opencv-contrib-python opencv-python && \
     /tmp/clean-layer.sh
 
 RUN pip install scipy \
-        # b/302136621 Fix eli5 import for learntools
-        "scikit-learn<1.3" \
         # Scikit-learn accelerated library for x86
         scikit-learn-intelex>=2023.0.1 \
         # HDF5 support
@@ -318,7 +316,8 @@ RUN pip install mpld3 \
         path.py \
         Geohash && \
     pip install deap \
-        tpot \
+        # b/302136621 Fix eli5 import for learntools, newer version require scikit-learn > 1.3
+        "tpot==0.12.1" \
         scikit-optimize \
         haversine \
         toolz cytoolz \
@@ -537,19 +536,21 @@ RUN pip install flashtext \
         s3fs \
         featuretools \
         #-e git+https://github.com/SohierDane/BigQuery_Helper#egg=bq_helper \
-        hpsklearn \
         git+https://github.com/Kaggle/learntools \
-        kmapper \
-        shap \
         ray \
         gym \
         pyarabic \
         pandasql \
+	# b/302136621 Fix eli5 import for learntools
+        scikit-learn==1.2.2 \
+	hpsklearn \
+        kmapper \
+        shap \
+        cesium \
+        rgf_python \
         jieba  \
         # ggplot is broken and main repo does not merge and release https://github.com/yhat/ggpy/pull/668
         https://github.com/hbasria/ggpy/archive/0.11.5.zip \
-        cesium \
-        rgf_python \
         tsfresh \
         pykalman \
         optuna \