Skip to content

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

Merged
sklam merged 1 commit into
numba:mainfrom
esc:public_ci/remove_scipy_cf
Oct 7, 2022
Merged

sklam merged 1 commit into
numba:mainfrom
esc:public_ci/remove_scipy_cf

Conversation

@esc

@esc esc commented Oct 5, 2022 •

Copy link
Copy Markdown
Member

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

@stuartarchibald stuartarchibald left a comment

Copy link
Copy Markdown
Contributor

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

sklam commented Oct 6, 2022

Copy link
Copy Markdown
Member

there are merge conflict

…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 commented Oct 6, 2022

Copy link
Copy Markdown
Member Author

@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 left a comment

Copy link
Copy Markdown
Contributor

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

Labels

5 - Ready to merge Review and testing done, is ready to merge Effort - short Short size effort needed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants