From 501017f3979ce8d05b7fe111ec253ede285ef990 Mon Sep 17 00:00:00 2001 From: Jason Brown Date: Wed, 27 Feb 2019 16:29:20 -0500 Subject: [PATCH] Moved data.table to imports per: https://github.com/Rdatatable/data.table/issues/3076 And updated files to pass devtools::check() --- DESCRIPTION | 4 ++-- NEWS | 3 ++- R/tcplLoadChem.R | 2 +- vignettes/Data_processing.Rmd | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 629f40cd..a3bb0b1a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,9 +16,9 @@ Description: A set of tools for processing and modeling high-throughput and can be used for diverse chemical screening efforts. URL: https://github.com/USEPA/CompTox-ToxCast-tcpl Depends: - R (>= 3.2.0), - data.table (>= 1.9.4) + R (>= 3.2.0) Imports: + data.table (>= 1.9.4), DBI, RMySQL, numDeriv, diff --git a/NEWS b/NEWS index 76e03f2c..15c9dbb0 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ tcpl v2.0.2 ============== -Updated tcplLoadChem to return dsstox substance ids +* Updated tcplLoadChem to return dsstox substance ids +* Moved data.table to imports instead of depends tcpl v2.0.1 ============== diff --git a/R/tcplLoadChem.R b/R/tcplLoadChem.R index 33134844..356761f0 100644 --- a/R/tcplLoadChem.R +++ b/R/tcplLoadChem.R @@ -56,7 +56,7 @@ tcplLoadChem <- function(field = NULL, val = NULL, exact = TRUE, include.spid = TRUE) { tbl <- c("chemical", "sample") ## Variable-binding to pass R CMD Check - code <- casn <- chid <- chnm <- NULL + code <- casn <- chid <- chnm <- dsstox_substance_id <- NULL if (!is.null(field)) { vfield <- c("chid", "spid", "chnm", "casn", "code", "chem.only","dsstox_substance_id") diff --git a/vignettes/Data_processing.Rmd b/vignettes/Data_processing.Rmd index 15921dfc..2943635d 100644 --- a/vignettes/Data_processing.Rmd +++ b/vignettes/Data_processing.Rmd @@ -32,6 +32,7 @@ $(document).ready(function() { ```{r eval = TRUE, echo = FALSE, message = FALSE} library(htmlTable) library(tcpl) +library(data.table) ``` ```{r eval = TRUE, echo = FALSE, message = FALSE, results = "hide"}