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

[r] Two-sided R pin for release-1.10 branch; backport #2540, #2546, #2549 #2549

Merged
merged 2 commits into from
May 13, 2024

Conversation

johnkerl
Copy link
Member

@johnkerl johnkerl commented May 13, 2024

Issue and/or context: Following our established procedure, I am working on tiledbsoma 1.11 today

[sc-46600]

Changes:

Notes for Reviewer:

@mojaveazure I am following https://github.com/single-cell-data/TileDB-SOMA/wiki/Branches-and-releases#incrementing-core-versions

However, since that was updated we do have #2540 and #2546 on main; I'm not sure what's the right thing to do here on the release-1.10 branch, as I am going to create a release-1.11 branch today -- @mojaveazure let's work together on this.

@johnkerl johnkerl requested a review from mojaveazure May 13, 2024 14:20
@johnkerl johnkerl changed the title [r] Two-sided R pin for release-2.10 branch [r] Two-sided R pin for release-1.10 branch May 13, 2024
@mojaveazure
Copy link
Member

If tiledbsoma 1.10 uses core 2.22/tiledb-r 0.26, then in addition to the following change we'll also need #2540 and #2546 backported to release-1.10

As shown previously, the doublepin does not affect installation or library loading, only R CMD check; as such, you need the two aforementioned PRs to get CI to install the correct version of tiledb-r

* merge

* merge (#2551)

Co-authored-by: Paul Hoffman <[email protected]>

---------

Co-authored-by: Paul Hoffman <[email protected]>
@johnkerl johnkerl changed the title [r] Two-sided R pin for release-1.10 branch [r] Two-sided R pin for release-1.10 branch; backport #2540, #2546, #2549 May 13, 2024
Copy link

codecov bot commented May 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.21%. Comparing base (69cb851) to head (ec74f11).

Additional details and impacted files
@@              Coverage Diff              @@
##           release-1.10    #2549   +/-   ##
=============================================
  Coverage         90.21%   90.21%           
=============================================
  Files                37       37           
  Lines              3966     3966           
=============================================
  Hits               3578     3578           
  Misses              388      388           
Flag Coverage Δ
python 90.21% <ø> (ø)

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

Components Coverage Δ
python_api 90.21% <ø> (ø)
libtiledbsoma ∅ <ø> (∅)

@@ -82,7 +99,7 @@ jobs:
# run: cd apis/r && Rscript -e "options(bspm.version.check=TRUE); install.packages('tiledb', repos = c('https://eddelbuettel.r-universe.dev/bin/linux/jammy/4.3/', 'https://cloud.r-project.org'))"

- name: Dependencies
run: cd apis/r && tools/r-ci.sh install_all
run: cd apis/r && Rscript -e "remotes::install_deps(dependencies = TRUE, upgrade = FALSE)"
Copy link
Member Author

Choose a reason for hiding this comment

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

@mojaveazure should this be

remotes::install_deps(".", dependencies = TRUE, upgrade = FALSE)"

?

Copy link
Member

Choose a reason for hiding this comment

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

Not necessarily, the "." is the default https://remotes.r-lib.org/reference/install_deps.html

@johnkerl johnkerl merged commit babb931 into release-1.10 May 13, 2024
15 checks passed
@johnkerl johnkerl deleted the kerl/r-prep-for-2.11-branch branch May 13, 2024 18:15
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