From aec7a5c881550fcfa18093a2c49e556fff3792ae Mon Sep 17 00:00:00 2001
From: Jeremy Dyer <jdye64@gmail.com>
Date: Wed, 25 Oct 2023 13:00:54 -0400
Subject: [PATCH] Remove conda managed c-compiler and add patchelf

---
 continuous_integration/environment-3.10-dev.yaml   | 5 +++--
 continuous_integration/environment-3.8-dev.yaml    | 5 +++--
 continuous_integration/environment-3.9-dev.yaml    | 5 +++--
 continuous_integration/gpuci/environment-3.10.yaml | 5 +++--
 continuous_integration/gpuci/environment-3.9.yaml  | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/continuous_integration/environment-3.10-dev.yaml b/continuous_integration/environment-3.10-dev.yaml
index 45479393c..40eb874e4 100644
--- a/continuous_integration/environment-3.10-dev.yaml
+++ b/continuous_integration/environment-3.10-dev.yaml
@@ -3,7 +3,7 @@ channels:
 - conda-forge
 - nodefaults
 dependencies:
-- c-compiler
+# - c-compiler
 - dask>=2022.3.0
 - fastapi>=0.92.0
 - fugue>=0.7.3
@@ -11,7 +11,7 @@ dependencies:
 - intake>=0.6.0
 - jsonschema
 - lightgbm
-- maturin>=1.1,<1.2
+- maturin>=1.3.1
 # FIXME: mlflow 2.6.0 has import issues related to pydantic
 # https://github.com/mlflow/mlflow/issues/9331
 - mlflow<2.6
@@ -36,3 +36,4 @@ dependencies:
 - tzlocal>=2.1
 - uvicorn>=0.13.4
 - zlib
+- patchelf
diff --git a/continuous_integration/environment-3.8-dev.yaml b/continuous_integration/environment-3.8-dev.yaml
index 0badd4de7..99154e9c9 100644
--- a/continuous_integration/environment-3.8-dev.yaml
+++ b/continuous_integration/environment-3.8-dev.yaml
@@ -3,7 +3,7 @@ channels:
 - conda-forge
 - nodefaults
 dependencies:
-- c-compiler
+# - c-compiler
 - dask=2022.3.0
 - fastapi=0.92.0
 - fugue=0.7.3
@@ -11,7 +11,7 @@ dependencies:
 - intake=0.6.0
 - jsonschema
 - lightgbm
-- maturin=1.1
+- maturin>=1.3.1
 # FIXME: mlflow 2.6.0 has import issues related to pydantic
 # https://github.com/mlflow/mlflow/issues/9331
 - mlflow<2.6
@@ -36,3 +36,4 @@ dependencies:
 - tzlocal=2.1
 - uvicorn=0.13.4
 - zlib
+- patchelf
diff --git a/continuous_integration/environment-3.9-dev.yaml b/continuous_integration/environment-3.9-dev.yaml
index 6e8a03e49..c8a6b7007 100644
--- a/continuous_integration/environment-3.9-dev.yaml
+++ b/continuous_integration/environment-3.9-dev.yaml
@@ -3,7 +3,7 @@ channels:
 - conda-forge
 - nodefaults
 dependencies:
-- c-compiler
+# - c-compiler
 - dask>=2022.3.0
 - fastapi>=0.92.0
 - fugue>=0.7.3
@@ -11,7 +11,7 @@ dependencies:
 - intake>=0.6.0
 - jsonschema
 - lightgbm
-- maturin>=1.1,<1.2
+- maturin>=1.3.1
 # FIXME: mlflow 2.6.0 has import issues related to pydantic
 # https://github.com/mlflow/mlflow/issues/9331
 - mlflow<2.6
@@ -36,3 +36,4 @@ dependencies:
 - tzlocal>=2.1
 - uvicorn>=0.13.4
 - zlib
+- patchelf
diff --git a/continuous_integration/gpuci/environment-3.10.yaml b/continuous_integration/gpuci/environment-3.10.yaml
index c8ab54c9d..c3480a63d 100644
--- a/continuous_integration/gpuci/environment-3.10.yaml
+++ b/continuous_integration/gpuci/environment-3.10.yaml
@@ -6,7 +6,7 @@ channels:
 - nvidia
 - nodefaults
 dependencies:
-- c-compiler
+# - c-compiler
 - zlib
 - dask>=2022.3.0
 - fastapi>=0.92.0
@@ -15,7 +15,7 @@ dependencies:
 - intake>=0.6.0
 - jsonschema
 - lightgbm
-- maturin>=1.1,<1.2
+- maturin>=1.3.1
 # FIXME: mlflow 2.6.0 has import issues related to pydantic
 # https://github.com/mlflow/mlflow/issues/9331
 - mlflow<2.6
@@ -49,6 +49,7 @@ dependencies:
 - ucx-py=0.35
 - xgboost=*=rapidsai_py*
 - libxgboost=*=rapidsai_h*
+- patchelf
 # TODO: unpin after RAPIDS 23.12 release
 # - pip
 # - pip:
diff --git a/continuous_integration/gpuci/environment-3.9.yaml b/continuous_integration/gpuci/environment-3.9.yaml
index 38b380f92..975552961 100644
--- a/continuous_integration/gpuci/environment-3.9.yaml
+++ b/continuous_integration/gpuci/environment-3.9.yaml
@@ -6,7 +6,7 @@ channels:
 - nvidia
 - nodefaults
 dependencies:
-- c-compiler
+# - c-compiler
 - zlib
 - dask>=2022.3.0
 - fastapi>=0.92.0
@@ -15,7 +15,7 @@ dependencies:
 - intake>=0.6.0
 - jsonschema
 - lightgbm
-- maturin>=1.1,<1.2
+- maturin>=1.3.1
 # FIXME: mlflow 2.6.0 has import issues related to pydantic
 # https://github.com/mlflow/mlflow/issues/9331
 - mlflow<2.6
@@ -49,6 +49,7 @@ dependencies:
 - ucx-py=0.35
 - xgboost=*=rapidsai_py*
 - libxgboost=*=rapidsai_h*
+- patchelf
 # TODO: unpin after RAPIDS 23.12 release
 # - pip
 # - pip: