Skip to content

Commit

Permalink
Merge pull request #16 from MarkEdmondson1234/master
Browse files Browse the repository at this point in the history
Change dependencies pass CRAN check
  • Loading branch information
MarkEdmondson1234 authored Aug 9, 2016
2 parents b7cd4db + 25c036c commit 9b23064
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ LazyData: TRUE
Depends:
R (>= 3.2.0)
Imports:
googleAuthR (>= 0.2.0)
googleAuthR (>= 0.2.0),
googleCloudStorageR (>= 0.1.0)
Suggests:
shiny (>= 0.12.1),
jsonlite (>= 0.9.21),
httr (>= 1.1.0),
knitr,
rmarkdown,
googleCloudStorageR
rmarkdown
RoxygenNote: 5.0.1
VignetteBuilder: knitr
2 changes: 1 addition & 1 deletion R/downloadData.R
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ bqr_extract_data <- function(projectId,
#' If more than 1GB, will save multiple .csv files with prefix "N_" to filename.
#'
#' @param extractJob An extract job from \link{bqr_extract_data}
#' @param fileName Where to save the csv file. If NULL then uses objectname.
#' @param filename Where to save the csv file. If NULL then uses objectname.
#'
#' @return TRUE if successfully downloaded
#' @import googleCloudStorageR
Expand Down
2 changes: 1 addition & 1 deletion R/jobs.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#'
#' Wait for a bigQuery job to finish.
#'
#' @param jobObject A job object
#' @param job A job object
#' @param wait The number of seconds to wait between checks
#'
#' Use this function to do a loop to check progress of a job running
Expand Down
2 changes: 1 addition & 1 deletion man/bqr_download_extract.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/bqr_wait_for_job.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9b23064

Please sign in to comment.