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

Add Python 3.13 #207

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add Python 3.13 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6eb61a8
Add Python 3.13
bdice Nov 19, 2024
d687efe
Compute Python upper bound in-place.
bdice Dec 8, 2024
fe25794
Add only ci-wheel and citestwheel builds of Python 3.13 for now.
bdice Dec 16, 2024
8b961f4
Exclude Python 3.13 for miniforge-cuda, too.
bdice Dec 17, 2024
ed6a729
Merge branch 'main' into python-3.13
bdice Dec 17, 2024
ba293d0
Merge branch 'main' into python-3.13
bdice Jan 29, 2025
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
26 changes: 22 additions & 4 deletions ci-conda.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ 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 @@ -34,7 +33,17 @@ 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},<${PYTHON_VER_UPPER_BOUND}=*_cpython"
PYTHON_MAJOR_VERSION=${PYTHON_VERSION%%.*}
PYTHON_MINOR_VERSION=${PYTHON_VERSION#*.}
PYTHON_UPPER_BOUND="${PYTHON_MAJOR_VERSION}.$((PYTHON_MINOR_VERSION+1)).0a0"
PYTHON_MINOR_PADDED=$(printf "%02d" "$PYTHON_MINOR_VERSION")
PYTHON_VERSION_PADDED="${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_PADDED}"
if [[ "$PYTHON_VERSION_PADDED" > "3.12" ]]; then
PYTHON_ABI_TAG="cp${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION}"
else
PYTHON_ABI_TAG="cpython"
fi
conda install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}"
conda update --all -y -n base
if [[ "$LINUX_VER" == "rockylinux"* ]]; then
yum install -y findutils
Expand Down Expand Up @@ -94,7 +103,6 @@ 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 @@ -210,6 +218,16 @@ RUN cat /tmp/condarc.tmpl | envsubst | tee /opt/conda/.condarc; \

# Install CI tools using mamba
RUN <<EOF
PYTHON_MAJOR_VERSION=${PYTHON_VERSION%%.*}
PYTHON_MINOR_VERSION=${PYTHON_VERSION#*.}
PYTHON_UPPER_BOUND="${PYTHON_MAJOR_VERSION}.$((PYTHON_MINOR_VERSION+1)).0a0"
PYTHON_MINOR_PADDED=$(printf "%02d" "$PYTHON_MINOR_VERSION")
PYTHON_VERSION_PADDED="${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_PADDED}"
if [[ "$PYTHON_VERSION_PADDED" > "3.12" ]]; then
PYTHON_ABI_TAG="cp${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION}"
else
PYTHON_ABI_TAG="cpython"
fi
rapids-mamba-retry install -y \
anaconda-client \
boa \
Expand All @@ -220,7 +238,7 @@ rapids-mamba-retry install -y \
git \
jq \
packaging \
"python>=${PYTHON_VERSION},<${PYTHON_VER_UPPER_BOUND}=*_cpython" \
"python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" \
"rapids-dependency-file-generator==1.*"
conda clean -aipty
EOF
Expand Down
6 changes: 0 additions & 6 deletions ci/compute-build-args.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,10 @@ 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
7 changes: 7 additions & 0 deletions matrix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ PYTHON_VER:
- "3.10"
- "3.11"
- "3.12"
- "3.13"
LINUX_VER:
- "ubuntu20.04"
- "ubuntu22.04"
Expand All @@ -28,6 +29,12 @@ CI_IMAGE_CONFIG:
dockerfile: citestwheel.Dockerfile
docker_target: ""
exclude:
# Python 3.13 isn't ready for conda yet (needs support in the conda package)
- PYTHON_VER: "3.13"
IMAGE_REPO: "miniforge-cuda"
- PYTHON_VER: "3.13"
IMAGE_REPO: "ci-conda"

# Exclusions from CUDA's OS support matrix
- LINUX_VER: "ubuntu22.04"
CUDA_VER: "11.4.3"
Expand Down
Loading