From b02526ce94519bd6b79ee0809ab64e6f3a9d63f1 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 11 Jan 2023 09:47:22 -0500 Subject: [PATCH 1/4] Ensure tests run for Python `3.10` Previously we had disabled `cucim` testing for Python `3.10` because the tests depended on `3.10` packages of `cudf`, which weren't previously available. Now that `3.10` packages of `cudf` are available, we can enable `3.10` testing for `cucim`. --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 3ba8410f7..079c0e81e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -33,7 +33,7 @@ jobs: # TODO: Switch this testing branch to "cuda-118" after `cudf` `3.10` builds are out. # There is a circular testing dependency between `dask-cuda` and `cudf` right now, which # prevents us from running `3.10` tests for `dask-cuda` until `3.10` `cudf` packages are published. - uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main + uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118 with: build_type: pull-request wheel-build: From 52272bff639b70b55a992aac81ced68d29003a15 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 11 Jan 2023 09:50:15 -0500 Subject: [PATCH 2/4] rm `TODO` --- .github/workflows/pr.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 079c0e81e..238205c19 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -30,9 +30,6 @@ jobs: conda-python-tests: needs: conda-python-build secrets: inherit - # TODO: Switch this testing branch to "cuda-118" after `cudf` `3.10` builds are out. - # There is a circular testing dependency between `dask-cuda` and `cudf` right now, which - # prevents us from running `3.10` tests for `dask-cuda` until `3.10` `cudf` packages are published. uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118 with: build_type: pull-request From c45bb5bdb6d6b7c14ab46a7e75527d5601c9ae7a Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 18 Jan 2023 10:35:37 -0500 Subject: [PATCH 3/4] add version to `cucim` dependency --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index c79647223..3aaf8b58a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -91,7 +91,7 @@ dependencies: common: - output_types: [conda] packages: - - cucim + - cucim=23.02 - cudf=23.02 - dask-cudf=23.02 - pytest From e92dbbda906cfec7e3d159e397804c9826f639a9 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 18 Jan 2023 10:36:46 -0500 Subject: [PATCH 4/4] update `update-version.sh` --- ci/release/update-version.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 0938bff0d..41658e73c 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -37,4 +37,5 @@ sed_runner "s/export UCXPY_VERSION=.*/export UCXPY_VERSION="${NEXT_UCXPY_VERSION # Bump cudf and dask-cudf testing dependencies sed_runner "s/cudf=.*/cudf=${NEXT_SHORT_TAG}/g" dependencies.yaml sed_runner "s/dask-cudf=.*/dask-cudf=${NEXT_SHORT_TAG}/g" dependencies.yaml +sed_runner "s/cucim=.*/cucim=${NEXT_SHORT_TAG}/g" dependencies.yaml sed_runner "s/ucx-py=.*/ucx-py=${NEXT_UCXPY_VERSION}/g" dependencies.yaml