From b3cd7f8d77ceb73ff233c00ede34416ef51bd8e6 Mon Sep 17 00:00:00 2001 From: colin millar Date: Wed, 31 May 2017 12:14:59 +0200 Subject: [PATCH] bug fixes related to name change --- .travis.yml | 9 ++++----- DESCRIPTION | 8 ++++---- R/getSD.R | 2 +- R/showStock.R | 2 +- man/getSD.Rd | 2 +- tests/testthat.R | 2 +- tests/testthat/test-test.R | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e8cd06..98c36fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ os: language: r r: - - oldrel - release + - devel sudo: false @@ -17,6 +17,8 @@ repos: r_packages: - rmarkdown + - covr + - testthat cache: packages @@ -25,9 +27,6 @@ notifications: on_success: change on_failure: change -r_github_packages: - - jimhester/covr - after_success: - Rscript -e 'library(covr);codecov()' - + diff --git a/DESCRIPTION b/DESCRIPTION index 20e191c..d5753e1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,9 +1,9 @@ Package: icesSD -Version: 1.0-0 -Date: 2016-11-10 +Version: 1.1-0 +Date: 2017-05-31 Title: Stock Database Web Services -Authors@R: c(person("Colin", "Millar", role="aut"), - person("Scott", "Large", role=c("aut","cre"), email="scott.large@ices.dk"), +Authors@R: c(person("Colin", "Millar", role=c("aut","cre"), email = "colin.millar@ices.dk"), + person("Scott", "Large", role="aut"), person("Arni", "Magnusson", role="aut")) Imports: curl, jsonlite diff --git a/R/getSD.R b/R/getSD.R index e573a12..c9b6094 100644 --- a/R/getSD.R +++ b/R/getSD.R @@ -9,7 +9,7 @@ #' \code{\link{icesSD-package}} gives an overview of the package. #' #' @examples -#' sldata <- getSLD() +#' sddata <- getSD() #' #' @export diff --git a/R/showStock.R b/R/showStock.R index 76603df..f1df839 100644 --- a/R/showStock.R +++ b/R/showStock.R @@ -23,7 +23,7 @@ showStock <- function(stock, year = NULL, quiet = FALSE) { - sddata <- getSLD() + sddata <- getSD() out <- sddata[sddata$StockCode == stock,] if (is.null(year)) year <- max(out$ActiveYear) diff --git a/man/getSD.Rd b/man/getSD.Rd index 1bc3e33..fbd3438 100644 --- a/man/getSD.Rd +++ b/man/getSD.Rd @@ -17,6 +17,6 @@ A data frame. Get stock list data such as stock code, expert group, assessment type, etc. } \examples{ -sldata <- getSLD() +sddata <- getSD() } diff --git a/tests/testthat.R b/tests/testthat.R index 0a5f191..9a9a75c 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -2,4 +2,4 @@ library(testthat) ## test package -test_check('icesSLD') +test_check('icesSD') diff --git a/tests/testthat/test-test.R b/tests/testthat/test-test.R index c29a1e3..4b7011d 100644 --- a/tests/testthat/test-test.R +++ b/tests/testthat/test-test.R @@ -1,5 +1,5 @@ context('webservice access') test_that('Webservice access is okay', { - expect_is(checkSLDWebserviceOK(), "logical") + expect_is(checkSDWebserviceOK(), "logical") })