Merge branch 'dev' into 'master'

Remove deprecated code See merge request ConorIA/senamhiR!3
ConorIA · Oct 31, 2017 · 8f8b7e1 · 8f8b7e1
2 parents 512e2fe + b8b5b07
commit 8f8b7e1
Show file tree

Hide file tree

Showing 24 changed files with 18 additions and 966 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -6,5 +6,6 @@ appveyor.yml
 .gitattributes
 .gitignore
 README.md
+README.Rmd
 LICENSE.md
-install_senamhiR.R
+install_senamhiR.R
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -13,19 +13,16 @@ Description: A collection of functions to obtain archived Peruvian climatologica
 Depends:
     R (>= 3.1.0)
 Imports:
-    curl,
     DBI,
     DT,
     dplyr,
     geosphere,
     leaflet,
     magrittr,
-    readr,
     RMySQL,
     shiny,
     tibble,
     utils,
-    XML,
     zoo
 Suggests: 
     testthat,

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,16 +1,12 @@
 # Generated by roxygen2: do not edit by hand
 
-export(download_data)
 export(download_data_sql)
-export(generate_local_catalogue)
 export(map_stations)
 export(qc)
 export(quick_audit)
-export(read_data)
 export(senamhiR)
 export(station_explorer)
 export(station_search)
-export(write_data)
 importFrom(DBI,dbConnect)
 importFrom(DBI,dbDisconnect)
 importFrom(DBI,dbGetQuery)
@@ -20,9 +16,6 @@ importFrom(DT,dataTableOutput)
 importFrom(DT,datatable)
 importFrom(DT,renderDataTable)
 importFrom(RMySQL,MySQL)
-importFrom(XML,htmlTreeParse)
-importFrom(XML,readHTMLTable)
-importFrom(curl,curl_download)
 importFrom(dplyr,filter)
 importFrom(dplyr,select)
 importFrom(geosphere,distGeo)
@@ -32,8 +25,6 @@ importFrom(leaflet,awesomeIcons)
 importFrom(leaflet,leaflet)
 importFrom(leaflet,setView)
 importFrom(magrittr,"%>%")
-importFrom(readr,read_csv)
-importFrom(readr,write_csv)
 importFrom(shiny,br)
 importFrom(shiny,column)
 importFrom(shiny,em)
@@ -50,6 +41,4 @@ importFrom(tibble,as_tibble)
 importFrom(tibble,has_name)
 importFrom(tibble,tibble)
 importFrom(utils,glob2rx)
-importFrom(utils,setTxtProgressBar)
-importFrom(utils,txtProgressBar)
 importFrom(zoo,as.yearmon)
diff --git a/R/clean_table.R b/R/clean_table.R
@@ -9,6 +9,7 @@
 #'
 #' @return tbl_df
 #' 
+#' @importFrom tibble has_name
 #' @keywords internal
 #'
 #' @author Conor I. Anderson
@@ -101,4 +102,4 @@
     }
   }
   datain
-}
+}
diff --git a/R/data.R b/R/data.R
@@ -18,8 +18,5 @@
 #'   \item{Province}{the province where the station is located}
 #'   \item{District}{the district where the station is located} 
 #' }
-#'   
-#' @examples
-#' \dontrun{catalogue}
+#'
 "catalogue"
-
diff --git a/R/download_action.R b/R/download_action.R
diff --git a/R/download_data.R b/R/download_data.R
diff --git a/R/generate_catalogue.R b/R/generate_catalogue.R
diff --git a/R/generate_local_catalogue.R b/R/generate_local_catalogue.R