Skip to content

Dev #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lbelmonteEFSA merged 4 commits into from
Jul 23, 2025
Merged

Dev #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4da920
aligns with databricks and other packages dependencies
lbelmonteEFSA Jul 22, 2025
85f8334
EUPL license plus library versioning to fullfil the ones in databrick…
lbelmonteEFSA Jul 22, 2025
edc3b12
drops duplicated dependencies lines
lbelmonteEFSA Jul 22, 2025
cd5961b
Merge branch 'main' into dev
lbelmonteEFSA Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ Description: A wrapper around the European and Mediterranean Plant Protection
wrangling function to integrate taxonomy and rank information, and a
function that returns the list of member countries for each Regional
Plant Protection Organization acronym which is used in the 'EPPO' database.
License: EUPL
License: EUPL (>= 1.2)
URL: https://github.com/openefsa/eppoFindeR, https://openefsa.github.io/eppoFindeR/
BugReports: https://github.com/openefsa/eppoFindeR/issues
Depends:
R (>= 4.0.0)
Imports:
httr (>= 1.4.7),
jsonlite (>= 1.8.8),
jsonlite (>= 1.8.7),
tidyr (>= 1.3.1),
dplyr (>= 1.1.4),
glue (>= 1.7.0),
Expand All @@ -46,8 +46,8 @@ Imports:
lifecycle (>= 1.0.4)
Suggests:
devtools (>= 2.4.5),
roxygen2 (>= 7.3.1),
testthat (>= 3.2.1),
roxygen2 (>= 7.2.1),
testthat (>= 3.0.0),
usethis (>= 2.2.3),
knitr (>= 1.0),
rmarkdown (>= 2.0),
Expand Down
10 changes: 5 additions & 5 deletions renv.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@
},
"jsonlite": {
"Package": "jsonlite",
"Version": "1.8.8",
"Version": "1.8.7",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"methods"
],
"Hash": "e1b9c55281c5adc4dd113652d9e26768"
"Hash": "266a20443ca13c65688b2116d5220f76"
},
"lifecycle": {
"Package": "lifecycle",
Expand Down Expand Up @@ -251,13 +251,13 @@
},
"renv": {
"Package": "renv",
"Version": "1.0.7",
"Version": "1.0.11",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"utils"
],
"Hash": "397b7b2a265bc5a7a06852524dabae20"
"Hash": "47623f66b4e80b3b0587bc5d7b309888"
},
"rlang": {
"Package": "rlang",
Expand Down
2 changes: 1 addition & 1 deletion renv/activate.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
local({

# the requested version of renv
version <- "1.0.7"
version <- "1.0.11"
attr(version, "sha") <- NULL

# the project directory
Expand Down