Skip to content

Commit 4e8cc03

Browse files
author
Rob Schiemann
committed
Update repo_management script to support R 4.3
1 parent 36d9f61 commit 4e8cc03

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

scripts/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Razel scripts
2-
=============
1+
# Razel scripts
32

43
These are a crude collection of functions to help generate `BUILD` files for R
54
packages, and `WORKSPACE` rules for external R packages. They may become part
@@ -133,8 +132,8 @@ you want to use this local repo as a functional mirror for macOS and windows.
133132
# Options to also download binary archives.
134133
options("BinariesMac" = TRUE) # Binaries for Mac
135134
options("BinariesWin" = FALSE) # Binaries for Win
136-
options("RVersions" = c("3.6", "4.0", "4.1")) # Binaries for these R versions.
137-
135+
options("RVersions" = c("3.6", "4.0", "4.1", "4.2", "4.3")) # Binaries for these R versions.
136+
options("ForceDownload" = FALSE) # Download packages even if src package already present in repo.
138137

139138
#' Already downloaded source archive packages in the repo.
140139
#'

scripts/repo_management.R

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# Options to also download binary archives.
2424
options("BinariesMac" = TRUE) # Binaries for Mac
2525
options("BinariesWin" = FALSE) # Binaries for Win
26-
options("RVersions" = c("3.6", "4.0", "4.1")) # Binaries for these R versions.
26+
options("RVersions" = c("3.6", "4.0", "4.1", "4.2", "4.3")) # Binaries for these R versions.
2727
options("ForceDownload" = FALSE) # Download packages even if src package already present in repo.
2828

2929
# Factors in unexpected places create problems.
@@ -41,6 +41,9 @@ macContribDir <- function(r_version) {
4141
if (r_version %in% c("3.4", "3.5", "3.6")) {
4242
contrib_prefix <- "el-capitan/"
4343
}
44+
if (r_version %in% c("4.3")) {
45+
contrib_prefix <- "big-sur-x86_64/"
46+
}
4447
return(sprintf("/bin/macosx/%scontrib/%s", contrib_prefix, r_version))
4548
}
4649

@@ -61,7 +64,11 @@ isValidBinRepo <- function(repo, r_version) {
6164
}
6265

6366
bioc_version <- gsub("(.*packages/|/bioc)", "", repo)
64-
return((bioc_version == "3.14" && r_version == "4.1") ||
67+
return((bioc_version == "3.18" && r_version == "4.3") ||
68+
(bioc_version == "3.17" && r_version == "4.3") ||
69+
(bioc_version == "3.16" && r_version == "4.2") ||
70+
(bioc_version == "3.15" && r_version == "4.2") ||
71+
(bioc_version == "3.14" && r_version == "4.1") ||
6572
(bioc_version == "3.13" && r_version == "4.1") ||
6673
(bioc_version == "3.12" && r_version == "4.0") ||
6774
(bioc_version == "3.11" && r_version == "4.0") ||

0 commit comments

Comments
 (0)