Merge branch 'main' into add-telemetry

ci-conda.Dockerfile

@@ -21,7 +21,7 @@ usermod -g conda root
 EOF
 
 # Ownership & permissions based on https://docs.anaconda.com/anaconda/install/multi-user/#multi-user-anaconda-installation-on-linux
-COPY --from=condaforge/miniforge3:24.3.0-0 --chown=root:conda --chmod=770 /opt/conda /opt/conda
+COPY --from=condaforge/miniforge3:24.7.1-0 --chown=root:conda --chmod=770 /opt/conda /opt/conda
 
 # Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845
 RUN chmod g+ws /opt/conda
@@ -56,13 +56,21 @@ echo ". /opt/conda/etc/profile.d/conda.sh; conda activate base" >> ~/.bashrc
 EOF
 
 # tzdata is needed by the ORC library used by pyarrow, because it provides /etc/localtime
+# On Ubuntu 24.04 and newer, we also need tzdata-legacy
 RUN <<EOF
 case "${LINUX_VER}" in
   "ubuntu"*)
+    os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2)
+    if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; then
+        tzdata_pkgs=(tzdata tzdata-legacy)
+    else
+        tzdata_pkgs=(tzdata)
+    fi
+
     apt-get update
     apt-get upgrade -y
     apt-get install -y --no-install-recommends \
-      tzdata
+      "${tzdata_pkgs[@]}"
     rm -rf "/var/lib/apt/lists/*"
     ;;
   "rockylinux"*)
@@ -91,6 +99,7 @@ ARG DEBIAN_FRONTEND
 # Set RAPIDS versions env variables
 ENV RAPIDS_CUDA_VERSION="${CUDA_VER}"
 ENV RAPIDS_PY_VERSION="${PYTHON_VER}"
+ENV RAPIDS_DEPENDENCIES="latest"
 
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 
@@ -198,6 +207,7 @@ RUN <<EOF
 rapids-mamba-retry install -y \
   anaconda-client \
   boa \
+  conda-package-handling \
   dunamai \
   git \
   jq \

ci-wheel.Dockerfile

@@ -21,6 +21,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Set RAPIDS versions env variables
 ENV RAPIDS_CUDA_VERSION="${CUDA_VER}"
 ENV RAPIDS_PY_VERSION="${PYTHON_VER}"
+ENV RAPIDS_DEPENDENCIES="latest"
 
 ENV PYENV_ROOT="/pyenv"
 ENV PATH="/pyenv/bin:/pyenv/shims:$PATH"
@@ -131,7 +132,13 @@ EOF
 RUN <<EOF
 pyenv global ${PYTHON_VER}
 python -m pip install --upgrade pip
-python -m pip install auditwheel patchelf twine "rapids-dependency-file-generator==1.*" dunamai
+python -m pip install \
+  auditwheel \
+  conda-package-handling \
+  dunamai \
+  patchelf \
+  "rapids-dependency-file-generator==1.*" \
+  twine
 pyenv rehash
 EOF
 

citestwheel.Dockerfile

@@ -16,6 +16,7 @@ ARG CPU_ARCH=notset
 # Set RAPIDS versions env variables
 ENV RAPIDS_CUDA_VERSION="${CUDA_VER}"
 ENV RAPIDS_PY_VERSION="${PYTHON_VER}"
+ENV RAPIDS_DEPENDENCIES="latest"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -35,12 +36,23 @@ case "${LINUX_VER}" in
     add-apt-repository ppa:git-core/ppa -y
     apt-get update
     apt-get upgrade -y
+
+    # tzdata is needed by the ORC library used by pyarrow, because it provides /etc/localtime
+    # On Ubuntu 24.04 and newer, we also need tzdata-legacy
+    os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2)
+    if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; then
+        tzdata_pkgs=(tzdata tzdata-legacy)
+    else
+        tzdata_pkgs=(tzdata)
+    fi
+
     apt-get install -y --no-install-recommends \
       wget curl git jq ssh \
       make build-essential libssl-dev zlib1g-dev \
       libbz2-dev libreadline-dev libsqlite3-dev wget \
       curl llvm libncursesw5-dev xz-utils tk-dev unzip \
-      libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
+      libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
+      "${tzdata_pkgs[@]}"
     rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
     ;;
   "rockylinux"*)

context/condarc.tmpl

@@ -7,6 +7,7 @@ channels:
   - conda-forge
   - nvidia
 conda-build:
+  pkg_format: '2'
   set_build_id: false
   root_dir: $RAPIDS_CONDA_BLD_ROOT_DIR
   output_folder: $RAPIDS_CONDA_BLD_OUTPUT_DIR

latest.yaml

@@ -2,11 +2,11 @@
 miniforge-cuda:
   CUDA_VER: "12.5.1"
   PYTHON_VER: "3.12"
-  LINUX_VER: "ubuntu22.04"
+  LINUX_VER: "ubuntu24.04"
 ci-conda:
   CUDA_VER: "12.5.1"
   PYTHON_VER: "3.12"
-  LINUX_VER: "ubuntu22.04"
+  LINUX_VER: "ubuntu24.04"
 ci-wheel:
   CUDA_VER: "12.5.1"
   PYTHON_VER: "3.12"
@@ -15,4 +15,4 @@ ci-wheel:
 citestwheel:
   CUDA_VER: "12.5.1"
   PYTHON_VER: "3.12"
-  LINUX_VER: "ubuntu22.04"
+  LINUX_VER: "ubuntu24.04"