Skip to content

Commit

Permalink
Merge pull request #111 from trias-project/110-rewrite-code-avoiding-…
Browse files Browse the repository at this point in the history
…using-sp-and-rworldmap

Update climate_match.R
  • Loading branch information
soriadelva authored Apr 26, 2024
2 parents 8c4cf3f + 476d0e1 commit 52edbc6
Show file tree
Hide file tree
Showing 16 changed files with 379 additions and 294 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-commands.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GH_PAT }}
steps:
- uses: actions/checkout@v2
- uses: r-lib/actions/pr-fetch@v1
- uses: actions/checkout@v4
- uses: r-lib/actions/pr-fetch@v2
with:
repo-token: ${{ secrets.GH_PAT }}
- uses: r-lib/actions/setup-r@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
17 changes: 7 additions & 10 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
Package: trias
Title: Process Data for the Project Tracking Invasive Alien Species
(TrIAS)
Version: 2.1.0
Version: 2.2.0
Authors@R: c(
person("Damiano", "Oldoni", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0003-3445-7562")),
person("Soria", "Delva", email = "[email protected]",
role = "aut", comment = c(ORCID = "0000-0002-7164-6031")),
person("Peter", "Desmet", email = "[email protected]",
role = "aut", comment = c(ORCID = "0000-0002-8442-8025")),
person("Sander", "Devisscher", email = "[email protected]",
Expand Down Expand Up @@ -36,30 +38,25 @@ Imports:
egg,
forcats,
ggplot2,
gratia,
gratia (>= 0.9.0),
leaflet,
methods,
mgcv,
plotly,
purrr,
raster,
readr,
reshape2,
rgbif (>= 3.0),
rlang,
rworldmap,
scales,
sp,
sf,
stringr,
svDialogs,
tibble,
tidyr,
tidyselect,
utils
tidyselect (>= 1.2.0),
utils,
rnaturalearth
Suggests:
rgdal,
rgeos,
covr,
knitr,
testthat
Expand Down
Loading

0 comments on commit 52edbc6

Please sign in to comment.