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.

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

Simplify version update script #705

Merged
merged 7 commits into from
Feb 29, 2024

Conversation

jakirkham
Copy link
Member

@jakirkham jakirkham commented Feb 28, 2024

xref: rapidsai/build-planning#15

The CHANGELOG is only updated for releases when the `main` branch is
updated. So just reference that branch in the Changelog link on PyPI.
That should cutdown on the version hard-coding and version updating as
well.
As `python/cucim/docs` was dropped recently, there is nothing here to
update. So remove it from the version update script.
@jakirkham jakirkham requested review from a team as code owners February 28, 2024 03:29
@@ -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
Copy link
Member Author

@jakirkham jakirkham Feb 28, 2024

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

@@ -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

Comment on lines -40 to -42
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
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

@@ -24,7 +24,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

@@ -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

@jakirkham jakirkham added non-breaking Introduces a non-breaking change maintenance improvement Improves an existing functionality and removed maintenance labels Feb 28, 2024
@jakirkham
Copy link
Member Author

Failures on Python 3.11 are expected and can be ignored

This will be handled by PR: #704

Copy link
Contributor

@grlee77 grlee77 left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM

@jakirkham
Copy link
Member Author

/merge

@rapids-bot rapids-bot bot merged commit 46da10e into rapidsai:branch-24.04 Feb 29, 2024
47 checks passed
@jakirkham jakirkham deleted the dyn_load_ver branch February 29, 2024 19:25
@jakirkham
Copy link
Member Author

Thanks all! 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improves an existing functionality non-breaking Introduces a non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants