Skip to content

Cherry pick #7859 for 1.3.2 #7873

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
Merged
merged 4 commits into from
Jun 25, 2024
Merged

Cherry pick #7859 for 1.3.2 #7873

merged 4 commits into from
Jun 25, 2024

Conversation

KumoLiu
Copy link
Contributor

@KumoLiu KumoLiu commented Jun 24, 2024

Description

Types of changes

  • Non-breaking change (fix or new feature that would not break existing functionality).
  • Breaking change (fix or new feature that would cause existing functionality to change).
  • New tests added to cover the changes.
  • Integration tests passed locally by running ./runtests.sh -f -u --net --coverage.
  • Quick tests passed locally by running ./runtests.sh --quick --unittests --disttests.
  • In-line docstrings updated.
  • Documentation updated, tested make html command in the docs/ folder.

@ericspod @KumoLiu
Fixing Numpy requirements to exclude 2.0 (Project-MONAI#7859)
6a64249 
### Description

This fixes the version of Numpy to be less than 2.0 so that we can get a
working setup guaranteed. Numpy 2.0 isn't supported yet by MONAI and
will need a number of changes to be compatible.

This is only sometimes a problem because a number of dependencies we
have require Numpy<2.0. When these are absent however, such as with
minimal installs, Numpy 2.0 can be installed and causes problems. This
is a temporary fix until we have worked out an update that's compatible
with versions before and after 2.0.

### Types of changes
<!--- Put an `x` in all the boxes that apply, and remove the not
applicable items -->
- [x] Non-breaking change (fix or new feature that would not break
existing functionality).
- [ ] Breaking change (fix or new feature that would cause existing
functionality to change).
- [ ] New tests added to cover the changes.
- [ ] Integration tests passed locally by running `./runtests.sh -f -u
--net --coverage`.
- [ ] Quick tests passed locally by running `./runtests.sh --quick
--unittests --disttests`.
- [ ] In-line docstrings updated.
- [ ] Documentation updated, tested `make html` command in the `docs/`
folder.

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>
@KumoLiu KumoLiu changed the title Cherry pick https://github.com/Project-MONAI/MONAI/pull/7859 for 1.3.2 Cherry pick #7859 for 1.3.2 Jun 24, 2024
@KumoLiu
Copy link
Contributor Author

KumoLiu commented Jun 24, 2024

Hi @ericspod, could you please help fix the DCO issue? Thanks!

ericspod added 2 commits June 25, 2024 13:47
@ericspod
DCO Remediation Commit for Eric Kerfoot <17726042+ericspod@users.nore…
589f1b4 
…ply.github.com>

I, Eric Kerfoot <17726042+ericspod@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 6a64249

Signed-off-by: Eric Kerfoot <17726042+ericspod@users.noreply.github.com>
@ericspod
DCO Remediation Commit for Eric Kerfoot <eric.kerfoot@kcl.ac.uk>
c6e666b 
I, Eric Kerfoot <eric.kerfoot@kcl.ac.uk>, hereby add my Signed-off-by to this commit: 589f1b4

Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>
@ericspod
Copy link
Member

Hi @ericspod, could you please help fix the DCO issue? Thanks!

I tried this with the two different messages it suggested, my signoffs are in the commit log now so I think we're good to just force it to pass.

@ericspod ericspod self-requested a review June 25, 2024 12:50
ericspod
ericspod approved these changes Jun 25, 2024
View reviewed changes
Copy link
Member

@ericspod ericspod left a comment

Choose a reason for hiding this comment

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

This is the only fix I think we need for 1.3.2, this change should solve the issue for now and our tests should pass. Thanks!

@KumoLiu
Copy link
Contributor Author

KumoLiu commented Jun 25, 2024

/build

@KumoLiu KumoLiu marked this pull request as ready for review June 25, 2024 13:42
@ericspod
Copy link
Member

Do we want to merge this into a separate 1.3.2 branch and do the hotfix release from there? If you've cherry-picked from 1.3.1 then that will have only this change as the difference versus 1.3.1 as we want.

@KumoLiu
Copy link
Contributor Author

KumoLiu commented Jun 25, 2024

Hi @ericspod, could you please help fix the DCO issue? Thanks!

I tried this with the two different messages it suggested, my signoffs are in the commit log now so I think we're good to just force it to pass.

Hi @ericspod, since dco is manually set to pass. I guess it still has not passed yet. Could you please check your github email config by using git config user.email? I guess you are using eric.kerfoot@kcl.ac.uk to this commit, so it's still not work, you can try set 17726042+ericspod@users.noreply.github.com in your config.

Do we want to merge this into a separate 1.3.2 branch and do the hotfix release from there?

Yes, I will create one.

@KumoLiu KumoLiu changed the base branch from dev to releasing/1.3.2 June 25, 2024 14:30
@ericspod
DCO Remediation Commit for Eric Kerfoot <17726042+ericspod@users.nore…
dd36f1a 
…ply.github.com>

I, Eric Kerfoot <17726042+ericspod@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 6a64249

Signed-off-by: Eric Kerfoot <17726042+ericspod@users.noreply.github.com>
@ericspod
Copy link
Member

Hi @ericspod, could you please help fix the DCO issue? Thanks!

I tried this with the two different messages it suggested, my signoffs are in the commit log now so I think we're good to just force it to pass.

Hi @ericspod, since dco is manually set to pass. I guess it still has not passed yet. Could you please check your github email config by using git config user.email? I guess you are using eric.kerfoot@kcl.ac.uk to this commit, so it's still not work, you can try set 17726042+ericspod@users.noreply.github.com in your config.

That seems to have done it.

@KumoLiu KumoLiu merged commit e92949d into Project-MONAI:releasing/1.3.2 Jun 25, 2024
27 checks passed
@KumoLiu KumoLiu deleted the hotfix branch June 26, 2024 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ericspod ericspod ericspod approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@KumoLiu @ericspod