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

Forward-merge branch-21.08 into branch-21.10 #877

Merged
merged 2 commits into from
Sep 22, 2021
Merged

Forward-merge branch-21.08 into branch-21.10 #877

merged 2 commits into from
Sep 22, 2021

Conversation

ajschmidt8
Copy link
Member

This PR merges the latest changes from branch-21.08 into branch-21.10. Typically this process happens automatically, but the forward-merger automation has been updated to forward-merge branch-21.10 into branch-21.12 at this time so there were some changes from branch-21.08 that didn't make it into branch-21.10.

We'll also want to confirm that these changes are automatically forward-merged into branch-21.12 after this PR merges.

trxcllnt and others added 2 commits August 25, 2021 14:15
@trxcllnt
Remove -g from cython compile commands (#847)
91cce5f 
Removes `-g` from the compile commands generated by distutils to compile Cython files.

This will make our container images, conda packages, and python wheels smaller.
@ajschmidt8 @trxcllnt
Fix test_cython.py (#855)
ccd9647 
* Fix `test_cython.py`

This PR fixes the `test_cython.py` file so that the cython tests are picked up when running `pytest`.

Co-authored-by: ptaylor <paul.e.taylor@me.com>
@ajschmidt8 ajschmidt8 requested review from a team as code owners September 22, 2021 17:58
@github-actions github-actions bot added CMake Python Related to RMM Python API labels Sep 22, 2021
@harrism harrism added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Sep 22, 2021
@jakirkham
Copy link
Member

It looks like there are conflicts with setup.py

@ajschmidt8 ajschmidt8 merged commit 12f82fb into branch-21.10 Sep 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@galipremsagar galipremsagar galipremsagar approved these changes

@jakirkham jakirkham jakirkham approved these changes

@harrism harrism harrism approved these changes

Assignees
No one assigned
Labels
CMake improvement Improvement / enhancement to an existing function non-breaking Non-breaking change Python Related to RMM Python API
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ajschmidt8 @jakirkham @harrism @galipremsagar @trxcllnt