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

bioconductor: modern bioc DESCRIPTION files have Repository #729

Merged
merged 1 commit into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
- Improve package installation in a multi-process environment. Do less work
when a target package is in the cache and write package `DESCRIPTION`
updates to temporary files before persisting. (#720)
- When determining the package source, consider `biocViews` before
`Repository`. Recent Bioconductor package `DESCRIPTION` files include the
`Repository` field, which caused Packrat to believe that those packages
originated from a CRAN-like repository, not Bioconductor. (#729)

# Packrat 0.9.2

Expand Down
14 changes: 7 additions & 7 deletions R/pkg.R
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,13 @@ inferPackageRecord <- function(df, available = availablePackages()) {
} else if (identical(as.character(df$Priority), 'base')) {
# It's a base package!
return(NULL)
} else if (length(df$biocViews)) {
# It's Bioconductor!
return(structure(list(
name = name,
source = 'Bioconductor',
version = ver
), class = c('packageRecord', 'Bioconductor')))
} else if (length(df$Repository) && identical(as.character(df$Repository), 'CRAN')) {
# It's CRAN!
return(structure(list(
Expand All @@ -390,13 +397,6 @@ inferPackageRecord <- function(df, available = availablePackages()) {
source = as.character(df$Repository),
version = ver
), class = c('packageRecord', 'CustomCRANLikeRepository')))
} else if (length(df$biocViews)) {
# It's Bioconductor!
return(structure(list(
name = name,
source = 'Bioconductor',
version = ver
), class = c('packageRecord', 'Bioconductor')))
} else if (name %in% available[, "Package"]) {
# It's available on CRAN, so get it from CRAN!
return(structure(list(
Expand Down
1 change: 1 addition & 0 deletions packrat.Rproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Version: 1.0
ProjectId: 88c01d36-523a-49d0-b291-43c5007d3bf2

RestoreWorkspace: No
SaveWorkspace: No
Expand Down
Loading