Added read.csv to NAMESPACE, ignoring travis-tools in Appveyor builds

Chicago · Feb 11, 2016 · 92234e5 · 92234e5
1 parent b1f5e7c
commit 92234e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -11,4 +11,5 @@ RSocrata.Rcheck
 ^\.travis\.yml$
 appveyor.yml
 CONTRIBUTING.md
-NEWS.md
+NEWS.md
+travis-tool.sh.cmd
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -10,8 +10,8 @@ Description: Provides easier interaction with
     format and manages throttling by 'Socrata'.
     Users can upload data to Socrata portals directly
     from R.
-Version: 1.7.0-10
-Date: 2016-01-30
+Version: 1.7.0-11
+Date: 2016-02-11
 Author: Hugh Devlin, Ph. D., Tom Schenk, Jr., and John Malc
 Maintainer: "Tom Schenk Jr." <developers@cityofchicago.org>
 Depends:

diff --git a/NAMESPACE b/NAMESPACE
@@ -15,3 +15,4 @@ importFrom(httr,parse_url)
 importFrom(httr,stop_for_status)
 importFrom(jsonlite,fromJSON)
 importFrom(mime,guess_type)
+importFrom(utils,read.csv)
diff --git a/R/RSocrata.R b/R/RSocrata.R
@@ -163,6 +163,7 @@ getResponse <- function(url, email = NULL, password = NULL) {
 #'
 #' @author Hugh J. Devlin \email{Hugh.Devlin@@cityofchicago.org}
 #' @importFrom httr content
+#' @importFrom utils read.csv
 #' @param response - an httr response object
 #' @return data frame, possibly empty
 #' @noRd