diff --git a/DESCRIPTION b/DESCRIPTION index 1a5c4f52..76fd99d5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: CommonDataModel Type: Package Title: OMOP CDM DDL and Documentation Generator -Version: 1.0.1 +Version: 1.1.0 Authors@R: person(given = "Clair", family = "Blacketer", role = c("aut", "cre"), @@ -12,20 +12,20 @@ License: Apache License 2.0 Encoding: UTF-8 LazyData: true Depends: + R (>= 4.1.0) +Imports: DatabaseConnector, SqlRender, - rJava -Imports: - rmarkdown, stringr, - DBI, - dplyr, readr Suggests: - knitr, - testthat (>= 3.0.0), - RSQLite, - withr + DBI, + dplyr, + knitr, + rmarkdown, + RSQLite, + testthat (>= 3.0.0), + withr NeedsCompilation: no -RoxygenNote: 7.3.3 Config/testthat/edition: 3 +Config/roxygen2/version: 8.1.0 diff --git a/NAMESPACE b/NAMESPACE index 9664e777..9d0fbc2a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -14,9 +14,8 @@ export(writeDdl) export(writeForeignKeys) export(writeIndex) export(writePrimaryKeys) -import(DatabaseConnector) -import(SqlRender) -import(rJava) -importFrom(utils,download.file) -importFrom(utils,read.csv) -importFrom(utils,write.csv) +importFrom(utils, + download.file, + read.csv, + write.csv +) diff --git a/NEWS.md b/NEWS.md index 7b693552..160c3ab5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +CommonDataModel v5.5.0 +====================== + +Provides suport for the OMOP Common Data Model v5.5 - announcement and release notes are found here: https://forums.ohdsi.org/t/omop-cdm-v5-5-release/25881 + + CommonDataModel v5.4.2 ====================== diff --git a/R/CommonDataModel-package.R b/R/CommonDataModel-package.R index 55354369..3b3c9510 100644 --- a/R/CommonDataModel-package.R +++ b/R/CommonDataModel-package.R @@ -1,4 +1,9 @@ -#' @import rJava -#' @import DatabaseConnector -#' @import SqlRender +#' @keywords internal +"_PACKAGE" + +## usethis namespace: start +## usethis namespace: end + +## mockable bindings: start +## mockable bindings: end NULL diff --git a/R/utils.R b/R/utils.R deleted file mode 100644 index 213b47fa..00000000 --- a/R/utils.R +++ /dev/null @@ -1,8 +0,0 @@ -# these packages are used in utilities or functions outside of check's vision -# this function ensures that check is satisfied and does not report the -# packages as imported but not imported from -checkSatisfier <- function() { - DBI::dbConnect - dplyr::sql - rmarkdown::draft -} diff --git a/docs/background.html b/docs/background.html index 28d5aa02..b3aac375 100644 --- a/docs/background.html +++ b/docs/background.html @@ -2,17 +2,23 @@ - + OMOP CDM Background – OMOP Common Data Model