Merge branch 'main' into renovate/codecov-cli-9.x

rapidsai · Dec 3, 2024 · 7d49b90 · 7d49b90
2 parents 131db5b + b423144
commit 7d49b90
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 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}
@@ -33,7 +34,7 @@ umask 002
 # an older conda with newer packages still works well
 conda update --all -y -n base
 # install expected Python version
-conda install -y -n base "python~=${PYTHON_VERSION}.0=*_cpython"
+conda install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_VER_UPPER_BOUND}=*_cpython"
 conda update --all -y -n base
 if [[ "$LINUX_VER" == "rockylinux"* ]]; then
   yum install -y findutils
@@ -93,6 +94,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
 
@@ -212,7 +214,7 @@ rapids-mamba-retry install -y \
   git \
   jq \
   packaging \
-  "python=${PYTHON_VERSION}.*=*_cpython" \
+  "python>=${PYTHON_VERSION},<${PYTHON_VER_UPPER_BOUND}=*_cpython" \
   "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}

diff --git a/versions.yaml b/versions.yaml
@@ -3,10 +3,10 @@
 # prefer sticking with a stable version until a specific reason to update arises.
 SCCACHE_VER: 0.7.7
 # renovate: datasource=github-releases depName=cli/cli
-GH_CLI_VER: 2.60.1
+GH_CLI_VER: 2.63.0
 # renovate: datasource=pypi depName=codecov-cli
 CODECOV_VER: 9.0.4
 # renovate: datasource=docker depName=mikefarah/yq versioning=docker
-YQ_VER: 4.44.3
+YQ_VER: 4.44.5
 # renovate: datasource=docker depName=amazon/aws-cli versioning=docker
-AWS_CLI_VER: 2.19.0
+AWS_CLI_VER: 2.22.8