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

Fix 24.04 versions #14825

Merged
merged 5 commits into from
Jan 23, 2024
Merged

Fix 24.04 versions #14825

merged 5 commits into from
Jan 23, 2024

Conversation

raydouglass
Copy link
Member

Fix update-version.sh to include pip cu suffixed dependencies

@raydouglass raydouglass added bug Something isn't working non-breaking Non-breaking change labels Jan 22, 2024
@raydouglass raydouglass self-assigned this Jan 22, 2024
@raydouglass raydouglass requested a review from a team as a code owner January 22, 2024 19:30
@github-actions github-actions bot added the ci label Jan 22, 2024
@raydouglass raydouglass mentioned this pull request Jan 22, 2024
Merged
bdice
bdice requested changes Jan 22, 2024
View reviewed changes
ci/release/update-version.sh Outdated Show resolved Hide resolved
bdice
bdice reviewed Jan 22, 2024
View reviewed changes
ci/release/update-version.sh Outdated Show resolved Hide resolved
bdice
bdice approved these changes Jan 22, 2024
View reviewed changes
Copy link
Contributor

@bdice bdice left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Great. Thanks for adjusting the suggestion I made. I tried to use the [[:digit:]]{2} format originally but I must have escaped something wrong. I verified that this works as I expected.

@raydouglass
Copy link
Member Author

raydouglass commented Jan 22, 2024 •
edited
Loading

I tested the latest commit on both Mac & Ubuntu using BSD sed, gsed, & gnu sed:

# MacOS
$ export DEP=rmm NEXT_SHORT_TAG_PEP440=25.8
# gnu sed on MacOS
$ echo "- &rmm_cu12 rmm-cu12==24.2.*" | gsed "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g"
- &rmm_cu12 rmm-cu12==25.8.*
# bsd sed
$ echo "- &rmm_cu12 rmm-cu12==24.2.*" | /usr/bin/sed "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g"
- &rmm_cu12 rmm-cu12==25.8.*

# Ubuntu w/ gnu sed
$ export DEP=rmm NEXT_SHORT_TAG_PEP440=25.8
$ echo "- &rmm_cu12 rmm-cu12==24.2.*" | sed "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g"
- &rmm_cu12 rmm-cu12==25.8.*

@raydouglass raydouglass requested a review from bdice January 22, 2024 20:16
@raydouglass
Copy link
Member Author

/merge

This was referenced Jan 22, 2024
Closed
Merged
Merged
Merged
Merged
@rapids-bot rapids-bot bot merged commit c9ec9c2 into rapidsai:branch-24.04 Jan 23, 2024
68 checks passed
This was referenced Jan 23, 2024
Merged
Merged
Merged
Merged
rapids-bot bot pushed a commit to rapidsai/ucxx that referenced this pull request Jan 25, 2024
@jameslamb
handle more RAPIDS version formats in update-version.sh, refactor dep…
ed7c281 
…endencies.yaml (#174)

Contributes to rapidsai/build-planning#13.

Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`.

This also pulls in some dependency refactoring originally added in #161, which allows greater use of dependencies.yaml globs (and therefore less maintenance effort to support new CUDA versions).

### How I tested this

The portability of this updated `sed` command was tested here: rapidsai/cudf#14825 (comment).

In this repo, I ran the following:

```shell
./ci/release/update-version.sh '0.36.00'
git diff

./ci/release/update-version.sh '0.37.00
git diff
```

Confirmed that that first `git diff` changed all the things I expected, and that second one showed 0 changes.

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Bradley Dice (https://github.com/bdice)
  - https://github.com/jakirkham

Approvers:
  - Jake Awe (https://github.com/AyodeAwe)
  - https://github.com/jakirkham

URL: #174
rapids-bot bot pushed a commit to rapidsai/ucx-py that referenced this pull request Jan 30, 2024
@jameslamb
handle more RAPIDS version formats in update-version.sh (#1017)
12be765 
Contributes to rapidsai/build-planning#13.

Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`.

### How I tested this

The portability of this updated `sed` command was tested here: rapidsai/cudf#14825 (comment).

In this repo, I ran the following:

```shell
./ci/release/update-version.sh '0.36.00'
git diff

./ci/release/update-version.sh '0.37.00'
git diff
```

Confirmed that that first `git diff` changed all the things I expected, and that second one showed 0 changes.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)

URL: #1017
rapids-bot bot pushed a commit to rapidsai/dask-cuda that referenced this pull request Jan 30, 2024
@jameslamb
handle more RAPIDS version formats in update-version.sh (#1307)
2adc059 
Contributes to rapidsai/build-planning#13.

Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`.

This project doesn't appear to have any of those right now, but might in the future.

### How I tested this

The portability of this updated `sed` command was tested here: rapidsai/cudf#14825 (comment).

In this repo, I ran the following:

```shell
./ci/release/update-version.sh '23.10.00'
git diff

./ci/release/update-version.sh '24.04.00'
git diff
```

Confirmed that that first `git diff` changed all the things I expected, and that second one showed 0 changes.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)

URL: #1307
rapids-bot bot pushed a commit to rapidsai/wholegraph that referenced this pull request Feb 5, 2024
@jameslamb
handle more RAPIDS version formats in update-version.sh (#122)
dca9fd6 
Contributes to rapidsai/build-planning#13.

Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`. This project doesn't appear to have any of those right now, but might in the future.

Also removes some references to Sphinx `conf.py` files in `update-version.sh`... this repo doesn't have those.

### How I tested this

The portability of this updated `sed` command was tested here: rapidsai/cudf#14825 (comment).

In this repo, I ran the following:

```shell
./ci/release/update-version.sh '23.10.00'
git diff

./ci/release/update-version.sh '24.04.00'
git diff
```

Confirmed that that first `git diff` changed all the things I expected, and that second one showed 0 changes.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: #122
rapids-bot bot pushed a commit to rapidsai/cuxfilter that referenced this pull request Feb 5, 2024
@jameslamb
handle more RAPIDS version formats in update-version.sh (#566)
8c4c3fc 
Contributes to rapidsai/build-planning#13.

Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`.

This project doesn't appear to have any of those right now, but might in the future.

### How I tested this

The portability of this updated `sed` command was tested here: rapidsai/cudf#14825 (comment).

In this repo, I ran the following:

```shell
./ci/release/update-version.sh '23.10.00'
git diff

./ci/release/update-version.sh '24.04.00'
git diff
```

Confirmed that that first `git diff` changed all the things I expected, and that second one showed 0 changes.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Ajay Thorve (https://github.com/AjayThorve)

URL: #566
rapids-bot bot pushed a commit to rapidsai/kvikio that referenced this pull request Feb 5, 2024
@jameslamb
handle more RAPIDS version formats in update-version.sh (#331)
047ec3e 
Contributes to rapidsai/build-planning#13.

Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`.

This project doesn't appear to have any of those right now, but might in the future.

### How I tested this

The portability of this updated `sed` command was tested here: rapidsai/cudf#14825 (comment).

In this repo, I ran the following:

```shell
./ci/release/update-version.sh '23.10.00'
git diff

./ci/release/update-version.sh '24.04.00'
git diff
```

Confirmed that that first `git diff` changed all the things I expected, and that second one showed 0 changes.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)

URL: #331
younseojava pushed a commit to ROCm/dask-cuda-rocm that referenced this pull request Apr 16, 2024
@jameslamb @younseojava
handle more RAPIDS version formats in update-version.sh (rapidsai#1307)
d35e711 
Contributes to rapidsai/build-planning#13.

Updates `update-version.sh` to correctly handle RAPIDS dependencies like `cudf-cu12==24.2.*`.

This project doesn't appear to have any of those right now, but might in the future.

### How I tested this

The portability of this updated `sed` command was tested here: rapidsai/cudf#14825 (comment).

In this repo, I ran the following:

```shell
./ci/release/update-version.sh '23.10.00'
git diff

./ci/release/update-version.sh '24.04.00'
git diff
```

Confirmed that that first `git diff` changed all the things I expected, and that second one showed 0 changes.

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)

URL: rapidsai#1307
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajschmidt8 ajschmidt8 ajschmidt8 approved these changes

@bdice bdice bdice approved these changes

Assignees

@raydouglass raydouglass

Labels
bug Something isn't working non-breaking Non-breaking change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@raydouglass @bdice @ajschmidt8