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

Jump to bottom

Simplify version update script #705

Merged
merged 7 commits into from
Feb 29, 2024
Merged

Simplify version update script #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40ba7e8
Drop unused `RAPIDS_VERSION_NUMBER`
jakirkham Feb 28, 2024
a0921a1
Use `rapids-generate-version` in Python tests
jakirkham Feb 28, 2024
d168f1a
Use `main` branch to link to CHANGELOG
jakirkham Feb 28, 2024
b60f6ca
Use `main` in README notebook link
jakirkham Feb 28, 2024
9a95000
Drop `python/cucim/docs` version updates
jakirkham Feb 28, 2024
b046a19
Merge branch 'branch-24.04' into dyn_load_ver
jakirkham Feb 28, 2024
d90cb4f
Dynamically generate version in doc build
jakirkham Feb 29, 2024
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Member Author

Choose a reason for hiding this comment

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

This redirects to nbviewer.org. So just used that

Went to the URL to confirm the notebook loaded correctly


#### Downloading sample images

Expand Down
3 changes: 2 additions & 1 deletion ci/build_docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -24,7 +26,6 @@ rapids-mamba-retry install \
--channel "${PYTHON_CHANNEL}" \
cucim libcucim

export RAPIDS_VERSION_NUMBER="24.04"
Copy link
Member Author

Choose a reason for hiding this comment

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

This wasn't used anywhere. So just removed it

Always possible to add it back whenever we need it again

export RAPIDS_DOCS_DIR="$(mktemp -d)"

rapids-logger "Build Python docs"
Expand Down
7 changes: 0 additions & 7 deletions ci/release/update-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines -40 to -42
Copy link
Member Author

Choose a reason for hiding this comment

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

We dropped all of these in PR: #666

So no need to update versions here any more. Hence they are dropped

sed_runner "s#cucim.kit.cuslide@${CURRENT_LONG_TAG}.so#cucim.kit.cuslide@${NEXT_FULL_TAG}.so#g" cucim.code-workspace
Copy link
Member Author

@jakirkham jakirkham Feb 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Wasn't sure if we were still using cucim.code-workspace. So left it alone

Asking if we still need it, in issue: #706

Edit: Gigon confirmed this is still in use

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
4 changes: 2 additions & 2 deletions ci/test_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

set -euo pipefail

. /opt/conda/etc/profile.d/conda.sh
RAPIDS_VERSION_NUMBER=$(rapids-generate-version)
Copy link
Member Author

Choose a reason for hiding this comment

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

Other RAPIDS libraries get the current version by running this script

So doing the same thing here


export RAPIDS_VERSION_NUMBER="24.04"
. /opt/conda/etc/profile.d/conda.sh

rapids-logger "Generate Python testing dependencies"
rapids-dependency-file-generator \
Expand Down
2 changes: 1 addition & 1 deletion python/cucim/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading