Preparing for release 2

rOpenGov · Mar 15, 2017 · 73e13b2 · 73e13b2
1 parent a0ae15b
commit 73e13b2
Show file tree

Hide file tree

Showing 68 changed files with 142 additions and 289 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -5,14 +5,14 @@ Date: 2017-03-15
 Version: 3.1.1
 Encoding: UTF-8
 Authors@R: c(
-  person("Leo", "Lahti", email = "louhos@googlegroups.com", role = c("aut", "cre")),
+  person("Leo", "Lahti", email = "leo.lahti@iki.fi", role = c("aut", "cre")),
   person("Przemyslaw" , "Biecek", role = "aut"),
   person("Markus", "Kainu", role = "aut"),
   person("Janne", "Huovari", role = "aut"),
   person("Joona", "Lehtomaki", role = "ctb"), 
   person("Francois", "Briatte", role = "ctb"), 
   person("Oliver", "Reiter", role = "ctb"))
-Maintainer: Leo Lahti <louhos@googlegroups.com>
+Maintainer: Leo Lahti <leo.lahti@iki.fi>
 MailingList: rOpenGov <ropengov-forum@googlegroups.com>
 Description: Tools to download data from the Eurostat database
     <http://ec.europa.eu/eurostat> together with search and
@@ -44,7 +44,7 @@ Suggests:
     rvest,
     testthat
 LazyData: true
-URL: https://github.com/ropengov/eurostat
+URL: https://ropengov.github.io/eurostat
 BugReports: https://github.com/ropengov/eurostat/issues
 VignetteBuilder: knitr
 NeedsCompilation: no

diff --git a/NEWS.md b/NEWS.md
@@ -7,6 +7,7 @@
 
 ## Minor features
 
+* Changed maintainer email address from louhos to leo
 * Added ./docs/ (automated package website generated with pkgdown)
 * Expanded unit tests
 * Gitter badge added to README

diff --git a/R/clean_eurostat_cache.R b/R/clean_eurostat_cache.R
@@ -4,6 +4,7 @@
 #' @param cache_dir A path to cache directory. If \code{NULL} (default)
 #'        tries to clean default temporary cache directory.
 #' @export
+#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
 #' @examples clean_eurostat_cache() 
 clean_eurostat_cache <- function(cache_dir = NULL){
   if (is.null(cache_dir)){

diff --git a/R/dic_order.R b/R/dic_order.R
@@ -8,6 +8,7 @@
 #'    \code{\link{get_eurostat_dic}}.
 #' @param type a type of the x. Could be \code{code} or \code{label}.
 #' @export
+#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
 #' @return A numeric vector of orders.
 dic_order <- function(x, dic, type) {
   if (!is_tibble(dic)) dic <- get_eurostat_dic(dic)

diff --git a/R/eurostat-package.R b/R/eurostat-package.R
@@ -4,7 +4,7 @@
 #' Package: \tab eurostat\cr
 #' Type: \tab Package\cr
 #' Version: \tab See sessionInfo() or DESCRIPTION file\cr
-#' Date: \tab 2014-2016\cr
+#' Date: \tab 2014-2017\cr
 #' License: \tab BSD_2_clause + LICENSE\cr
 #' LazyLoad: \tab yes\cr
 #' }
@@ -16,10 +16,10 @@
 #' @docType package
 #' @title R Tools for Eurostat open data
 #'
-#' @author Leo Lahti, Janne Huovari, Markus Kainu, Przemyslaw Biecek \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
+#' @author Leo Lahti, Janne Huovari, Markus Kainu, Przemyslaw Biecek \email{ropengov-forum@@googlegroups.com} \url{https://ropengov.github.io/eurostat}
 #' @references
 #' See citation("eurostat")
-#' \url{http://github.com/ropengov/eurostat}
+#' \url{https://ropengov.github.io/eurostat}
 #' @examples library(eurostat)
 #' @keywords package
 NULL
diff --git a/R/eurostat_url.R b/R/eurostat_url.R
@@ -3,7 +3,7 @@
 #' @param ... Arguments to be passed
 #' @return url
 #' @references see citation("eurostat"). 
-#' @author Leo Lahti \email{ropengov-forum@@googlegroups.com}
+#' @author Leo Lahti \email{leo.lahti@iki.fi}
 #' @keywords internal
 eurostat_url <- function(...) {
   "http://ec.europa.eu/eurostat/"

diff --git a/R/eurotime2date.R b/R/eurotime2date.R
@@ -8,7 +8,7 @@
 #'        the date is the last date of the period.
 #' @export
 #' @return an object of class \code{\link{Date}}.
-#' @author Janne Huovari \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
+#' @author Janne Huovari \email{janne.huovari@@ptt.fi}
 #' @examples \dontrun{
 #'    lp <- get_eurostat("namq_aux_lp", time_format = "raw")
 #'    lp$time <- eurotime2date(x = lp$time)

diff --git a/R/eurotime2num.R b/R/eurotime2num.R
@@ -4,8 +4,7 @@
 #' @param x a charter string with time information in Eurostat time format.
 #' @export
 #' @return see \code{\link{as.numeric}}.
-#' @author Janne Huovari \email{ropengov-forum@@googlegroups.com} 
-#' 	                 \url{http://github.com/ropengov/eurostat}
+#' @author Janne Huovari \email{janne.huovari@@ptt.fi}
 #' @examples \dontrun{
 #'    lp <- get_eurostat("namq_aux_lp", time_format = "raw")
 #'    lp$time <- eurotime2num(x = lp$time)

diff --git a/R/get_eurostat.R b/R/get_eurostat.R
@@ -43,6 +43,7 @@
 #'        can be removed. Default is \code{FALSE}.
 #' @param ... further argument for \code{\link{get_eurostat_json}}.
 #' @export
+#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
 #' @details Data sets are downloaded from 
 #' \href{http://ec.europa.eu/eurostat/estat-navtree-portlet-prod/BulkDownloadListing}{the Eurostat bulk download facility} or from The Eurostat Web Services 
 #' \href{http://ec.europa.eu/eurostat/web/json-and-unicode-web-services}{JSON API}.

diff --git a/R/get_eurostat_json.R b/R/get_eurostat_json.R
@@ -23,6 +23,7 @@
 #'
 #' @return A dataset as a data_frame.
 #' @export
+#' @author Przemyslaw Biecek, Leo Lahti, Janne Huovari and Markus Kainu \email{ropengov-forum@@googlegroups.com} \url{http://github.com/ropengov/eurostat}
 #' @examples
 #'  \dontrun{
 #'    tmp <- get_eurostat_json("cdh_e_fos")

diff --git a/docs/articles/2017_RJournal_manuscript/2017-manu-bmi-1.pdf b/docs/articles/2017_RJournal_manuscript/2017-manu-bmi-1.pdf
diff --git a/docs/articles/2017_RJournal_manuscript/2017-manu-energy-1.pdf b/docs/articles/2017_RJournal_manuscript/2017-manu-energy-1.pdf
diff --git a/docs/articles/2017_RJournal_manuscript/2017-manu-mapexample-1.pdf b/docs/articles/2017_RJournal_manuscript/2017-manu-mapexample-1.pdf
diff --git a/docs/articles/2017_RJournal_manuscript/2017-manu-roadacc-1.pdf b/docs/articles/2017_RJournal_manuscript/2017-manu-roadacc-1.pdf
diff --git a/docs/articles/2017_RJournal_manuscript/RJwrapper.log b/docs/articles/2017_RJournal_manuscript/RJwrapper.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016/Debian) (preloaded format=pdflatex 2016.11.22)  15 MAR 2017 16:37
+This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016/Debian) (preloaded format=pdflatex 2016.11.22)  15 MAR 2017 16:46
 entering extended mode
  restricted \write18 enabled.
  %&-line parsing enabled.
@@ -1498,11 +1498,11 @@ Package rerunfilecheck Info: File `RJwrapper.brf' has not changed.
 Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 24.
  ) 
 Here is how much of TeX's memory you used:
- 22162 strings out of 494358
- 394635 string characters out of 6164526
+ 22159 strings out of 494358
+ 394608 string characters out of 6164526
  494649 words of memory out of 5000000
  24792 multiletter control sequences out of 15000+600000
- 52933 words of font info for 210 fonts, out of 8000000 for 9000
+ 52774 words of font info for 208 fonts, out of 8000000 for 9000
  350 hyphenation exceptions out of 8191
  62i,12n,56p,1484b,620s stack positions out of 5000i,500n,10000p,200000b,80000s
 pdfTeX warning (dest): name{Hfootnote.10} has been referenced but does not ex
@@ -1542,7 +1542,7 @@ f-dist/fonts/type1/urw/palatino/uplb8a.pfb></usr/share/texlive/texmf-dist/fonts
 /type1/urw/palatino/uplr8a.pfb></usr/share/texlive/texmf-dist/fonts/type1/urw/p
 alatino/uplr8a.pfb></usr/share/texlive/texmf-dist/fonts/type1/urw/palatino/uplr
 i8a.pfb>
-Output written on RJwrapper.pdf (9 pages, 252667 bytes).
+Output written on RJwrapper.pdf (9 pages, 252631 bytes).
 PDF statistics:
  448 PDF objects out of 1000 (max. 8388607)
  412 compressed objects within 5 object streams

diff --git a/docs/articles/2017_RJournal_manuscript/RJwrapper.pdf b/docs/articles/2017_RJournal_manuscript/RJwrapper.pdf
diff --git a/docs/articles/2017_RJournal_manuscript/lahti-huovari-kainu-biecek.html b/docs/articles/2017_RJournal_manuscript/lahti-huovari-kainu-biecek.html
diff --git a/docs/articles/2017_RJournal_manuscript/lahti-huovari-kainu-biecek.pdf b/docs/articles/2017_RJournal_manuscript/lahti-huovari-kainu-biecek.pdf
diff --git a/docs/articles/2017_RJournal_manuscript/lahti-huovari-kainu-biecek.tex b/docs/articles/2017_RJournal_manuscript/lahti-huovari-kainu-biecek.tex
@@ -341,12 +341,7 @@ \section{Discussion}
 
 \section*{Acknowledgements}
 
-We are grateful to all package contributors, including Joona
-Lehtom{\"a}ki, Oliver Reiter and Fran\c{c}ois Briatte and to Eurostat
-for maintaining the open data service. This work is in no way
-officially related to or endorsed by Eurostat. The work has been
-partially funded by Academy of Finland (decisions 295741, 307127), and
-is part of rOpenGov\footnote{\url{https://github.ropengov.io}}.
+We are grateful to all package contributors, including Fran\c{c}ois Briatte, Joona Lehtom{\"a}ki, Oliver Reiter, and Wietse Dol, and to Eurostat for maintaining the open data service. This work is in no way officially related to or endorsed by Eurostat. The work has been partially funded by Academy of Finland (decisions 295741, 307127), and is part of rOpenGov\footnote{\url{https://github.ropengov.io}}.
 
 
 \bibliography{lahti-huovari-kainu-biecek}

diff --git a/docs/articles/blogposts.html b/docs/articles/blogposts.html
diff --git a/docs/articles/cheatsheet.html b/docs/articles/cheatsheet.html
diff --git a/docs/articles/eurostat_tutorial.html b/docs/articles/eurostat_tutorial.html