diff --git a/DESCRIPTION b/DESCRIPTION index 1d2dc8b..4e51803 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,10 +1,10 @@ Package: fingertipsR Type: Package -Version: 0.1.5.9000 +Version: 0.1.6 Title: Fingertips Data for Public Health Description: Fingertips () contains data for many indicators of public health in England. The underlying data is now more easily accessible by making use of the API. Maintainer: Sebastian Fox -Depends: R (>= 3.4.2) +Depends: R (>= 3.5.0) Authors@R: c(person("Sebastian", "Fox", , "sebastian.fox@phe.gov.uk", c("aut", "cre")), person("Julian", "Flowers", , "julian.flowers@phe.gov.uk", c("aut","ctb")), person("Crown Copyright 2018", , , , c("cph"))) diff --git a/NEWS.md b/NEWS.md index a756cb7..e8a966e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# fingertipsR 0.1.5.9000 +# fingertipsR 0.1.6 (01/05/2018) * nearest_neighbours() function added diff --git a/cran-comments.md b/cran-comments.md index 6d39ff5..8db4a0f 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,16 +1,13 @@ This package allows users to pull data from an API into their R environment. -This is a resubmission (following one I did on Friday 2nd Feb - I'm really sorry!). One of the new functions, albeit a minor one, returned incorrect information due to me using sprintf incorrectly (I used %o instead of %s). I thought it would be better to update it immediately rather than wait a few months. - ## Test -* local OS X install, R 3.4.3 -* used Travis to check on Linux (5/2/2018) +* local Windows 7 install, R 3.5.0 +* used Travis to check on Linux (1/5/2018) ## R CMD check results There were no WARNINGs or ERRORs. -I have 1 x NOTE because I submitted version 0.1.4 three days ago. See above for justification (whether acceptible or not, I will take your judgement) ## Downstream dependencies diff --git a/tests/testthat/test-extract.R b/tests/testthat/test-extract.R index 7050356..c63de39 100644 --- a/tests/testthat/test-extract.R +++ b/tests/testthat/test-extract.R @@ -3,12 +3,12 @@ library(fingertipsR) context("fingertips data extract") -df1 <- fingertips_data(IndicatorID = 92309) -df2 <- suppressWarnings(fingertips_data(IndicatorID = 92309, DomainID = 1938132983)) -df3 <- suppressWarnings(fingertips_data(IndicatorID = 92309, ProfileID = 19)) +df1 <- fingertips_data(IndicatorID = 259) +df2 <- suppressWarnings(fingertips_data(IndicatorID = 259, DomainID = 2000008)) +df3 <- suppressWarnings(fingertips_data(IndicatorID = 259, ProfileID = 20)) df4 <- fingertips_data(DomainID = 1938132767) df5 <- fingertips_data(ProfileID = 132) -df6 <- fingertips_data(IndicatorID = 92309, ProfileID = NA) +df6 <- fingertips_data(IndicatorID = 259, ProfileID = NA) df7 <- fingertips_data(DomainID = 1938132767, AreaCode = "E06000015") df8 <- fingertips_data(DomainID = 1938132767, rank = TRUE)