Merge pull request #264 from rOpenGov/gisco

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+

.github/workflows/rogtemplate-gh-pages.yaml

@@ -19,7 +19,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -34,11 +34,7 @@ jobs:
             local::.
             any::pkgdown
             ropengov/rogtemplate
-            any::magick
-            any::tmap
-            any::Cairo
             any::rcmdcheck
-            any::XML
 
       - name: Build logo if not present and prepare template
         run: |
@@ -57,6 +53,6 @@ jobs:
 
       - name: Deploy package
         run: |
-          git config --local user.name "$GITHUB_ACTOR"
-          git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
           Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'

.github/workflows/test-coverage.yaml

@@ -16,7 +16,7 @@ jobs:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-r@v2
         with:

.github/workflows/tidy_code.yaml

@@ -16,23 +16,24 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-pandoc@master
+      - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: r-lib/actions/setup-r@master
+      - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@master
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: |
-            usethis
-            styler
-            urlchecker
-            devtools
-            roxygen2
-            
+            local::.
+            any::usethis
+            any::styler
+            any::urlchecker
+            any::devtools
+            any::roxygen2
+            ropengov/rogtemplate
           needs: website
       - name: Tidy code
         run: |
@@ -48,17 +49,15 @@ jobs:
 
       - name: Commit results
         run: |
-          git config --local user.name "$GITHUB_ACTOR"
-          git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add -A
           git commit -m 'Tidy code' || 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.REPO_GHA_PAT }}
-          repository: ${{ github.repository }}
-          event-type: trigger-pkgdown-workflow
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'

DESCRIPTION

@@ -31,15 +31,14 @@ URL: https://ropengov.github.io/eurostat/,
     https://github.com/rOpenGov/eurostat
 BugReports: https://github.com/rOpenGov/eurostat/issues
 Depends:
-    methods,
     R (>= 3.5.0)
 Imports:
-    broom,
     classInt,
     countrycode,
     curl,
     dplyr,
     httr (>= 1.4.0),
+    ISOweek,
     jsonlite,
     lubridate,
     rappdirs,
@@ -49,18 +48,17 @@ Imports:
     stringi,
     stringr,
     tibble,
-    tidyr (>= 1.0.0),
-    ISOweek
+    tidyr (>= 1.0.0)
 Suggests:
-    RColorBrewer,
+    giscoR,
     knitr,
     rmarkdown,
     sf,
-    sp,
-    testthat (>= 3.0.0),
-    remotes
+    testthat (>= 3.0.0)
 VignetteBuilder: 
     knitr
+Config/Needs/website: ggplot2, tmap, styler, sessioninfo,
+    ropengov/rogtemplate, ragg
 Config/testthat/edition: 3
 Config/testthat/parallel: false
 Encoding: UTF-8

NAMESPACE

@@ -29,15 +29,13 @@ export(validate_nuts_regions)
 importFrom(ISOweek,ISOweek2date)
 importFrom(RefManageR,BibEntry)
 importFrom(RefManageR,toBiblatex)
-importFrom(broom,tidy)
 importFrom(classInt,classIntervals)
 importFrom(countrycode,countrycode)
 importFrom(curl,curl_download)
 importFrom(dplyr,case_when)
 importFrom(dplyr,coalesce)
 importFrom(dplyr,filter)
 importFrom(dplyr,inner_join)
-importFrom(dplyr,left_join)
 importFrom(dplyr,mutate)
 importFrom(httr,RETRY)
 importFrom(httr,build_url)
@@ -52,7 +50,6 @@ importFrom(lubridate,dmy)
 importFrom(lubridate,month)
 importFrom(lubridate,year)
 importFrom(lubridate,ymd)
-importFrom(methods,as)
 importFrom(readr,col_character)
 importFrom(readr,cols)
 importFrom(readr,read_tsv)
@@ -68,7 +65,6 @@ importFrom(tibble,as_tibble)
 importFrom(tibble,is_tibble)
 importFrom(tidyr,pivot_longer)
 importFrom(tidyr,separate)
-importFrom(utils,data)
 importFrom(utils,download.file)
 importFrom(utils,hasName)
 importFrom(utils,toBibtex)

NEWS.md

@@ -4,9 +4,18 @@
 
 * Remove legacy code related to downloading data from old bulk download facilities and temporary functions added in package version 3.7.14.
 
+* `get_eurostat_geospatial()` now leverages on `giscoR::gisco_get_nuts()` for 
+downloading geospatial data:
+  * `"spdf"` output class soft-deprecated, it would return a `sf` object with a message.
+  * `make_valid` parameter soft-deprecated.
+  * Added `...` to the function so additional parametes can be passed to `giscoR::gisco_get_nuts()`.
+  * Dataset `eurostat_geodata_60_2016` updated.
+
 ## Minor updates 
 
 * Print more informative API error messages.
+* Removed `sp`, `methods` and `broom` packages from dependencies. 
+* Added `giscoR` to Suggests.
 
 ## Bug fixes
 
@@ -235,4 +244,4 @@
 
 # eurostat 0.9.1 (2014-04-24)
 
-* Package collected from statfi and smarterpoland
+* Package collected from statfi and smarterpoland

R/data_countries.R

@@ -6,6 +6,7 @@
 #'   * **name**: Country name in English.
 #'   * **label**: Country name in the Eurostat database.
 #'
+#' @family datasets
 #' @source <https://ec.europa.eu/eurostat/statistics-explained/index.php/Tutorial:Country_codes_and_protocol_order>,
 #'   <https://ec.europa.eu/eurostat/statistics-explained/index.php/Glossary:Euro_area>
 "eu_countries"