Skip to content

Commit

Permalink
TODO remote checks and revdeps
Browse files Browse the repository at this point in the history
  • Loading branch information
dieghernan committed Jul 6, 2024
1 parent 2d54159 commit 0ce5d08
Show file tree
Hide file tree
Showing 23 changed files with 122 additions and 67 deletions.
7 changes: 2 additions & 5 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ message: 'To cite package "giscoR" in publications use:'
type: software
license: GPL-3.0-only
title: 'giscoR: Download Map Data from GISCO API - Eurostat'
version: 0.5.0.9000
version: 0.5.1
doi: 10.32614/CRAN.package.giscoR
abstract: Tools to download data from the GISCO (Geographic Information System of
the Commission) Eurostat database <https://ec.europa.eu/eurostat/web/gisco>. Global
Expand All @@ -31,7 +31,7 @@ preferred-citation:
affiliation: rOpenGov
doi: 10.32614/CRAN.package.giscoR
year: '2024'
version: 0.5.0.9000
version: 0.5.1
url: https://ropengov.github.io/giscoR/
abstract: Tools to download data from the GISCO (Geographic Information System of
the Commission) Eurostat database <https://ec.europa.eu/eurostat/web/gisco>. Global
Expand Down Expand Up @@ -109,9 +109,6 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0002-4035-0289
year: '2024'
identifiers:
- type: url
value: https://arxiv.org/abs/1403.2805
- type: software
title: rappdirs
abstract: 'rappdirs: Application Directories: Determine Where to Save Data, Caches,
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: giscoR
Title: Download Map Data from GISCO API - Eurostat
Version: 0.5.0.9000
Version: 0.5.1
Authors@R: c(
person("Diego", "Hernangómez", , "[email protected]", role = c("aut", "cre", "cph"),
comment = c(ORCID = "0000-0001-8457-4658", affiliation = "rOpenGov")),
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# giscoR (development version)
# giscoR 0.5.1

- Use **CRAN** DOI: <https://doi.org/10.32614/CRAN.package.giscoR>.
- `gisco_get_education()`: Fix API entry points.
Expand Down
12 changes: 6 additions & 6 deletions R/gisco_get_healthcare.R
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
#' @examplesIf gisco_check_access()
#' \donttest{
#'
#' health_BEL <- gisco_get_healthcare(country = "Belgium")
#' health_be <- gisco_get_healthcare(country = "Belgium")
#'
#' # Plot if downloaded
#' if (nrow(health_BEL) > 3) {
#' if (inherits(health_be, "sf")) {
#' library(ggplot2)
#' ggplot(health_BEL) +
#' geom_sf(aes(color = emergency))
#' ggplot(health_be) +
#' geom_sf()
#' }
#' }
#' @export
Expand Down Expand Up @@ -65,9 +65,9 @@ gisco_get_healthcare <- function(cache = TRUE, update_cache = FALSE,

data_sf <- gsc_api_load(namefileload, epsg, ext, cache, verbose)

if (!is.null(country) && "cc" %in% names(data_sf)) {
if (!is.null(country) && "cntr_id" %in% names(data_sf)) {
country <- gsc_helper_countrynames(country, "eurostat")
data_sf <- data_sf[data_sf$cc %in% country, ]
data_sf <- data_sf[data_sf$cntr_id %in% country, ]
}
return(data_sf)
}
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ We start by extracting the corresponding geographic data:
nuts3 <- gisco_get_nuts(
year = "2021",
epsg = "3035",
resolution = "3",
resolution = "10",
nuts_level = "3"
)
Expand Down
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ install.packages("giscoR",

## Usage

You can have a look to the documentation of the dev version in
<https://ropengov.github.io/giscoR/dev/>

This script highlights some features of **giscoR** :

``` r
Expand Down Expand Up @@ -166,7 +163,7 @@ We start by extracting the corresponding geographic data:
nuts3 <- gisco_get_nuts(
year = "2021",
epsg = "3035",
resolution = "3",
resolution = "10",
nuts_level = "3"
)

Expand Down Expand Up @@ -329,7 +326,7 @@ A BibTeX entry for LaTeX users is
doi = {10.32614/CRAN.package.giscoR},
author = {Diego Hernangómez},
year = {2024},
version = {0.5.0.9000},
version = {0.5.1},
url = {https://ropengov.github.io/giscoR/},
abstract = {Tools to download data from the GISCO (Geographic Information System of the Commission) Eurostat database <https://ec.europa.eu/eurostat/web/gisco>. Global and European map data available. This package is in no way officially related to or endorsed by Eurostat.},
}
Expand Down Expand Up @@ -363,7 +360,8 @@ This package is in no way officially related to or endorsed by Eurostat.

## References

<div id="refs" class="references csl-bib-body hanging-indent">
<div id="refs" class="references csl-bib-body hanging-indent"
entry-spacing="0">

<div id="ref-RJ-2017-019" class="csl-entry">

Expand Down
6 changes: 3 additions & 3 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"codeRepository": "https://github.com/rOpenGov/giscoR",
"issueTracker": "https://github.com/rOpenGov/giscoR/issues",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "0.5.0.9000",
"version": "0.5.1",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
"url": "https://r-project.org"
},
"runtimePlatform": "R version 4.4.1 (2024-06-14)",
"runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -240,7 +240,7 @@
"applicationCategory": "cartography",
"isPartOf": "http://ropengov.org/",
"keywords": ["ropengov", "r", "spatial", "api-wrapper", "rstats", "r-package", "eurostat", "gisco", "thematic-maps", "eurostat-data", "cran", "ggplot2", "gis"],
"fileSize": "1250.925KB",
"fileSize": "1256.916KB",
"citation": [
{
"@type": "SoftwareSourceCode",
Expand Down
Binary file modified data/gisco_countrycode.rda
Binary file not shown.
Binary file modified data/gisco_db.rda
Binary file not shown.
Binary file modified img/README-example-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/README-example-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/README-labels-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/README-thematic-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions inst/schemaorg.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"name": "Comprehensive R Archive Network (CRAN)",
"url": "https://cran.r-project.org"
},
"runtimePlatform": "R version 4.4.1 (2024-06-14)",
"version": "0.5.0.9000"
"runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)",
"version": "0.5.1"
},
{
"id": "https://doi.org/10.32614/CRAN.package.giscoR",
Expand Down
8 changes: 4 additions & 4 deletions man/gisco_get_healthcare.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 40 additions & 33 deletions revdep/README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,48 @@
# Platform

|field |value |
|:--------|:------------------------------------------------------|
|version |R version 4.4.1 (2024-06-14) |
|os |Ubuntu 22.04.4 LTS |
|system |x86_64, linux-gnu |
|ui |X11 |
|language |(EN) |
|collate |C.UTF-8 |
|ctype |C.UTF-8 |
|tz |UTC |
|date |2024-07-05 |
|pandoc |3.1.11 @ /opt/hostedtoolcache/pandoc/3.1.11/x64/pandoc |
|field |value |
|:--------|:----------------------------------------|
|version |R version 4.4.1 (2024-06-14 ucrt) |
|os |Windows 11 x64 (build 22631) |
|system |x86_64, mingw32 |
|ui |RStudio |
|language |(EN) |
|collate |Spanish_Spain.utf8 |
|ctype |Spanish_Spain.utf8 |
|tz |Europe/Madrid |
|date |2024-07-06 |
|rstudio |2024.04.2+764 Chocolate Cosmos (desktop) |
|pandoc |3.1.12.2 @ C:\PROGRA~1\Pandoc\pandoc.exe |

# Dependencies

|package |old |new |Δ |
|:-----------|:------|:----------|:--|
|giscoR |0.5.0 |0.5.0.9000 |* |
|classInt |0.4-10 |0.4-10 | |
|countrycode |1.6.0 |1.6.0 | |
|DBI |1.2.3 |1.2.3 | |
|e1071 |1.7-14 |1.7-14 | |
|geojsonsf |2.0.3 |2.0.3 | |
|geometries |0.2.4 |0.2.4 | |
|jsonify |1.2.2 |1.2.2 | |
|jsonlite |1.8.8 |1.8.8 | |
|magrittr |2.0.3 |2.0.3 | |
|proxy |0.4-27 |0.4-27 | |
|rapidjsonr |1.2.0 |1.2.0 | |
|rappdirs |0.3.3 |0.3.3 | |
|Rcpp |1.0.12 |1.0.12 | |
|s2 |1.1.6 |1.1.6 | |
|sf |1.0-16 |1.0-16 | |
|sfheaders |0.4.4 |0.4.4 | |
|units |0.8-5 |0.8-5 | |
|wk |0.9.1 |0.9.1 | |
|package |old |new |Δ |
|:-----------|:------|:------|:--|
|giscoR |0.5.0 |0.5.1 |* |
|classInt |0.4-10 |0.4-10 | |
|countrycode |1.6.0 |1.6.0 | |
|DBI |1.2.3 |1.2.3 | |
|e1071 |1.7-14 |1.7-14 | |
|geojsonsf |2.0.3 |2.0.3 | |
|geometries |0.2.4 |0.2.4 | |
|jsonify |1.2.2 |1.2.2 | |
|jsonlite |1.8.8 |1.8.8 | |
|magrittr |2.0.3 |2.0.3 | |
|proxy |0.4-27 |0.4-27 | |
|rapidjsonr |1.2.0 |1.2.0 | |
|rappdirs |0.3.3 |0.3.3 | |
|Rcpp |1.0.12 |1.0.12 | |
|s2 |1.1.6 |1.1.6 | |
|sf |1.0-16 |1.0-16 | |
|sfheaders |0.4.4 |0.4.4 | |
|units |0.8-5 |0.8-5 | |
|wk |0.9.1 |0.9.1 | |

# Revdeps

## New problems (1)

|package |version |error |warning |note |
|:--------|:-------|:------|:-------|:----|
|[mapSpain](problems.md#mapspain)|0.9.1 |__+1__ | |1 |

12 changes: 10 additions & 2 deletions revdep/cran.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
## revdepcheck results

We checked 3 reverse dependencies (0 from CRAN + 3 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.
We checked 4 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.

* We saw 0 new problems
* We saw 1 new problems
* We failed to check 0 packages

Issues with CRAN packages are summarised below.

### New problems
(This reports the first line of each new failure)

* mapSpain
checking tests ...

47 changes: 46 additions & 1 deletion revdep/problems.md
Original file line number Diff line number Diff line change
@@ -1 +1,46 @@
*Wow, no problems at all. :)*
# mapSpain

<details>

* Version: 0.9.1
* GitHub: https://github.com/rOpenSpain/mapSpain
* Source code: https://github.com/cran/mapSpain
* Date/Publication: 2024-06-10 18:20:01 UTC
* Number of recursive dependencies: 102

Run `revdepcheck::revdep_details(, "mapSpain")` for more info

</details>

## Newly broken

* checking tests ...
```
Running 'testthat.R'
ERROR
Running the tests in 'tests/testthat.R' failed.
Last 13 lines of output:
4. └─testthat:::test_files_parallel(...)
5. ├─withr::with_dir(...)
6. │ └─base::force(code)
7. ├─testthat::with_reporter(...)
8. │ └─base::tryCatch(...)
9. │ └─base (local) tryCatchList(expr, classes, parentenv, handlers)
10. │ └─base (local) tryCatchOne(expr, names, parentenv, handlers[[1L]])
11. │ └─base (local) doTryCatch(return(expr), name, parentenv, handler)
12. └─testthat:::parallel_event_loop_chunky(queue, reporters, ".")
13. └─queue$poll(Inf)
14. └─base::lapply(...)
15. └─testthat (local) FUN(X[[i]], ...)
16. └─private$handle_error(msg, i)
17. └─rlang::abort(...)
Execution halted
```

## In both

* checking data for non-ASCII characters ... NOTE
```
Note: found 13138 marked UTF-8 strings
```

Binary file modified vignettes/africa-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified vignettes/country-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified vignettes/giscoR-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion vignettes/giscoR.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ library(dplyr)
library(eurostat)

nuts2 <- gisco_get_nuts(
year = "2021", epsg = "3035", resolution = "3",
year = "2021", epsg = "3035", resolution = "10",
nuts_level = "2"
)
# Borders from countries
Expand Down
2 changes: 1 addition & 1 deletion vignettes/giscoR.Rmd.orig
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ library(dplyr)
library(eurostat)

nuts2 <- gisco_get_nuts(
year = "2021", epsg = "3035", resolution = "3",
year = "2021", epsg = "3035", resolution = "10",
nuts_level = "2"
)
# Borders from countries
Expand Down

0 comments on commit 0ce5d08

Please sign in to comment.