Merge branch 'main' into python-3.13

rapidsai · Dec 2, 2024 · a333157 · a333157
2 parents 9b15f1c + cd4e49c
commit a333157
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
@@ -8,6 +8,7 @@ FROM nvidia/cuda:${CUDA_VER}-base-${LINUX_VER} AS miniforge-cuda
 
 ARG LINUX_VER
 ARG PYTHON_VER
+ARG PYTHON_VER_UPPER_BOUND
 ARG DEBIAN_FRONTEND=noninteractive
 ENV PATH=/opt/conda/bin:$PATH
 ENV PYTHON_VERSION=${PYTHON_VER}
@@ -42,7 +43,7 @@ if [[ "$PYTHON_VERSION_PADDED" > "3.12" ]]; then
 else
     PYTHON_ABI_TAG="cpython"
 fi
-conda install -y -n base "python~=${PYTHON_VERSION}.0=*_${PYTHON_ABI_TAG}"
+conda install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_VER_UPPER_BOUND}=*_${PYTHON_ABI_TAG}"
 conda update --all -y -n base
 if [[ "$LINUX_VER" == "rockylinux"* ]]; then
   yum install -y findutils
@@ -102,6 +103,7 @@ ARG TARGETPLATFORM=notset
 ARG CUDA_VER=notset
 ARG LINUX_VER=notset
 ARG PYTHON_VER=notset
+ARG PYTHON_VER_UPPER_BOUND=notset
 
 ARG DEBIAN_FRONTEND
 
@@ -230,7 +232,7 @@ rapids-mamba-retry install -y \
   git \
   jq \
   packaging \
-  "python=${PYTHON_VERSION}.*=*_${PYTHON_ABI_TAG}" \
+  "python>=${PYTHON_VERSION},<${PYTHON_VER_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" \
   "rapids-dependency-file-generator==1.*"
 conda clean -aipty
 EOF

diff --git a/ci/compute-build-args.sh b/ci/compute-build-args.sh
@@ -17,10 +17,16 @@ if [[
   MANYLINUX_VER="manylinux_2_31"
 fi
 
+# compute upper bound, e.g. "3.11 -> 3.12.0a0"
+PYTHON_VER_MAJOR="${PYTHON_VER%%.*}"
+PYTHON_VER_MINOR="${PYTHON_VER#*.}"
+PYTHON_VER_UPPER_BOUND="${PYTHON_VER_MAJOR}.$(( PYTHON_VER_MINOR + 1)).0a0"
+
 ARGS="
 CUDA_VER: ${CUDA_VER}
 LINUX_VER: ${LINUX_VER}
 PYTHON_VER: ${PYTHON_VER}
+PYTHON_VER_UPPER_BOUND: ${PYTHON_VER_UPPER_BOUND}
 CPU_ARCH: ${ARCH}
 REAL_ARCH: $(arch)
 MANYLINUX_VER: ${MANYLINUX_VER}