From 46da10e05be93746910370ea5121447fbb21430e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 29 Feb 2024 11:24:38 -0800 Subject: [PATCH] Simplify version update script (#705) * Drop version update steps for doc pages that no longer exist: https://github.com/rapidsai/cucim/pull/666 * Use the `main` branch in links as that is updated every release xref: https://github.com/rapidsai/build-planning/issues/15 Authors: - https://github.com/jakirkham Approvers: - Gregory Lee (https://github.com/grlee77) - Ray Douglass (https://github.com/raydouglass) URL: https://github.com/rapidsai/cucim/pull/705 --- README.md | 2 +- ci/build_docs.sh | 3 ++- ci/release/update-version.sh | 7 ------- ci/test_python.sh | 4 ++-- python/cucim/pyproject.toml | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a295d2e4d..c20ff1cfc 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ pip install cucim-cu11 ### Notebooks -Please check out our [Welcome](notebooks/Welcome.ipynb) notebook ([NBViewer](https://nbviewer.jupyter.org/github/rapidsai/cucim/blob/branch-24.04/notebooks/Welcome.ipynb)) +Please check out our [Welcome](notebooks/Welcome.ipynb) notebook ([NBViewer](https://nbviewer.org/github/rapidsai/cucim/blob/main/notebooks/Welcome.ipynb)) #### Downloading sample images diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 164a6e810..554ccae36 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -2,6 +2,8 @@ set -euo pipefail +export RAPIDS_VERSION_NUMBER="$(rapids-generate-version)" + rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh @@ -24,7 +26,6 @@ rapids-mamba-retry install \ --channel "${PYTHON_CHANNEL}" \ cucim libcucim -export RAPIDS_VERSION_NUMBER="24.04" export RAPIDS_DOCS_DIR="$(mktemp -d)" rapids-logger "Build Python docs" diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index d16562bf7..7531110c2 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -37,15 +37,8 @@ sed_runner 's/release = .*/release = "'"${NEXT_FULL_TAG}"'"/g' docs/source/conf. # Centralized version file update echo "${NEXT_FULL_TAG}" > VERSION -sed_runner "s#\[Version ${CURRENT_LONG_TAG}\](release_notes/v${CURRENT_LONG_TAG}.md)#\[Version ${NEXT_FULL_TAG}\](release_notes/v${NEXT_FULL_TAG}.md)#g" python/cucim/docs/index.md -sed_runner "s/v${CURRENT_LONG_TAG}/v${NEXT_FULL_TAG}/g" python/cucim/docs/getting_started/index.md -sed_runner "s#cucim.kit.cuslide@${CURRENT_LONG_TAG}.so#cucim.kit.cuslide@${NEXT_FULL_TAG}.so#g" python/cucim/docs/getting_started/index.md sed_runner "s#cucim.kit.cuslide@${CURRENT_LONG_TAG}.so#cucim.kit.cuslide@${NEXT_FULL_TAG}.so#g" cucim.code-workspace -sed_runner "s#branch-${CURRENT_MAJOR}.${CURRENT_MINOR}#branch-${NEXT_MAJOR}.${NEXT_MINOR}#g" README.md -sed_runner "s#branch-${CURRENT_MAJOR}.${CURRENT_MINOR}#branch-${NEXT_MAJOR}.${NEXT_MINOR}#g" python/cucim/pyproject.toml for FILE in .github/workflows/*.yaml; do sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" done -sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh -sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/test_python.sh diff --git a/ci/test_python.sh b/ci/test_python.sh index 1de0fb135..dc3bdd9b2 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -5,9 +5,9 @@ set -euo pipefail -. /opt/conda/etc/profile.d/conda.sh +RAPIDS_VERSION_NUMBER=$(rapids-generate-version) -export RAPIDS_VERSION_NUMBER="24.04" +. /opt/conda/etc/profile.d/conda.sh rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ diff --git a/python/cucim/pyproject.toml b/python/cucim/pyproject.toml index c2d187512..01f8d318f 100644 --- a/python/cucim/pyproject.toml +++ b/python/cucim/pyproject.toml @@ -50,7 +50,7 @@ classifiers = [ [project.urls] Homepage = "https://developer.nvidia.com/multidimensional-image-processing" Documentation = "https://docs.rapids.ai/api/cucim/stable/" -Changelog = "https://github.com/rapidsai/cucim/blob/branch-24.04/CHANGELOG.md" +Changelog = "https://github.com/rapidsai/cucim/blob/main/CHANGELOG.md" Source = "https://github.com/rapidsai/cucim" Tracker = "https://github.com/rapidsai/cucim/issues"