Skip to content

Restore installing SciPy from defaults instead of conda-forge on public CI #8490

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 1 commit into from
Oct 7, 2022
Merged

Restore installing SciPy from defaults instead of conda-forge on public CI #8490

merged 1 commit into from
Oct 7, 2022

Conversation

esc
Copy link
Member

@esc esc commented Oct 5, 2022 •
edited
Loading

This fixes fetching SciPy from defaults instead of conda-forge, now that a suitable SciPy 1.9 has become available.

This is a partial revert of #8413 since only the changes for the public ci build scripts, that pertain to the installation of SciPy are included.

@esc esc changed the title This is a partial revert of #8413 Restore installing SciPy from defaults instead of conda-forge on public CI Oct 5, 2022
@esc esc force-pushed the public_ci/remove_scipy_cf branch from 5b50559 to 0868018 Compare October 5, 2022 08:22
@esc esc added this to the Numba 0.57 RC milestone Oct 5, 2022
stuartarchibald
stuartarchibald previously approved these changes Oct 5, 2022
View reviewed changes
Copy link
Contributor

@stuartarchibald stuartarchibald left a comment

Choose a reason for hiding this comment

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

Thanks for the patch.

@stuartarchibald stuartarchibald added 4 - Waiting on CI Review etc done, waiting for CI to finish Effort - short Short size effort needed 5 - Ready to merge Review and testing done, is ready to merge and removed 3 - Ready for Review 4 - Waiting on CI Review etc done, waiting for CI to finish labels Oct 5, 2022
@sklam sklam added 4 - Waiting on author Waiting for author to respond to review and removed 5 - Ready to merge Review and testing done, is ready to merge labels Oct 6, 2022
@sklam
Copy link
Member

sklam commented Oct 6, 2022

there are merge conflict

@esc
Restore installing SciPy from defaults instead of conda-forge on publ…
9d250c4 
…ic CI

This fixes fetching SciPy from defaults instead of conda-forge, now that
a suitable SciPy 1.9 has become available.

This is a partial revert of numba#8413 since only the changes for the public
ci build scripts, that pertain to the installation of SciPy are
included.
@esc esc force-pushed the public_ci/remove_scipy_cf branch from 0868018 to 9d250c4 Compare October 6, 2022 08:41
@esc
Copy link
Member Author

esc commented Oct 6, 2022

@sklam @stuartarchibald I opted to rebase onto main in this case, since the change was quite short and no comments had been made. This will need a re-review now.

@esc esc added 4 - Waiting on reviewer Waiting for reviewer to respond to author and removed 4 - Waiting on author Waiting for author to respond to review labels Oct 6, 2022
stuartarchibald
stuartarchibald approved these changes Oct 6, 2022
View reviewed changes
Copy link
Contributor

@stuartarchibald stuartarchibald left a comment

Choose a reason for hiding this comment

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

Re-approved, thanks @esc!

@stuartarchibald stuartarchibald added 5 - Ready to merge Review and testing done, is ready to merge and removed 4 - Waiting on reviewer Waiting for reviewer to respond to author labels Oct 6, 2022
@sklam sklam merged commit deeeaa2 into numba:main Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stuartarchibald stuartarchibald stuartarchibald approved these changes

@sklam sklam Awaiting requested review from sklam

Assignees

@stuartarchibald stuartarchibald

Labels
5 - Ready to merge Review and testing done, is ready to merge Effort - short Short size effort needed
Projects
None yet
Milestone
Numba 0.57 RC
Development

Successfully merging this pull request may close these issues.
3 participants
@esc @sklam @stuartarchibald