Migrating json API

.github/workflows/R-CMD-check.yaml → .github/workflows/check-full.yaml

@@ -1,16 +1,9 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
-  push:
-    branches:
-      - main
-      - master
-  pull_request:
-    branches:
-      - main
-      - master
+  workflow_dispatch:
   schedule:
-    - cron:  '30 12 * * 3'
+    - cron:  '0 0 * * 0'
 
 name: R-CMD-check
 
@@ -24,19 +17,21 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
-          - {os: macOS-latest,   r: 'release'}
-          - {os: ubuntu-20.04,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-20.04,   r: 'release'}
-          - {os: ubuntu-20.04,   r: 'oldrel-1'}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
       - uses: r-lib/actions/setup-pandoc@v2
+
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
@@ -49,3 +44,5 @@ jobs:
           needs: check
 
       - uses: r-lib/actions/check-r-package@v2
+        with:
+          upload-snapshots: true

.github/workflows/check-standard.yaml

@@ -0,0 +1,29 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2

.github/workflows/render-readme.yaml

@@ -1,50 +1,34 @@
-# Workflow derived from https://github.com/r-lib/actions/blob/master/.github/workflows/render-readme.yaml
-# and https://fromthebottomoftheheap.net/2020/04/30/rendering-your-readme-with-github-actions/
-# Workflow triggering derived from: https://stevenmortimer.com/running-github-actions-sequentially/
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   workflow_dispatch:
   push:
-    paths:
-      - 'README.Rmd'
+    paths: ['README.Rmd']
 
-name: Render README
+name: render-rmarkdown
 
 jobs:
-  render:
-    name: Render README
-    runs-on: macOS-latest
+  render-rmarkdown:
+    runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
-      - uses: r-lib/actions/setup-pandoc@master
+      - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: r-lib/actions/setup-r@master
-        with:
-          use-public-rspm: true
+      - uses: r-lib/actions/setup-r@v2
 
-      - uses: r-lib/actions/setup-r-dependencies@master
-        with:
-          extra-packages: |
-            rmarkdown
-
-          needs: website
-      - name: Render README
-        run: Rscript -e 'rmarkdown::render("README.Rmd")'
-
-      - name: Commit results
+      - uses: r-lib/actions/setup-renv@v2
+
+      - name: Render Rmarkdown files and Commit Results
         run: |
-          git config --local user.email "actions@github.com"
-          git config --local user.name "GitHub Actions"
-          git commit README.md -m 'Re-build README.Rmd' || echo "No changes to commit"
-          git push origin || echo "No changes to commit"
-
-      - name: Trigger pkgdown workflow
-        if: success()
-        uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.ROPENGOV_WORKFLOWS_PAT }}
-          repository: ${{ github.repository }}
-          event-type: trigger-pkgdown-workflow
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+          RMD_PATH=($(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | grep '[.]Rmd$'))
+          Rscript -e 'for (f in commandArgs(TRUE)) if (file.exists(f)) rmarkdown::render(f)' ${RMD_PATH[*]}
+          git config --local user.name "$GITHUB_ACTOR"
+          git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git commit ${RMD_PATH[*]/.Rmd/.md} -m 'Re-build Rmarkdown files' || echo "No changes to commit"
+          git push origin || echo "No changes to commit"

.github/workflows/test-coverage.yaml

@@ -1,4 +1,4 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
@@ -13,18 +13,20 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     steps:
       - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@v1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: covr
+          extra-packages: any::covr
+          needs: coverage
 
       - name: Test coverage
-        run: covr::codecov()
-        shell: Rscript {0}
+        run: covr::codecov(token = Sys.getenv("CODECOV_TOKEN"), quiet = FALSE)
+        shell: Rscript {0}

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: eurostat
 Title: Tools for Eurostat Open Data
-Version: 3.7.12
+Version: 3.7.13
 Date: 2022-06-28
 Authors@R: c(
     person(given = "Leo", 
@@ -98,6 +98,6 @@ MailingList: rOpenGov <ropengov-forum@googlegroups.com>
 NeedsCompilation: no
 Repository: CRAN
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.3
 X-schema.org-isPartOf: http://ropengov.org/
 X-schema.org-keywords: ropengov

NAMESPACE

@@ -26,7 +26,6 @@ export(search_eurostat)
 export(set_eurostat_cache_dir)
 export(validate_geo_code)
 export(validate_nuts_regions)
-import(httr)
 importFrom(RefManageR,BibEntry)
 importFrom(RefManageR,toBiblatex)
 importFrom(broom,tidy)
@@ -38,8 +37,12 @@ importFrom(dplyr,coalesce)
 importFrom(dplyr,filter)
 importFrom(dplyr,left_join)
 importFrom(dplyr,mutate)
+importFrom(httr,RETRY)
+importFrom(httr,build_url)
 importFrom(httr,content)
 importFrom(httr,http_error)
+importFrom(httr,parse_url)
+importFrom(httr,status_code)
 importFrom(jsonlite,fromJSON)
 importFrom(lubridate,day)
 importFrom(lubridate,dmy)
@@ -61,4 +64,5 @@ importFrom(tidyr,gather)
 importFrom(tidyr,separate)
 importFrom(utils,data)
 importFrom(utils,download.file)
+importFrom(utils,hasName)
 importFrom(utils,toBibtex)

NEWS.md

@@ -1,3 +1,8 @@
+# eurostat 3.7.13 (2023-02-01)
+
+* Updated `get_eurostat_json` to migrate from JSON web service to API Statistics (addressed in issues #243, #251). See Eurostat - Data browser online help website for more information: https://wikis.ec.europa.eu/display/EUROSTATHELP/API+Statistics+-+migrating+from+JSON+web+service+to+API+Statistics
+* Minor fixes in `get_bibentry` and `get_eurostat_geospatial`
+
 # eurostat 3.7.12 (2022-06-28)
 
 * Updated included dataset `eurostat_geodata_60_2016` to fix the issue of old-style crs object (#237)

R/get_bibentry.R

@@ -33,7 +33,7 @@ get_bibentry <- function(code,
   if (!any(class(code) %in% c("character", "factor"))) {
     stop("The code(s) must be added as character vector")
   }
-  if (!is.null(keywords) & !class(keywords) == "list") {
+  if (!is.null(keywords) & !inherits(keywords, "list")) {
     stop("If keyword(s) are added, they must be added as a list.")
   }
 

R/get_eurostat_geospatial.R

@@ -184,7 +184,7 @@
 #'
 #' @importFrom utils data
 #' @importFrom broom tidy
-#' @importFrom httr http_error content
+#' @importFrom httr http_error content RETRY
 #' @importFrom methods as
 #' @importFrom dplyr left_join
 #'
@@ -337,7 +337,7 @@ get_eurostat_geospatial <- function(output_class = "sf",
 
         if (nuts_level %in% c("0", "all")) {
           url <- paste0(burl, resolution, "M_", year, "_", crs, "_LEVL_0.geojson")
-          resp <- RETRY("GET", url, terminate_on = c(404))
+          resp <- httr::RETRY("GET", url, terminate_on = c(404))
           if (httr::http_error(resp)) {
             stop(paste("The requested url cannot be found within
           the get_eurostat_geospatial function:", url))
@@ -349,7 +349,7 @@ get_eurostat_geospatial <- function(output_class = "sf",
         }
         if (nuts_level %in% c("1", "all")) {
           url <- paste0(burl, resolution, "M_", year, "_", crs, "_LEVL_1.geojson")
-          resp <- RETRY("GET", url, terminate_on = c(404))
+          resp <- httr::RETRY("GET", url, terminate_on = c(404))
           if (httr::http_error(resp)) {
             stop(paste("The requested url cannot be found within the get_eurostat_geospatial function:", url))
           } else {
@@ -359,7 +359,7 @@ get_eurostat_geospatial <- function(output_class = "sf",
           }
         }
         if (nuts_level %in% c("2", "all")) {
-          resp <- RETRY("GET", paste0(burl, resolution, "M_", year, "_", crs, "_LEVL_2.geojson"), terminate_on = c(404))
+          resp <- httr::RETRY("GET", paste0(burl, resolution, "M_", year, "_", crs, "_LEVL_2.geojson"), terminate_on = c(404))
           if (httr::http_error(resp)) {
             stop(paste("The requested url cannot be found within the get_eurostat_geospatial function:", url))
           } else {
@@ -369,7 +369,7 @@ get_eurostat_geospatial <- function(output_class = "sf",
           }
         }
         if (nuts_level %in% c("3", "all")) {
-          resp <- RETRY("GET", paste0(burl, resolution, "M_", year, "_", crs, "_LEVL_3.geojson"), terminate_on = c(404))
+          resp <- httr::RETRY("GET", paste0(burl, resolution, "M_", year, "_", crs, "_LEVL_3.geojson"), terminate_on = c(404))
           if (httr::http_error(resp)) {
             stop(paste("The requested url cannot be found within the get_eurostat_geospatial function:", url))
           } else {