From 6700bc288f572567e715a55eb60f4b68d0eba962 Mon Sep 17 00:00:00 2001 From: Sam Abbott Date: Sat, 5 Feb 2022 19:09:37 +0000 Subject: [PATCH] switch get_linelist to depreciate_stop vs warn --- NAMESPACE | 4 +--- R/get_linelist.R | 4 ++-- R/get_national_data.R | 1 - R/get_regional_data.R | 1 - man/get_regional_data.Rd | 9 --------- 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index e1363830..51a779b0 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -89,9 +89,7 @@ importFrom(httr,POST) importFrom(httr,content) importFrom(httr,status_code) importFrom(jsonlite,fromJSON) -importFrom(lifecycle,deprecate_warn) -importFrom(lifecycle,deprecated) -importFrom(lifecycle,is_present) +importFrom(lifecycle,deprecate_stop) importFrom(lubridate,as_date) importFrom(lubridate,dmy) importFrom(lubridate,mdy) diff --git a/R/get_linelist.R b/R/get_linelist.R index 6b5f48ca..2f2d11f8 100644 --- a/R/get_linelist.R +++ b/R/get_linelist.R @@ -21,7 +21,7 @@ #' #' @keywords internal #' -#' @importFrom lifecycle deprecate_warn +#' @importFrom lifecycle deprecate_stop #' @importFrom dplyr if_else select mutate filter #' @importFrom lubridate dmy #' @importFrom utils download.file untar @@ -35,7 +35,7 @@ #' } #' get_linelist <- function(clean = TRUE, report_delay_only = FALSE) { - deprecate_warn( + deprecate_stop( when = "0.9.0", what = "covidregionaldata::get_linelist()", details = c( diff --git a/R/get_national_data.R b/R/get_national_data.R index bb5628e3..0645435c 100644 --- a/R/get_national_data.R +++ b/R/get_national_data.R @@ -18,7 +18,6 @@ #' @return A tibble with data related to cases, deaths, hospitalisations, #' recoveries and testing. #' @inheritParams get_regional_data -#' @importFrom lifecycle deprecated is_present deprecate_warn #' @family interface #' @seealso [WHO()], [ECDC()], [JHU()], [Google()] #' @export diff --git a/R/get_regional_data.R b/R/get_regional_data.R index f3bbb97d..34ae99a0 100644 --- a/R/get_regional_data.R +++ b/R/get_regional_data.R @@ -17,7 +17,6 @@ #' @inheritParams initialise_dataclass #' @return A tibble with data related to cases, deaths, hospitalisations, #' recoveries and testing stratified by regions within the given country. -#' @importFrom lifecycle deprecated is_present deprecate_warn #' @family interface #' @seealso [Italy()], [UK()] #' @export diff --git a/man/get_regional_data.Rd b/man/get_regional_data.Rd index de52bb4f..e825493b 100644 --- a/man/get_regional_data.Rd +++ b/man/get_regional_data.Rd @@ -13,8 +13,6 @@ get_regional_data( class = FALSE, verbose = TRUE, regions, - include_level_2_regions = deprecated(), - localise_regions = deprecated(), ... ) } @@ -47,13 +45,6 @@ messages and warnings be returned.} \item{regions}{A character vector of target regions to be assigned to the \code{target_regions} field and used to filter the returned data.} -\item{include_level_2_regions}{\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#deprecated}{\figure{lifecycle-deprecated.svg}{options: alt='[Deprecated]'}}}{\strong{[Deprecated]}} Boolean. If TRUE, returns data stratified by -level 2 regions. If FALSE, stratified by Level 1. Note that Level 2 region -data is not always available. In these cases the user will get a warning -and the Level 1 data will be returned.} - -\item{localise_regions}{\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#deprecated}{\figure{lifecycle-deprecated.svg}{options: alt='[Deprecated]'}}}{\strong{[Deprecated]}} Logical, defaults to TRUE. Should region names be localised.} - \item{...}{Additional arguments to pass to class specific functionality.} } \value{