diff --git a/DESCRIPTION b/DESCRIPTION index 49fcc3c..0bb0a21 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: acro Title: A Tool for Semi-Automating the Statistical Disclosure Control of Research Outputs -Version: 1.0.0 +Version: 1.1.0 Authors@R: c( person("Jim", "Smith", , "James.Smith@uwe.ac.uk", role = c("cre", "ctb"), comment = c(ORCID = "0000-0001-7908-1859")), @@ -9,7 +9,7 @@ Authors@R: c( person("Richard John", "Preen", , "Richard2.Preen@uwe.ac.uk", role = c("aut", "ctb"), comment = c(ORCID = "0000-0003-3351-8132")) ) -Maintainer: Jim Smith +Maintainer: Maha Albashir Description: A Tool for Semi-Automating the Statistical Disclosure Control of Research Outputs. License: MIT + file LICENSE @@ -28,13 +28,13 @@ Imports: rlang, tibble, tidyselect, - utils, - survival + utils Suggests: knitr, rmarkdown, spelling, - testthat (>= 3.0.0) + testthat (>= 3.0.0), + survival VignetteBuilder: knitr Config/roxygen2/version: 8.1.1 diff --git a/NEWS.md b/NEWS.md index 3172a7e..7667d5e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +#acro 1.1.0 +* Added support for Cox Proportional Hazards + # acro 1.0.0 * Added support for tidyverse e.g. piping and the summarise() method * Added support for rounding as a mitigation strategy for tables diff --git a/tests/testthat/test-acro_coxph.R b/tests/testthat/test-acro_coxph.R index 3d95aae..02ce725 100644 --- a/tests/testthat/test-acro_coxph.R +++ b/tests/testthat/test-acro_coxph.R @@ -7,6 +7,7 @@ test_that("acro_coxph without initialising ACRO object first", { }) test_that("acro_coxph throws an error with multi-state arguments", { + testthat::skip_on_cran() acro_init() expect_error( acro_coxph(Surv(time, status) ~ age + ph.karno, data = test_data, istate = 1), @@ -19,6 +20,7 @@ test_that("acro_coxph throws an error with multi-state arguments", { }) test_that("acro_coxph validates the left side of the formula uses Surv() function", { + testthat::skip_on_cran() acro_init() expect_error( acro_coxph(time ~ age + ph.karno, data = test_data), @@ -27,6 +29,7 @@ test_that("acro_coxph validates the left side of the formula uses Surv() functio }) test_that("acro_coxph works", { + testthat::skip_on_cran() acro_init() # R Survival model @@ -50,6 +53,7 @@ test_that("acro_coxph works", { }) test_that("acro_coxph with subsetting", { + testthat::skip_on_cran() acro_init() # R Survival model @@ -73,6 +77,7 @@ test_that("acro_coxph with subsetting", { }) test_that("acro_coxph with na.action", { + testthat::skip_on_cran() acro_init() # R Survival model @@ -96,6 +101,7 @@ test_that("acro_coxph with na.action", { }) test_that("acro_coxph with invalid status options(eg. having a status as 4)", { + testthat::skip_on_cran() acro_init() test_data$status[test_data$status == 1] <- 4 @@ -106,6 +112,7 @@ test_that("acro_coxph with invalid status options(eg. having a status as 4)", { }) test_that("acro_coxph with weights as a column from the dataset", { + testthat::skip_on_cran() acro_init() # add a weight column in the dataset @@ -131,6 +138,7 @@ test_that("acro_coxph with weights as a column from the dataset", { }) test_that("acro_coxph with weights as a string column name from the dataset", { + testthat::skip_on_cran() acro_init() # add a weight column in the dataset @@ -156,6 +164,7 @@ test_that("acro_coxph with weights as a string column name from the dataset", { }) test_that("acro_coxph with weights provided by the user", { + testthat::skip_on_cran() acro_init() # define a vector weight @@ -180,6 +189,7 @@ test_that("acro_coxph with weights provided by the user", { }) test_that("acro_coxph with cluster as a column in the dataset", { + testthat::skip_on_cran() acro_init() # R Survival model @@ -202,6 +212,7 @@ test_that("acro_coxph with cluster as a column in the dataset", { }) test_that("acro_coxph with cluster as a quoted column name in the dataset", { + testthat::skip_on_cran() acro_init() # R Survival model @@ -224,6 +235,7 @@ test_that("acro_coxph with cluster as a quoted column name in the dataset", { }) test_that("acro_coxph with cluster provided by the user", { + testthat::skip_on_cran() acro_init() # define a cluster vector @@ -249,6 +261,7 @@ test_that("acro_coxph with cluster provided by the user", { }) test_that("acro_coxph warns on unused arguments in ...", { + testthat::skip_on_cran() acro_init() expect_warning(