From 62bf14a99f57ab16fc83b3cdf2bd9252c5c7288c Mon Sep 17 00:00:00 2001
From: Oksana Shadura <ksu.shadura@gmail.com>
Date: Thu, 27 Jun 2024 14:10:07 +0200
Subject: [PATCH 1/3] Add python 3.12

---
 .github/workflows/gh-ci.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml
index e6179da..97efd86 100644
--- a/.github/workflows/gh-ci.yaml
+++ b/.github/workflows/gh-ci.yaml
@@ -25,7 +25,7 @@ jobs:
       matrix:
         image_dir: [coffea-base, coffea-dask]
         distro: [almalinux8, almalinux9]
-        python: ["3.9", "3.10", "3.11"]
+        python: ["3.9", "3.10", "3.11", "3.12"]
         exclude:
           - distro: almalinux8
             python: 3.9
@@ -33,6 +33,8 @@ jobs:
             python: 3.9
           - image_dir: coffea-base
             python: 3.11
+          - image_dir: coffea-base
+            python: 3.12
     name: ${{ matrix.image_dir }}-${{ matrix.distro }}-${{ matrix.python }}
     runs-on: ubuntu-latest
     permissions:

From 4c181564ed501c1f26b93390db1ef6278fb7b45e Mon Sep 17 00:00:00 2001
From: Oksana Shadura <ksu.shadura@gmail.com>
Date: Thu, 27 Jun 2024 16:13:16 +0200
Subject: [PATCH 2/3] Try to remove xgboost to check if it breaks mamba build

---
 coffea-dask/environment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coffea-dask/environment.yaml b/coffea-dask/environment.yaml
index e1b408f..eaac2ff 100644
--- a/coffea-dask/environment.yaml
+++ b/coffea-dask/environment.yaml
@@ -44,7 +44,7 @@ dependencies:
   - vector
   - hist
     # ML
-  - xgboost
+  #- xgboost
   - pytorch
   - torch-scatter
   - pip

From 486a77cd0d818094ecbed88b4e714b4c38e82627 Mon Sep 17 00:00:00 2001
From: Oksana Shadura <ksu.shadura@gmail.com>
Date: Thu, 27 Jun 2024 16:40:35 +0200
Subject: [PATCH 3/3] Switch off solver classic

---
 coffea-dask/Dockerfile.almalinux8 | 2 +-
 coffea-dask/Dockerfile.almalinux9 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coffea-dask/Dockerfile.almalinux8 b/coffea-dask/Dockerfile.almalinux8
index a83f7b5..81254ab 100644
--- a/coffea-dask/Dockerfile.almalinux8
+++ b/coffea-dask/Dockerfile.almalinux8
@@ -11,7 +11,7 @@ RUN yum -y install epel-release \
      && wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" \
      && bash Miniforge3.sh -bfp /usr/local \
      && rm -rf /tmp/mambaforge.sh \
-     && conda config --set solver classic \
+     #&& conda config --set solver classic \
      && mamba update mamba \
      && mamba clean --all --yes \
      && rpm -e --nodeps curl bzip2 \
diff --git a/coffea-dask/Dockerfile.almalinux9 b/coffea-dask/Dockerfile.almalinux9
index ba4d2d0..71a889d 100644
--- a/coffea-dask/Dockerfile.almalinux9
+++ b/coffea-dask/Dockerfile.almalinux9
@@ -11,7 +11,7 @@ RUN yum -y install epel-release \
      && wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" \
      && bash Miniforge3.sh -bfp /usr/local \
      && rm -rf /tmp/mambaforge.sh \
-     && conda config --set solver classic \
+     #&& conda config --set solver classic \
      && mamba update mamba \
      && mamba clean --all --yes \
      && yum clean all