Merge pull request #145 from rOpenGov/antagomir

Antagomir
rOpenGov · Oct 23, 2018 · 91bf9ec · 91bf9ec
2 parents 54966f2 + a253749
commit 91bf9ec
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 42 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: pxweb
 Type: Package
 Title: R Interface to the PX-Web/PC-Axis API
-Version: 0.6.37
+Version: 0.6.38
 Encoding: UTF-8
 Authors@R: c(
   	person("Mans", "Magnusson", email = "mons.magnusson@gmail.com", role = c("aut", "cre")),
@@ -38,4 +38,4 @@ Suggests:
     rmarkdown,    
     roxygen2,
     testthat (>= 0.11)
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.0
diff --git a/inst/extdata/api.json b/inst/extdata/api.json
@@ -185,17 +185,6 @@
         "max_values_to_download" : 100000
     },
 
-    "data.ssb.no": { 
-        "alias" : ["ssb"],
-        "description" : "Statistics Norway",
-        "url" : "http://data.ssb.no/api/[version]/[lang]",
-        "version": ["v0"], 
-        "lang": ["en"],
-        "calls_per_period": 30,
-        "period_in_seconds": 10,
-        "max_values_to_download" : 100000
-    },
-
     "pxweb.asub.ax": {
         "alias" : ["asub"],
         "description" : "Statistics Aland",

diff --git a/inst/extras/build.cran.sh b/inst/extras/build.cran.sh
@@ -2,6 +2,6 @@
 #/home/lei/bin/R CMD BATCH document.R
 #/home/lei/bin/R CMD build ../../ --no-build-vignettes
 /home/lei/bin/R-3.5.1/bin/R CMD build ../../ 
-/home/lei/bin/R-3.5.1/bin/R CMD check --as-cran pxweb_0.6.37.tar.gz
-/home/lei/bin/R-3.5.1/bin/R CMD INSTALL pxweb_0.6.37.tar.gz
+/home/lei/bin/R-3.5.1/bin/R CMD check --as-cran pxweb_0.6.38.tar.gz
+/home/lei/bin/R-3.5.1/bin/R CMD INSTALL pxweb_0.6.38.tar.gz
 
diff --git a/man/test_pxweb_api.Rd b/man/test_pxweb_api.Rd
diff --git a/vignettes/pxweb.html b/vignettes/pxweb.html
@@ -12,7 +12,7 @@
 
 <meta name="author" content="Mans Magnusson, Leo Lahti et al." />
 
-<meta name="date" content="2017-09-16" />
+<meta name="date" content="2018-10-19" />
 
 <title>PX-WEB API Interface for R</title>
 
@@ -70,7 +70,7 @@
 
 <h1 class="title toc-ignore">PX-WEB API Interface for R</h1>
 <h4 class="author"><em>Mans Magnusson, Leo Lahti et al.</em></h4>
-<h4 class="date"><em>2017-09-16</em></h4>
+<h4 class="date"><em>2018-10-19</em></h4>
 
 
 
@@ -96,7 +96,7 @@ <h2><a name="installation"></a>Installation</h2>
 <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">install.packages</span>(<span class="st">&quot;pxweb&quot;</span>)</code></pre></div>
 <p>Install the latest version from github:</p>
 <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">library</span>(<span class="st">&quot;devtools&quot;</span>)
-devtools::<span class="kw">install_github</span>(<span class="st">&quot;ropengov/pxweb&quot;</span>)</code></pre></div>
+devtools<span class="op">::</span><span class="kw">install_github</span>(<span class="st">&quot;ropengov/pxweb&quot;</span>)</code></pre></div>
 <p>Test the installation by loading the library:</p>
 <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">library</span>(pxweb)</code></pre></div>
 <p>A tutorial is included with the package with:</p>
@@ -172,13 +172,13 @@ <h2>About the API</h2>
 <h2>Session info</h2>
 <p>This vignette was created with</p>
 <div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r"><span class="kw">sessionInfo</span>()</code></pre></div>
-<pre><code>## R version 3.4.1 (2017-06-30)
+<pre><code>## R version 3.5.1 (2018-07-02)
 ## Platform: x86_64-pc-linux-gnu (64-bit)
-## Running under: Ubuntu 17.04
+## Running under: Ubuntu 18.04.1 LTS
 ## 
 ## Matrix products: default
-## BLAS: /usr/lib/openblas-base/libblas.so.3
-## LAPACK: /usr/lib/libopenblasp-r0.2.19.so
+## BLAS: /home/lei/bin/R-3.5.1/lib/libRblas.so
+## LAPACK: /home/lei/bin/R-3.5.1/lib/libRlapack.so
 ## 
 ## locale:
 ##  [1] LC_CTYPE=en_US.UTF-8       LC_NUMERIC=C              
@@ -192,15 +192,15 @@ <h2>Session info</h2>
 ## [1] stats     graphics  grDevices utils     datasets  methods   base     
 ## 
 ## other attached packages:
-## [1] knitr_1.17           pxweb_0.6.36         rmarkdown_1.6.0.9001
+## [1] pxweb_0.6.38   rmarkdown_1.10
 ## 
 ## loaded via a namespace (and not attached):
-##  [1] Rcpp_0.12.12      digest_0.6.12     rprojroot_1.2    
-##  [4] plyr_1.8.4        R6_2.2.2          backports_1.1.0  
-##  [7] magrittr_1.5      evaluate_0.10.1   httr_1.3.1       
-## [10] stringi_1.1.5     data.table_1.10.4 RJSONIO_1.3-0    
-## [13] tools_3.4.1       stringr_1.2.0     yaml_2.1.14      
-## [16] compiler_3.4.1    tcltk_3.4.1       htmltools_0.3.6</code></pre>
+##  [1] Rcpp_0.12.19      digest_0.6.18     rprojroot_1.3-2  
+##  [4] plyr_1.8.4        R6_2.3.0          backports_1.1.2  
+##  [7] magrittr_1.5      evaluate_0.12     httr_1.3.1       
+## [10] stringi_1.2.4     data.table_1.11.8 RJSONIO_1.3-0    
+## [13] tools_3.5.1       stringr_1.3.1     yaml_2.2.0       
+## [16] compiler_3.5.1    htmltools_0.3.6   knitr_1.20</code></pre>
 </div>
 
 

diff --git a/vignettes/pxweb.md b/vignettes/pxweb.md
@@ -1,7 +1,7 @@
 ---
 title: "PX-WEB API Interface for R"
 author: "Mans Magnusson, Leo Lahti et al."
-date: "2017-09-16"
+date: "2018-10-19"
 output:
   - rmarkdown::html_vignette
   - rmarkdown::md_vignette  
@@ -175,13 +175,13 @@ sessionInfo()
 ```
 
 ```
-## R version 3.4.1 (2017-06-30)
+## R version 3.5.1 (2018-07-02)
 ## Platform: x86_64-pc-linux-gnu (64-bit)
-## Running under: Ubuntu 17.04
+## Running under: Ubuntu 18.04.1 LTS
 ## 
 ## Matrix products: default
-## BLAS: /usr/lib/openblas-base/libblas.so.3
-## LAPACK: /usr/lib/libopenblasp-r0.2.19.so
+## BLAS: /home/lei/bin/R-3.5.1/lib/libRblas.so
+## LAPACK: /home/lei/bin/R-3.5.1/lib/libRlapack.so
 ## 
 ## locale:
 ##  [1] LC_CTYPE=en_US.UTF-8       LC_NUMERIC=C              
@@ -195,15 +195,15 @@ sessionInfo()
 ## [1] stats     graphics  grDevices utils     datasets  methods   base     
 ## 
 ## other attached packages:
-## [1] knitr_1.17           pxweb_0.6.36         rmarkdown_1.6.0.9001
+## [1] pxweb_0.6.38   rmarkdown_1.10 knitr_1.20    
 ## 
 ## loaded via a namespace (and not attached):
-##  [1] Rcpp_0.12.12      digest_0.6.12     rprojroot_1.2    
-##  [4] plyr_1.8.4        R6_2.2.2          backports_1.1.0  
-##  [7] magrittr_1.5      evaluate_0.10.1   httr_1.3.1       
-## [10] stringi_1.1.5     data.table_1.10.4 RJSONIO_1.3-0    
-## [13] tools_3.4.1       stringr_1.2.0     yaml_2.1.14      
-## [16] compiler_3.4.1    tcltk_3.4.1       htmltools_0.3.6
+##  [1] Rcpp_0.12.19      digest_0.6.18     rprojroot_1.3-2  
+##  [4] plyr_1.8.4        R6_2.3.0          backports_1.1.2  
+##  [7] magrittr_1.5      evaluate_0.12     httr_1.3.1       
+## [10] stringi_1.2.4     data.table_1.11.8 RJSONIO_1.3-0    
+## [13] tools_3.5.1       stringr_1.3.1     yaml_2.2.0       
+## [16] compiler_3.5.1    htmltools_0.3.6
 ```