Skip to content

Commit 5fc9e9c

Browse files
committed
cran fixes
1 parent e3ddc10 commit 5fc9e9c

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎.github/workflows/test-coverage.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
runs-on: ubuntu-latest
1515
env:
1616
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
17+
# Use the CI library for coverage and its test subprocesses.
18+
RENV_CONFIG_AUTOLOADER_ENABLED: "false"
1719

1820
steps:
1921
- uses: actions/checkout@v6

‎NAMESPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ importFrom(stringr,
5959
str_replace_all,
6060
str_to_lower
6161
)
62-
importFrom(usethis,proj_set)
62+
importFrom(usethis,proj_get)
6363
importFrom(zip,
6464
unzip,
6565
zip

‎R/pullConceptsAtlas.R‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pullConceptsAtlas <- function(
6565
checkmate::assertLogical(deletePrevious)
6666
checkmate::assertCharacter(patternToRemove)
6767
for (package in c("httr", "RJSONIO", "lubridate", "rlang")) {
68-
studyGenerics:::requireInstall(package)
68+
requireInstall(package)
6969
}
7070
checkmate::assertString(authHeader)
7171

@@ -215,7 +215,7 @@ pullConceptsAtlas <- function(
215215
getConceptSetDefinition <- function(conceptSetId, baseUrl,
216216
authHeader = Sys.getenv("ATLAS_TOKEN")) {
217217
for (package in c("httr", "RJSONIO", "lubridate", "rlang")) {
218-
studyGenerics:::requireInstall(package)
218+
requireInstall(package)
219219
}
220220
checkmate::assertInt(conceptSetId, lower = 1)
221221
checkmate::assertString(baseUrl, min.chars = 1)
@@ -301,8 +301,8 @@ getWebApiVersion <- function(baseUrl, authHeader = "") {
301301
}
302302

303303
.request <- function(url, method, authHeader = "") {
304-
studyGenerics:::requireInstall("httr")
305-
studyGenerics:::requireInstall("rlang")
304+
requireInstall("httr")
305+
requireInstall("rlang")
306306
checkmate::assertChoice(method, "GET")
307307
headers <- httr::accept_json()
308308
if (nzchar(authHeader)) {
@@ -347,7 +347,7 @@ getWebApiVersion <- function(baseUrl, authHeader = "") {
347347
}
348348

349349
.convertToDateTime <- function(x) {
350-
studyGenerics:::requireInstall("lubridate")
350+
requireInstall("lubridate")
351351
if (is.numeric(x)) {
352352
x <- .millisecondsToDate(x)
353353
} else if (is.character(x)) {

‎cran-comments.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
## R CMD check results
22

3-
0 errors | 0 warnings | 1 note
3+
0 errors | 0 warnings | 0 notes
44

5-
* This is a new release.
5+
* This is a new submission.
66

7-
* Concept-set retrieval helpers from ROhdsiWebApi are bundled under
8-
Apache-2.0, with upstream copyright notices, source revision, and changes
9-
documented in R/pullConceptsAtlas.R and inst/COPYRIGHTS. The package no
10-
longer depends on ROhdsiWebApi. The replacement optional dependencies
11-
(httr, RJSONIO, lubridate, and rlang) are available on CRAN.
7+
* The package includes adapted concept-set retrieval helpers from
8+
ROhdsiWebApi, licensed under Apache License 2.0. Upstream copyright,
9+
source revision, and modifications are documented in `inst/COPYRIGHTS`.
10+
studyGenerics does not depend on ROhdsiWebApi; the optional dependencies
11+
used by these helpers (httr, RJSONIO, lubridate, and rlang) are on CRAN.

0 commit comments

Comments
 (0)