Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci-conda: change spelling of python dependency #214

Merged
merged 2 commits into from
Dec 2, 2024
Merged

ci-conda: change spelling of python dependency #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8018df5
ci-conda: change spelling of python dependency
jameslamb Dec 2, 2024
e60b319
try using explicit upper bound
jameslamb Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ci-conda.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions ci/compute-build-args.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading