Skip to content

remove unnecessary gha-tools usage, put floors on conda dependencies #837

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

Merged
rapids-bot merged 2 commits into from
Jan 1, 2026
Merged

remove unnecessary gha-tools usage, put floors on conda dependencies #837

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c8650
remove unnecessary gha-tools usage, put floors on conda dependencies
jameslamb Dec 23, 2025
72875af
update ipython floor
jameslamb Dec 23, 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
9 changes: 2 additions & 7 deletions .github/workflows/build-cuvs-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,15 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Install gha-tools
run: |
mkdir -p /tmp/gha-tools
curl -s -L 'https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz' | tar -xz -C /tmp/gha-tools
echo "/tmp/gha-tools" >> "${GITHUB_PATH}"
- name: Clean up condarc for release builds
run: |
GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)"
GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v'
if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then
rapids-logger 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.'
echo 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.'
sed -i 's|rapidsai-nightly|rapidsai|' context/condarc
else
rapids-logger "Most recent tag is an alpha. Build will use nightly channels."
echo "Most recent tag is an alpha. Build will use nightly channels."
fi
- name: Login to DockerHub
uses: docker/login-action@v3
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/build-rapids-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,15 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Install gha-tools
run: |
mkdir -p /tmp/gha-tools
curl -s -L 'https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz' | tar -xz -C /tmp/gha-tools
echo "/tmp/gha-tools" >> "${GITHUB_PATH}"
- name: Clean up condarc for release builds
run: |
GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)"
GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v'
if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then
rapids-logger 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.'
echo 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.'
sed -i 's|rapidsai-nightly|rapidsai|' context/condarc
else
rapids-logger "Most recent tag is an alpha. Build will use nightly channels."
echo "Most recent tag is an alpha. Build will use nightly channels."
fi
- name: Login to DockerHub
uses: docker/login-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test-publish-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v'
ALPHA_TAG=""
if [[ $GIT_DESCRIBE_TAG =~ [a-z] ]]; then
rapids-logger "Most recent tag is an alpha tag"
echo "Most recent tag is an alpha tag"
ALPHA_TAG="a"
fi
RAPIDS_VER="$(echo $GIT_DESCRIBE_TAG | awk 'BEGIN{FS=OFS="."} NF--')" # Convert full tag to YY.MM
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.7
rev: v0.14.10
hooks:
- id: ruff
args: ["--config", "pyproject.toml"]
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ apt-get purge -y --auto-remove rsync
rm -rf /var/lib/apt/lists/*
EOF


# Base image
FROM rapidsai/miniforge-cuda:${RAPIDS_VER}-cuda${CUDA_VER}-base-${LINUX_VER}-py${PYTHON_VER} AS base
ARG CUDA_VER
Expand Down Expand Up @@ -86,7 +85,7 @@ rapids-mamba-retry install -y -n base \
"rapids=${RAPIDS_VER}.*" \
"python=${PYTHON_VER}.*" \
"cuda-version=${CUDA_VER%.*}.*" \
ipython \
'ipython>=9' \

@jameslamb jameslamb Dec 23, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look at this! Trying a floor made it clear that the openssl pinning from #810 made these images fall back to an older ipython!

#13 59.19 error    libmamba Could not solve for environment specs
#13 59.19     The following packages are incompatible
#13 59.19     ├─ ipython >=9 * is installable with the potential options
#13 59.19     │  ├─ ipython [9.0.0|9.0.2|...|9.8.0] would require
#13 59.19     │  │  └─ python >=3.11 * with the potential options
#13 59.19     │  │     ├─ python [3.10.7|3.10.8|3.11.0] would require
#13 59.19     │  │     │  └─ openssl >=1.1.1s,<1.1.2a *, which can be installed;
#13 59.19     │  │     ├─ python [3.11.0|3.11.1|...|3.14.2], which can be installed;
#13 59.19     │  │     ├─ python [3.14.0rc1|3.14.0rc2|3.14.0rc3] would require
#13 59.19     │  │     │  └─ _python_rc =* *, which does not exist (perhaps a missing channel);
#13 59.19     │  │     └─ python [3.10.6|3.11.0] would require
#13 59.19     │  │        └─ openssl >=1.1.1q,<1.1.2a *, which can be installed;
#13 59.19     │  └─ ipython [9.0.0|9.0.2|...|9.8.0] would require
#13 59.19     │     └─ __win =* *, which is missing on the system;
#13 59.19     ├─ openssl ==3.6.0 * is not installable because it conflicts with any installable versions previously reported;
#13 59.19     └─ python =3.10 * is installable with the potential options
#13 59.19        ├─ python [3.10.7|3.10.8|3.11.0], which can be installed (as previously explained);
#13 59.19        ├─ python [3.10.6|3.11.0], which can be installed (as previously explained);
#13 59.19        ├─ python [3.10.0|3.10.1|...|3.10.9] conflicts with any installable versions previously reported;
#13 59.19        ├─ python [3.10.0|3.10.1|3.10.2] would require
#13 59.19        │  └─ openssl >=1.1.1l,<1.1.2a *, which can be installed;
#13 59.19        ├─ python 3.10.4 would require
#13 59.19        │  └─ openssl >=1.1.1n,<1.1.2a *, which can be installed;
#13 59.19        └─ python 3.10.5 would require
#13 59.19           └─ openssl >=1.1.1o,<1.1.2a *, which can be installed.

(build link)

That's exactly the type of thing the pinning is supposed to help us discover, this makes me happy 😁

Looks like in recent successful builds we got ipython==8.37.0, so I'll try moving the pin back to that.

...
#13 38.74   + ipython                                8.37.0  pyh8f84b5b_0                                  conda-forge     639kB
...

(build link)

'rapids-cli==0.1.*' \
'openssl==3.6.0'
conda clean -afy
Expand All @@ -98,7 +97,6 @@ ENTRYPOINT ["/home/rapids/entrypoint.sh"]

CMD ["ipython"]


# Notebooks image
FROM base AS notebooks

Expand All @@ -124,8 +122,8 @@ EOF
RUN <<EOF
rapids-mamba-retry install -y -n base \
"jupyterlab=4" \
dask-labextension \
jupyterlab-nvdashboard
'dask-labextension>=7.0.0' \
'jupyterlab-nvdashboard>=0.13.0'
conda clean -afy
EOF

Expand Down
1 change: 0 additions & 1 deletion cuvs-bench/gpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ CMD ["--dataset fashion-mnist-784-euclidean", "", "--algorithms cuvs_cagra", ""]

ENTRYPOINT ["/bin/bash", "/data/scripts/run_benchmark.sh"]


FROM cuvs-bench AS cuvs-bench-datasets

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
Expand Down
Loading