diff --git a/.Rbuildignore b/.Rbuildignore index ea8f96e..a39cc8e 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -12,3 +12,5 @@ README.Rmd vignettes/figure/ ^cran-comments.md$ ^cran-comments\.md$ +^rebird-tests.R$ +^revdep$ diff --git a/.gitignore b/.gitignore index fda76f9..f58ee18 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ krlocal.R /.Rapp.history .DS_Store +rebird-tests.R +revdep/ diff --git a/DESCRIPTION b/DESCRIPTION index eaacf29..d6c5b5f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rebird -Version: 0.3.4 -Date: 2016-03-23 +Version: 0.4.0 +Date: 2016-04-25 Title: R Client for the eBird Database of Bird Observations Description: A programmatic client for the eBird database, including functions for searching for bird observations by geographic location (latitude, @@ -27,4 +27,4 @@ Suggests: knitr, testthat, covr -RoxygenNote: 5.0.1 +RoxygenNote: 6.0.1 diff --git a/NEWS.md b/NEWS.md index 6449bfc..7e05cad 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,11 @@ +rebird 0.4.0 +=================== + +### MINOR IMPROVEMENTS AND BUG FIXES + +* Fix for `ebirdfreq` which stopped working due to changes on the eBird website (#52). +* Replaced deprecated `dplyr::rbind_all` function with `dplyr::bind_rows` (#43). + rebird 0.3.0 =================== diff --git a/cran-comments.md b/cran-comments.md index 7c8e5a3..f812b90 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,7 +1,5 @@ -As per Uwe's previous comment, now using CRAN master URL () to avoid canonical URL note. The NOTE regarding this issue is not coming up now when testing in win-builder devel version. - ## Test environments -* local machine running Linux Ubuntu 14.04.4, R 3.2.4 +* local machine running Linux Ubuntu 16.04 LTS, R 3.4.0 * win-builder (devel and release) * Windows Server 2012 R2 x64, R 3.2.4 on Appveyor * Ubuntu 12.04.5 LTS, R 3.2.4 or Travis-CI @@ -12,13 +10,6 @@ There were no ERRORs or WARNINGs. There was 1 NOTE: * checking CRAN incoming feasibility ... NOTE -Maintainer: 'Sebastian Pardo ' - -License components with restrictions and base license permitting such: - MIT + file LICENSE -File 'LICENSE': - YEAR: 2016 - COPYRIGHT HOLDER: Rafael Maia Possibly mis-spelled words in DESCRIPTION: eBird (4:25, 5:44, 7:17) diff --git a/man/ebirdfreq.Rd b/man/ebirdfreq.Rd index 7bd5032..00e37e9 100644 --- a/man/ebirdfreq.Rd +++ b/man/ebirdfreq.Rd @@ -22,8 +22,9 @@ county codes are two-letter identifiers (e.g. Metro Vancouver: "CA-BC-GV"). If querying hotspots then the unique identifier is a 6-digit number prepended with an "L" (e.g. "L196159"). All these codes -can be found by looking at the URL in the Explore Data eBird -page (http://ebird.org//GuideMe?cmd=changeLocation).} +can be found by looking at the URL in each respective +location/hotspot webpage (which are accessible through the +"Explore Data" tab).} \item{startyear}{Starting year for query. Defaults to 1900.} @@ -66,11 +67,10 @@ ebirdfreq("counties", "CA-BC-GV", 1900, 2015, 1, 3) ebirdfreq("hotspots", "L196159", long=FALSE) } } +\references{ +\url{http://ebird.org/} +} \author{ Andy Teucher \email{andy.teucher@gmail.com}, Sebastian Pardo \email{sebpardo@gmail.com} } -\references{ -\url{http://ebird.org/} -} - diff --git a/man/ebirdgeo.Rd b/man/ebirdgeo.Rd index 3eaed01..9871228 100644 --- a/man/ebirdgeo.Rd +++ b/man/ebirdgeo.Rd @@ -90,10 +90,9 @@ ebirdgeo('Anas platyrhynchos', 39, -121, max=5, config=progress()) # ebirdgeo('Anas platyrhynchos', 39, -121, max=5, config=timeout(0.1)) } } -\author{ -Rafael Maia \email{rm72@zips.uakron.edu} -} \references{ \url{http://ebird.org/} } - +\author{ +Rafael Maia \email{rm72@zips.uakron.edu} +} diff --git a/man/ebirdhotspot.Rd b/man/ebirdhotspot.Rd index 3abda1b..13f1a72 100644 --- a/man/ebirdhotspot.Rd +++ b/man/ebirdhotspot.Rd @@ -75,10 +75,9 @@ ebirdhotspot(locID=c('L99381','L99382'), species='larus delawarensis') ebirdhotspot('L99381', max=10, provisional=TRUE) } } -\author{ -Rafael Maia \email{rm72@zips.uakron.edu} -} \references{ \url{http://ebird.org/} } - +\author{ +Rafael Maia \email{rm72@zips.uakron.edu} +} diff --git a/man/ebirdloc.Rd b/man/ebirdloc.Rd index 82a5c55..2e0243d 100644 --- a/man/ebirdloc.Rd +++ b/man/ebirdloc.Rd @@ -103,10 +103,9 @@ ebirdloc(locID = c('L99381','L99382')) ebirdloc('L99381', 'Branta canadensis', provisional=TRUE) } } -\author{ -Rafael Maia \email{rm72@zips.uakron.edu} -} \references{ \url{http://ebird.org/} } - +\author{ +Rafael Maia \email{rm72@zips.uakron.edu} +} diff --git a/man/ebirdnotable.Rd b/man/ebirdnotable.Rd index f8a71d3..f23e477 100644 --- a/man/ebirdnotable.Rd +++ b/man/ebirdnotable.Rd @@ -124,10 +124,9 @@ ebirdnotable(region='US', max=10) ebirdnotable(region='US-OH', regtype='subnational1') } } -\author{ -Rafael Maia \email{rm72@zips.uakron.edu} -} \references{ \url{http://ebird.org/} } - +\author{ +Rafael Maia \email{rm72@zips.uakron.edu} +} diff --git a/man/ebirdregion.Rd b/man/ebirdregion.Rd index f5a69e1..4aa64fc 100644 --- a/man/ebirdregion.Rd +++ b/man/ebirdregion.Rd @@ -82,10 +82,9 @@ ebirdregion(region = 'US', species = 'Setophaga caerulescens') ebirdregion('US-OH', max=10, provisional=TRUE, hotspot=TRUE) } } -\author{ -Rafael Maia \email{rm72@zips.uakron.edu} -} \references{ \url{http://ebird.org/} } - +\author{ +Rafael Maia \email{rm72@zips.uakron.edu} +} diff --git a/man/ebirdregioncheck.Rd b/man/ebirdregioncheck.Rd index 3b9e38a..704d0ad 100644 --- a/man/ebirdregioncheck.Rd +++ b/man/ebirdregioncheck.Rd @@ -27,11 +27,10 @@ ebirdregioncheck("states", "CA-BC") ebirdregioncheck("counties","CA-BC-GV") } } +\references{ +\url{http://ebird.org/} +} \author{ Sebastian Pardo \email{sebpardo@gmail.com}, Andy Teucher \email{andy.teucher@gmail.com} } -\references{ -\url{http://ebird.org/} -} - diff --git a/man/ebirdtaxonomy.Rd b/man/ebirdtaxonomy.Rd index ec128e7..2d2b655 100644 --- a/man/ebirdtaxonomy.Rd +++ b/man/ebirdtaxonomy.Rd @@ -40,10 +40,9 @@ ebirdtaxonomy() ebirdtaxonomy(cat=c("spuh", "slash")) } } -\author{ -Andy Teucher \email{andy.teucher@gmail.com} -} \references{ \url{http://ebird.org/} } - +\author{ +Andy Teucher \email{andy.teucher@gmail.com} +} diff --git a/man/getlatlng.Rd b/man/getlatlng.Rd index 84c70cd..e1d5d8a 100644 --- a/man/getlatlng.Rd +++ b/man/getlatlng.Rd @@ -18,10 +18,9 @@ with observations of a species. getlatlng() } } -\author{ -Andy Teucher \email{andy.teucher@gmail.com} -} \references{ \url{http://ipinfo.io} } - +\author{ +Andy Teucher \email{andy.teucher@gmail.com} +} diff --git a/man/nearestobs.Rd b/man/nearestobs.Rd index f70dd92..a0caa68 100644 --- a/man/nearestobs.Rd +++ b/man/nearestobs.Rd @@ -78,10 +78,9 @@ nearestobs('branta canadensis', 42, -76) nearestobs('branta canadensis', 42, -76, max=10, provisional=TRUE, hotspot=TRUE) } } -\author{ -Rafael Maia \email{rm72@zips.uakron.edu} -} \references{ \url{http://ebird.org/} } - +\author{ +Rafael Maia \email{rm72@zips.uakron.edu} +} diff --git a/man/rebird-package.Rd b/man/rebird-package.Rd index 04b9595..2e3ee60 100644 --- a/man/rebird-package.Rd +++ b/man/rebird-package.Rd @@ -2,8 +2,8 @@ % Please edit documentation in R/rebird-package.R \docType{package} \name{rebird-package} -\alias{rebird} \alias{rebird-package} +\alias{rebird} \title{rebird: an R package for access to the eBird database.} \description{ An R package to interface with the eBird database. @@ -29,4 +29,3 @@ Andy Teucher \email{andy.teucher@gmail.com}, Sebastian Pardo \email{sebpardo@gmail.com} } \keyword{package} - diff --git a/tests/testthat/test-ebirdfreq.R b/tests/testthat/test-ebirdfreq.R index c8235b9..1863a04 100644 --- a/tests/testthat/test-ebirdfreq.R +++ b/tests/testthat/test-ebirdfreq.R @@ -25,9 +25,7 @@ test_that("ebirdfreq fails correctly", { expect_error(ebirdfreq("hotspots", "foo123"), "Invalid hotspot code") expect_error(ebirdfreq("country"), "Not a valid location type") expect_error(ebirdfreq("counties", "CA-BC-ZZ"), "Specified location doesn't exist") - expect_error(ebirdfreq("hotspots", "L196159", 1901, 1902, long = FALSE), regexp = "^Internal Server Error \\(HTTP 500\\)\\.$") - # for some reason the following fails: - # expect_error(ebirdfreq("hotspots", "L196159", 1900, 1902, long = FALSE), "Internal Server Error (HTTP 500).") + expect_error(ebirdfreq("hotspots", "L196159", 1900, 1902, long = FALSE), "Internal Server Error \\(HTTP 500\\).") expect_error(ebirdfreq("foo", "CA-BC-ZZ"), "Not a valid location type") })