Merge conda-forge/main into jakirkham-feedstocks/merge_upstream_29

jakirkham · jakirkham · commit 0283bf177774 · 2025-11-25T16:29:53.000-08:00
diff --git a/.ci_support/linux_64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version12.9cxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version12.9cxx_compiler_version14.yaml
@@ -6,8 +6,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.28'
-cdt_name:
-- conda
 channel_sources:
 - rapidsai-nightly,rapidsai,conda-forge
 channel_targets:
@@ -26,15 +24,8 @@ librmm:
 - '25.12'
 nccl:
 - '2'
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
 python_min:
 - '3.10'
-r_base:
-- '4.3'
-- '4.4'
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml b/.ci_support/linux_64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml
@@ -6,8 +6,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.28'
-cdt_name:
-- conda
 channel_sources:
 - rapidsai-nightly,rapidsai,conda-forge
 channel_targets:
@@ -26,15 +24,8 @@ librmm:
 - '25.12'
 nccl:
 - '2'
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
 python_min:
 - '3.10'
-r_base:
-- '4.3'
-- '4.4'
 target_platform:
 - linux-64
 zip_keys:
diff --git a/.ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version12.9cxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version12.9cxx_compiler_version14.yaml
@@ -6,8 +6,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.28'
-cdt_name:
-- conda
 channel_sources:
 - rapidsai-nightly,rapidsai,conda-forge
 channel_targets:
@@ -26,15 +24,8 @@ librmm:
 - '25.12'
 nccl:
 - '2'
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
 python_min:
 - '3.10'
-r_base:
-- '4.3'
-- '4.4'
 target_platform:
 - linux-aarch64
 zip_keys:
diff --git a/.ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_compiler_version14c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml
@@ -6,8 +6,6 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.28'
-cdt_name:
-- conda
 channel_sources:
 - rapidsai-nightly,rapidsai,conda-forge
 channel_targets:
@@ -26,15 +24,8 @@ librmm:
 - '25.12'
 nccl:
 - '2'
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
 python_min:
 - '3.10'
-r_base:
-- '4.3'
-- '4.4'
 target_platform:
 - linux-aarch64
 zip_keys:
diff --git a/.ci_support/migrations/r_base45.yaml b/.ci_support/migrations/r_base45.yaml
@@ -0,0 +1,13 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for r_base 4.5
+  kind: version
+  migration_number: 1
+  pr_limit: 5
+  primary_key: r_base
+  automerge: True
+  longterm: True
+  include_noarch: True
+migrator_ts: 1750421535.8834505
+r_base:
+- '4.5'
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -14,8 +14,6 @@ channel_sources:
 - rapidsai-nightly,rapidsai,conda-forge
 channel_targets:
 - rapidsai-nightly main
-cuda_compiler:
-- cuda-nvcc
 cuda_compiler_version:
 - None
 cxx_compiler:
@@ -26,15 +24,8 @@ llvm_openmp:
 - '19'
 macos_machine:
 - x86_64-apple-darwin13.4.0
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
 python_min:
 - '3.10'
-r_base:
-- '4.3'
-- '4.4'
 target_platform:
 - osx-64
 zip_keys:
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -14,8 +14,6 @@ channel_sources:
 - rapidsai-nightly,rapidsai,conda-forge
 channel_targets:
 - rapidsai-nightly main
-cuda_compiler:
-- cuda-nvcc
 cuda_compiler_version:
 - None
 cxx_compiler:
@@ -26,15 +24,8 @@ llvm_openmp:
 - '19'
 macos_machine:
 - arm64-apple-darwin20.0.0
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
 python_min:
 - '3.10'
-r_base:
-- '4.3'
-- '4.4'
 target_platform:
 - osx-arm64
 zip_keys:
diff --git a/.ci_support/win_64_cuda_compiler_version12.9.yaml b/.ci_support/win_64_cuda_compiler_version12.9.yaml
@@ -24,14 +24,7 @@ m2w64_cxx_compiler:
 - gxx
 m2w64_cxx_compiler_version:
 - '14'
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
 python_min:
 - '3.10'
-r_base:
-- '4.3'
-- '4.4'
 target_platform:
 - win-64
diff --git a/.ci_support/win_64_cuda_compiler_version13.0.yaml b/.ci_support/win_64_cuda_compiler_version13.0.yaml
@@ -24,14 +24,7 @@ m2w64_cxx_compiler:
 - gxx
 m2w64_cxx_compiler_version:
 - '14'
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
 python_min:
 - '3.10'
-r_base:
-- '4.3'
-- '4.4'
 target_platform:
 - win-64
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -46,11 +46,11 @@ jobs:
           - CONFIG: osx_64_
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-13']
+            runs_on: ['macos-15-intel']
           - CONFIG: osx_arm64_
             UPLOAD_PACKAGES: True
             os: macos
-            runs_on: ['macos-13']
+            runs_on: ['macos-15-intel']
           - CONFIG: win_64_cuda_compiler_version12.9
             UPLOAD_PACKAGES: True
             os: windows
@@ -77,15 +77,16 @@ jobs:
                  ; do
           sudo rsync --stats -a --delete /opt/empty_dir/ $d || true
         done
-        sudo apt-get purge -y -f firefox \
-                                 google-chrome-stable \
-                                 microsoft-edge-stable
+        BROWSERS="firefox google-chrome-stable microsoft-edge-stable"
+        BROWSERS_TO_REMOVE=$(dpkg --get-selections $BROWSERS 2>/dev/null | awk '{print $1}')
+        sudo apt-get remove --purge -y $BROWSERS_TO_REMOVE
+
         sudo apt-get autoremove -y >& /dev/null
         sudo apt-get autoclean -y >& /dev/null
         df -h
 
     - name: Checkout code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
     - name: Build on Linux
       id: build-linux
diff --git a/README.md b/README.md
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
-{% set version = "3.0.5" %}
-{% set build_number = 5 %}
+{% set version = "3.1.2" %}
+{% set build_number = 0 %}
 {% set python_min = "3.10" %}
 {% set posix = 'm2-' if win else '' %}
 
@@ -11,7 +11,7 @@ package:
 
 source:
   url: https://github.com/dmlc/xgboost/releases/download/v{{ version }}/xgboost-src-{{ version }}.tar.gz
-  sha256: 0776b59fad03548c447cb1e188469761241ffb3b36154dc8a59735f11d262dc2
+  sha256: 12f2d6f735fa71e007c40171fd926c12306276dd299dc48f6c923e4f3891c33e
   patches:
     # xgboost patches
     - patches/0001-Enable-latest-libcxx-on-MacOS.patch                # [osx]
diff --git a/recipe/patches/0001-Enable-latest-libcxx-on-MacOS.patch b/recipe/patches/0001-Enable-latest-libcxx-on-MacOS.patch
@@ -1,4 +1,4 @@
-From 7bb7bd609859057f80576fc156f4b3e19218a671 Mon Sep 17 00:00:00 2001
+From 16c3d0f2a69adb7e3bddc26afcb8dfe0040a5983 Mon Sep 17 00:00:00 2001
 From: Hyunsu Cho <phcho@nvidia.com>
 Date: Fri, 28 Jun 2024 17:40:28 -0700
 Subject: [PATCH] Enable latest libcxx on MacOS
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable latest libcxx on MacOS
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/R-package/src/Makevars.in b/R-package/src/Makevars.in
-index 93cfb8e5b..e24cfed93 100644
+index eb0b96baf..97086185e 100644
 --- a/R-package/src/Makevars.in
 +++ b/R-package/src/Makevars.in
-@@ -10,7 +10,8 @@ XGB_RFLAGS = \
+@@ -13,7 +13,8 @@ XGB_RFLAGS = \
      -DDMLC_LOG_BEFORE_THROW=0 \
      -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) \
      -DDMLC_DISABLE_STDIN=1 \
@@ -22,5 +22,5 @@ index 93cfb8e5b..e24cfed93 100644
  # disable the use of thread_local for 32 bit windows:
  ifeq ($(R_OSTYPE)$(WIN),windows)
 -- 
-2.34.1
+2.48.1
 
diff --git a/recipe/patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch b/recipe/patches/0002-Remove-nvidia-nccl-cu12-from-pyproject.toml.patch
@@ -1,4 +1,4 @@
-From e2c4aa25cf84ad7db68748ca7d0c8275e5dcef91 Mon Sep 17 00:00:00 2001
+From bc7bab8c97c66de3885846866337077731c5cda9 Mon Sep 17 00:00:00 2001
 From: Hyunsu Cho <phcho@nvidia.com>
 Date: Wed, 27 Nov 2024 00:51:35 -0800
 Subject: [PATCH] Remove nvidia-nccl-cu12 from pyproject.toml
@@ -8,10 +8,10 @@ Subject: [PATCH] Remove nvidia-nccl-cu12 from pyproject.toml
  1 file changed, 1 deletion(-)
 
 diff --git a/python-package/pyproject.toml b/python-package/pyproject.toml
-index e6cfde49d..0201c8dea 100644
+index 158d900d9..aad21f3ca 100644
 --- a/python-package/pyproject.toml
 +++ b/python-package/pyproject.toml
-@@ -31,7 +31,6 @@ classifiers = [
+@@ -33,7 +33,6 @@ classifiers = [
  dependencies = [
      "numpy",
      "scipy",
@@ -20,5 +20,5 @@ index e6cfde49d..0201c8dea 100644
  
  [project.urls]
 -- 
-2.47.0
+2.48.1
 
diff --git a/recipe/patches/0003-Mark-wheels-as-any-platform-compatible.patch b/recipe/patches/0003-Mark-wheels-as-any-platform-compatible.patch
@@ -1,4 +1,4 @@
-From 3cff598144b2843b21eeccb42075f47c84127bb7 Mon Sep 17 00:00:00 2001
+From 956e84c13477ad3c6141d3481e83fd9a19af37b1 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Sat, 28 Sep 2024 21:12:02 +0200
 Subject: [PATCH] Mark wheels as any platform compatible
@@ -26,3 +26,6 @@ index d81a21cd5..710530ce4 100644
  
  
  class CustomBuildHook(BuildHookInterface):
+-- 
+2.48.1
+
diff --git a/recipe/patches/0004-Disable-glibc-version-check.patch b/recipe/patches/0004-Disable-glibc-version-check.patch
@@ -1,4 +1,4 @@
-From 9565edd748fcc7ad3a9d8f406aa9715bd2bcd011 Mon Sep 17 00:00:00 2001
+From 41b851d086176037355faca6695e1d53f0239e19 Mon Sep 17 00:00:00 2001
 From: Hyunsu Cho <phcho@nvidia.com>
 Date: Sun, 25 May 2025 02:18:12 -0700
 Subject: [PATCH] Disable glibc version check
@@ -8,10 +8,10 @@ Subject: [PATCH] Disable glibc version check
  1 file changed, 24 deletions(-)
 
 diff --git a/python-package/xgboost/core.py b/python-package/xgboost/core.py
-index b6c341433..0bd35ea4e 100644
+index 6caab146e..7356f3357 100644
 --- a/python-package/xgboost/core.py
 +++ b/python-package/xgboost/core.py
-@@ -366,30 +366,6 @@ def build_info() -> dict:
+@@ -379,30 +379,6 @@ def build_info() -> dict:
      return res
  
  
@@ -43,5 +43,5 @@ index b6c341433..0bd35ea4e 100644
      _NUMPY_TO_CTYPES_MAPPING: Dict[Type[np.number], Type[CNumeric]] = {
          np.float32: ctypes.c_float,
 -- 
-2.43.0
+2.48.1
 
diff --git a/recipe/patches/0005-Patch-CMake-config-to-support-CUDA-13.0.patch b/recipe/patches/0005-Patch-CMake-config-to-support-CUDA-13.0.patch
