Sync main to release-1.7 as much as possible, in prep for #2158#2165
Merged
johnkerl merged 2 commits intorelease-1.7from Feb 22, 2024
Merged
Sync main to release-1.7 as much as possible, in prep for #2158#2165johnkerl merged 2 commits intorelease-1.7from
main to release-1.7 as much as possible, in prep for #2158#2165johnkerl merged 2 commits intorelease-1.7from
Conversation
johnkerl
changed the title
main to release-1.7 as much as possiblemain to release-1.7 as much as possible, in prep for #2158
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## release-1.7 #2165 +/- ##
===============================================
- Coverage 71.99% 71.76% -0.24%
===============================================
Files 101 101
Lines 7002 6930 -72
Branches 209 211 +2
===============================================
- Hits 5041 4973 -68
+ Misses 1861 1855 -6
- Partials 100 102 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
|
nguyenv
approved these changes
Feb 22, 2024
This was referenced Feb 23, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I have not up until now backported all
mainPRs -- since the creation ofrelease-1.7-- to therelease-1.7branch. In particular, C++-only changes haven't needed backporting.However, we're about to merge the important #2158 which won't backport cleanly to
release-1.7without C++ prerequisites in place. Hence this catch-up PR.Note that things that should not be included have not been included: R
DESCRIPTIONandNEWS.mdfiles, controlled downgrades on.github/workflows/r-ci.ymland.github/workflows/r-python-interop-testing.yml, and core pins inapis/r/tools/get_tarball.Randlibtiledbsoma/cmake/Modules/FindTileDB_EP.cmake.Intentional remaining differences are here:
https://gist.github.com/johnkerl/ea70db9e28134ecae9bba84ea7c2a940