From d9059fd6426d97041017624256dae2a4a973670e Mon Sep 17 00:00:00 2001 From: Severin Dicks <37635888+Intron7@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:37:10 +0100 Subject: [PATCH] update docker to rapids-24.12 (#318) * update docker to rapids-24.12 * update in workflow * revert to linux 22.04 * update conda * fix docker * remove fa2 from yaml * add release note --- .github/workflows/docker.yml | 2 +- conda/rsc_rapids_24.08.yml | 1 - conda/rsc_rapids_24.12.yml | 1 - docker/Dockerfile.deps | 4 ++-- docker/docker-push.sh | 2 +- docs/release-notes/0.11.1.md | 3 ++- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3202bfb8..f0e2c477 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: RAPIDS_VER: - - 24.08 + - 24.12 name: Build Docker images runs-on: ubuntu-latest permissions: diff --git a/conda/rsc_rapids_24.08.yml b/conda/rsc_rapids_24.08.yml index 8f3b3f38..bafa5a5b 100644 --- a/conda/rsc_rapids_24.08.yml +++ b/conda/rsc_rapids_24.08.yml @@ -13,7 +13,6 @@ dependencies: - cusparselt - leidenalg - louvain - - fa2 - jupyterlab - pip - pip: diff --git a/conda/rsc_rapids_24.12.yml b/conda/rsc_rapids_24.12.yml index b57125df..211271ac 100644 --- a/conda/rsc_rapids_24.12.yml +++ b/conda/rsc_rapids_24.12.yml @@ -13,7 +13,6 @@ dependencies: - cusparselt - leidenalg - louvain - - fa2 - jupyterlab - pip - pip: diff --git a/docker/Dockerfile.deps b/docker/Dockerfile.deps index a064e700..1558b95c 100644 --- a/docker/Dockerfile.deps +++ b/docker/Dockerfile.deps @@ -5,12 +5,12 @@ FROM nvidia/cuda:${CUDA_VER}-base-${LINUX_VER} SHELL ["/bin/bash", "-euo", "pipefail", "-c"] -ARG PYTHON_VER=3.11 +ARG PYTHON_VER=3.12 ENV PATH=/opt/conda/bin:$PATH ENV PYTHON_VERSION=${PYTHON_VER} -COPY --from=condaforge/miniforge3:24.3.0-0 /opt/conda /opt/conda +COPY --from=condaforge/miniforge3:24.9.2-0 /opt/conda /opt/conda COPY rsc_rapids.yml rsc_rapids.yml diff --git a/docker/docker-push.sh b/docker/docker-push.sh index daeb6c35..be9121e8 100755 --- a/docker/docker-push.sh +++ b/docker/docker-push.sh @@ -2,7 +2,7 @@ set -euxo pipefail docker_account=scverse -rapids_version=24.08 +rapids_version=24.12 grep -v -- '- rapids-singlecell' conda/rsc_rapids_${rapids_version}.yml > rsc_rapids.yml docker build -t rapids-singlecell-deps:latest -f docker/Dockerfile.deps . rm rsc_rapids.yml diff --git a/docs/release-notes/0.11.1.md b/docs/release-notes/0.11.1.md index 6778752c..03ff9687 100644 --- a/docs/release-notes/0.11.1.md +++ b/docs/release-notes/0.11.1.md @@ -1,4 +1,4 @@ -### 0.10.11 {small}`the-future` +### 0.10.11 {small}`2025-01-21` ```{rubric} Features ``` @@ -11,3 +11,4 @@ ```{rubric} Misc ``` * Pin `numba<0.61.0`{pr}`319` {smaller}`S Dicks` +* Update Docker to `rapids-24.12` and `python-3.12`{pr}`318` {smaller}`S Dicks`