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

Cherry picks for 0.56.3 #8505

Merged
merged 6 commits into from Oct 12, 2022
Merged

Cherry picks for 0.56.3 #8505

merged 6 commits into from Oct 12, 2022

Conversation

stuartarchibald
Copy link
Contributor

As title.

@sklam @stuartarchibald
Merge pull request numba#8475 from gmarkall/remove-setuptools-pin
560a63f 
Remove setuptools version pin

Resolved conflicts in:
	buildscripts/condarecipe.local/meta.yaml
	buildscripts/incremental/setup_conda_environment.sh
	setup.py
@sklam @stuartarchibald
Merge pull request numba#8482 from gmarkall/issue-8477
c177bb2 
Fix numba#8477: Allow copies with different strides for 0-length data
@stuartarchibald
Copy link
Contributor Author

For reviewers, please pay particular attention to 560a63f, the cherry-pick of the corresponding merge (1c07efb) from #8475 was not clean and conflicts had to be resolved (see 560a63f commit message for the files involved).

@stuartarchibald stuartarchibald added this to the Numba 0.56.3 RC milestone Oct 12, 2022
@stuartarchibald stuartarchibald mentioned this pull request Oct 12, 2022
Closed
26 tasks
sklam and others added 2 commits October 12, 2022 10:32
@sklam @stuartarchibald
Merge pull request numba#8486 from stuartarchibald/wip/fix_tbb_2021_c…
334ba96 
…onstraint_azure

Restrict the TBB development package to supported version in Azure.
@stuartarchibald
Update the target branch in testing to reduce the testing diff.
ba8b99e 
As title. This is to make the "files changed" that public CI has
to check smaller as it's against the release branch and not
`main`.
@stuartarchibald
Copy link
Contributor Author

Note ba8b99e is synonymous with 6f2894b. Without it, this PR tests all files changed with respect to main, which exhausts public CI resources. Really this PR needs to check changes with respect to the release branch it is targeting hence the patch applied. PR #8508 captures doing this as part of the release check list for next time around.

@stuartarchibald stuartarchibald marked this pull request as ready for review October 12, 2022 15:29
@esc esc added 4 - Waiting on second reviewer Patch needs a second reviewer. and removed 3 - Ready for Review labels Oct 12, 2022
gmarkall
gmarkall approved these changes Oct 12, 2022
View reviewed changes
Copy link
Member

@gmarkall gmarkall left a comment

Choose a reason for hiding this comment

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

This looks good to me - checked against changes in #8475 and #8482. Description in the changelog also looks good.

esc
esc approved these changes Oct 12, 2022
View reviewed changes
Copy link
Member

@esc esc left a comment

Choose a reason for hiding this comment

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

I checked the setuptools changes.

@esc esc merged commit 6982acd into numba:release0.56 Oct 12, 2022
@stuartarchibald stuartarchibald added 5 - Ready to merge Review and testing done, is ready to merge and removed 4 - Waiting on second reviewer Patch needs a second reviewer. labels Oct 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@esc esc esc approved these changes

@gmarkall gmarkall gmarkall approved these changes

@sklam sklam Awaiting requested review from sklam sklam is a code owner

Assignees
No one assigned
Labels
5 - Ready to merge Review and testing done, is ready to merge Effort - medium Medium size effort needed
Projects
None yet
Milestone
Numba 0.56.3 RC
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@stuartarchibald @esc @gmarkall @sklam