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.

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

Sync main to release-1.7 as much as possible, in prep for #2158 #2165

Merged
merged 2 commits into from
Feb 22, 2024

Conversation

johnkerl
Copy link
Member

@johnkerl johnkerl commented Feb 22, 2024

I have not up until now backported all main PRs -- since the creation of release-1.7 -- to the release-1.7 branch. 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.7 without C++ prerequisites in place. Hence this catch-up PR.

Note that things that should not be included have not been included: R DESCRIPTION and NEWS.md files, controlled downgrades on .github/workflows/r-ci.yml and .github/workflows/r-python-interop-testing.yml, and core pins in apis/r/tools/get_tarball.R and libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake.

Intentional remaining differences are here:
https://gist.github.com/johnkerl/ea70db9e28134ecae9bba84ea7c2a940

@johnkerl johnkerl requested a review from nguyenv February 22, 2024 19:30
@johnkerl johnkerl marked this pull request as ready for review February 22, 2024 19:30
@johnkerl johnkerl changed the title Sync main to release-1.7 as much as possible Sync main to release-1.7 as much as possible, in prep for #2158 Feb 22, 2024
Copy link

codecov bot commented Feb 22, 2024

Codecov Report

Merging #2165 (1a13dfb) into release-1.7 (9f4fdbb) will decrease coverage by 0.24%.
Report is 1 commits behind head on release-1.7.
The diff coverage is 50.87%.

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     
Flag Coverage Δ
libtiledbsoma 66.84% <50.87%> (-0.75%) ⬇️
r 74.68% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
python_api ∅ <ø> (∅)
libtiledbsoma 48.05% <50.87%> (-2.42%) ⬇️

@johnkerl johnkerl merged commit 0641874 into release-1.7 Feb 22, 2024
21 checks passed
@johnkerl johnkerl deleted the kerl/sync-main-release-1.7 branch February 22, 2024 20:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants