Merge pull request #55 from sebpardo/master

Minor updates prior to v0.4.0 CRAN release
ropensci · Apr 25, 2017 · c435eaf · c435eaf
2 parents 6248ce6 + edfc588
commit c435eaf
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 60 deletions.
diff --git 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
@@ -6,3 +6,5 @@
 krlocal.R
 /.Rapp.history
 .DS_Store
+rebird-tests.R
+revdep/
diff --git 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
@@ -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
@@ -1,7 +1,5 @@
-As per Uwe's previous comment, now using CRAN master URL (<https://cran.r-project.org/package=rebird/>) 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 <sebpardo@gmail.com>'
-
-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
diff --git a/man/ebirdgeo.Rd b/man/ebirdgeo.Rd
diff --git a/man/ebirdhotspot.Rd b/man/ebirdhotspot.Rd
diff --git a/man/ebirdloc.Rd b/man/ebirdloc.Rd
diff --git a/man/ebirdnotable.Rd b/man/ebirdnotable.Rd
diff --git a/man/ebirdregion.Rd b/man/ebirdregion.Rd
diff --git a/man/ebirdregioncheck.Rd b/man/ebirdregioncheck.Rd
diff --git a/man/ebirdtaxonomy.Rd b/man/ebirdtaxonomy.Rd
diff --git a/man/getlatlng.Rd b/man/getlatlng.Rd
diff --git a/man/nearestobs.Rd b/man/nearestobs.Rd
diff --git a/man/rebird-package.Rd b/man/rebird-package.Rd
diff --git 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")
 })