From cd4e49c138e9722fecd43d2878d1bf6d925a5753 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 2 Dec 2024 13:02:03 -0600 Subject: [PATCH 1/4] ci-conda: change spelling of python dependency (#214) --- ci-conda.Dockerfile | 6 ++++-- ci/compute-build-args.sh | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index bc6b2dc..0d76e9b 100644 --- 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 index 7a1087d..e542183 100755 --- 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} From 49e3f757b5eccef8a707c116266c8b17f297077a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:34:26 -0600 Subject: [PATCH 2/4] Update mikefarah/yq Docker tag to v4.44.5 (#209) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: James Lamb --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 0f61151..21e60aa 100644 --- a/versions.yaml +++ b/versions.yaml @@ -7,6 +7,6 @@ GH_CLI_VER: 2.60.1 # renovate: datasource=pypi depName=codecov-cli CODECOV_VER: 0.8.0 # 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 From 2210275a1121377feabeebb01188c9861c0d7b28 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:48:50 -0600 Subject: [PATCH 3/4] Update dependency cli/cli to v2.63.0 (#211) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: James Lamb --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 21e60aa..424fb62 100644 --- a/versions.yaml +++ b/versions.yaml @@ -3,7 +3,7 @@ # 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: 0.8.0 # renovate: datasource=docker depName=mikefarah/yq versioning=docker From b4231442e463bbcb28ae6a5f1a22495a18dd3675 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:19:20 -0600 Subject: [PATCH 4/4] Update amazon/aws-cli Docker tag to v2.22.8 (#210) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: James Lamb --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 424fb62..93e8797 100644 --- a/versions.yaml +++ b/versions.yaml @@ -9,4 +9,4 @@ CODECOV_VER: 0.8.0 # renovate: datasource=docker depName=mikefarah/yq versioning=docker 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