Skip to content

Commit

Permalink
resolve cran feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
fdefalco committed Apr 22, 2024
1 parent 53f57cb commit d8da4a4
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 7 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ _pkgdown.yml
cran-comments.md
^CRAN-RELEASE$
work/*
^CRAN-SUBMISSION$
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 2.0.0
Date: 2024-04-16 20:03:15 UTC
SHA: 53f57cba7a55b79e60ec84baea9399f4ae19743c
7 changes: 3 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: Eunomia
Type: Package
Title: Standard Dataset Manager for OMOP CDM Sample Datasets
Title: Standard Dataset Manager for Observational Medical Outcomes Partnership Common Data Model Sample Datasets
Version: 2.0.0
Date: 2024-04-16
Date: 2024-04-22
Authors@R: c(
person("Frank", "DeFalco", , "fdefalco@ohdsi.org", role = c("aut", "cre")),
person("Martijn", "Schuemie", , "schuemie@ohdsi.org", role = c("aut")),
Expand All @@ -13,7 +13,7 @@ Authors@R: c(
person("Observational Health Data Science and Informatics", role = c("cph"))
)
Maintainer: Frank DeFalco <fdefalco@ohdsi.org>
Description: Facilitates access to sample datasets from the EunomiaDatasets repository (<https://github.com/ohdsi/EunomiaDatasets>).
Description: Facilitates access to sample datasets from the 'EunomiaDatasets' repository (<https://github.com/ohdsi/EunomiaDatasets>).
License: Apache License 2.0
URL: https://github.com/OHDSI/Eunomia
BugReports: https://github.com/OHDSI/Eunomia/issues
Expand All @@ -29,7 +29,6 @@ Suggests:
withr,
duckdb,
DatabaseConnector
Remotes: OHDSI/CommonDataModel
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.3.1
2 changes: 1 addition & 1 deletion R/Connection.R
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ getDatabaseFile <- function(datasetName,
}

if (!datasetAvailable && !archiveAvailable) {
writeLines(paste("attempting to download", datasetName))
message(paste("attempting to download", datasetName))
downloadedData <- downloadEunomiaData(datasetName = datasetName, cdmVersion = cdmVersion, pathToData = pathToData, verbose=verbose)
if (verbose) {
message("downloaded: ",downloadedData,appendLF = TRUE)
Expand Down
3 changes: 3 additions & 0 deletions R/EunomiaData.R
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ downloadEunomiaData <- function(datasetName,
#' @param cdmVersion The version of the OMOP CDM that are represented in the archive files.
#' @param inputFormat The format of the files expected in the archive. (csv or parquet)
#' @param verbose Provide additional logging details during execution.
#' @returns No return value, called to load archive into a database file.
#' @importFrom tools file_ext
#' @examples
#' \dontrun{
Expand Down Expand Up @@ -111,6 +112,7 @@ extractLoadData <- function(from, to, dbms = "sqlite",cdmVersion="5.3", inputFor
#' @param cdmDatabaseSchema The schema in which to create the CDM tables. Default is main.
#' @param verbose Provide additional logging details during execution.
#' @param overwrite Remove and replace an existing data set.
#' @returns No return value, loads data into database file.
#' @export
loadDataFiles <- function(dataPath,
dbPath,
Expand Down Expand Up @@ -239,6 +241,7 @@ loadDataFiles <- function(dataPath,
#' @param dbms The file-based database system to use: 'sqlite' (default) or 'duckdb'
#' @param outputFormat The output format for the files. Supported formats include csv, parquet.
#' @param verbose Boolean argument controlling verbose debugging output
#' @returns No return value, called to export to outputFolder.
#' @export
exportDataFiles <- function(dbPath, outputFolder, outputFormat="csv", dbms = "sqlite", verbose=FALSE) {
stopifnot(outputFormat %in% c("csv","parquet"))
Expand Down
1 change: 1 addition & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Release of 2.0 version of package.
Resolved CRAN feedback issues

---

Expand Down
4 changes: 2 additions & 2 deletions man/Eunomia-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/exportDataFiles.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/extractLoadData.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/loadDataFiles.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d8da4a4

Please sign in to comment.