Skip to content

Commit

Permalink
Update with CRAN version 0.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dbrownf committed Oct 13, 2023
1 parent d1104be commit 8bc760f
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 37 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Authors@R: c(person(given = "David",
Description: Tools for downloading and extracting data from the Copernicus "Agrometeorological indicators
from 1979 to present derived from reanalysis"
<https://cds.climate.copernicus.eu/cdsapp#!/dataset/sis-agrometeorological-indicators?tab=overview> (AgERA5).
Config/reticulate:
Config/reticulate/autoconfigure:
list(
packages = list(
list(package = "cdsapi", pip = TRUE)
Expand All @@ -26,7 +26,7 @@ Depends: R (>= 3.5.0)
License: MIT + file LICENSE
Encoding: UTF-8
LazyData: true
Imports: terra, reticulate, fs, doSNOW, foreach
Imports: terra, reticulate, fs, doParallel, foreach
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
Suggests:
Expand Down
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ S3method(ag5_extract,data.frame)
S3method(ag5_extract,numeric)
export(ag5_download)
export(ag5_extract)
importFrom(doSNOW,registerDoSNOW)
importFrom(doParallel,registerDoParallel)
importFrom(foreach,"%dopar%")
importFrom(foreach,foreach)
importFrom(parallel,makeCluster)
Expand Down
18 changes: 15 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# ag5Tools 0.0.1
# ag5Tools 0.0.2

## Major changes

- Add version parameter to function *ag5_download*, now required by AgERA5 database.

## Enhancements

## First release version
- Use parallelization to function *ag5_extract* to speed up files search

* Added a `NEWS.md` file to track changes to the package.
## Bug fixes

Correct parameter in help of function *ag5_extract* from 24_hour_minimum to Min-24h


# ag5Tools 0.0.1

- First version on CRAN
6 changes: 3 additions & 3 deletions R/extract.R
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#'\itemize{
#'\item Max-24h
#'\item Mean-24h
#'\item 24_hour_minimum
#'\item Min-24h
#'\item Max-Day-Time
#'\item Mean-Day-Time
#'\item Mean-Night-Time
Expand Down Expand Up @@ -98,7 +98,7 @@

#'@importFrom terra extract
#'@importFrom utils txtProgressBar setTxtProgressBar
#'@importFrom doSNOW registerDoSNOW
#'@importFrom doParallel registerDoParallel
#'@importFrom parallel makeCluster stopCluster
#'@importFrom foreach foreach %dopar%
#'@export
Expand Down Expand Up @@ -232,7 +232,7 @@ ag5_extract.data.frame <- function(coords,

cl <- parallel::makeCluster(ncores)

doSNOW::registerDoSNOW(cl)
doParallel::registerDoParallel(cl)

progress <- function(X) {setTxtProgressBar(progress_bar, X)}

Expand Down
1 change: 1 addition & 0 deletions R/globals.R
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
utils::globalVariables("i")
32 changes: 19 additions & 13 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
This is a re-submission
This is an update for package ag5tools


## R CMD check results

### local environment - devtools::check()
### local environment - R CMD check --as-cran

using R version 4.2.2 (2022-10-31)
* using platform: aarch64-apple-darwin20 (64-bit)
* using session charset: UTF-8

Status: 1 NOTE

* checking CRAN incoming feasibility ... NOTE
Maintainer: ‘David Brown <[email protected]>

New maintainer:
David Brown <[email protected]>
Old maintainer(s):
David Brown <[email protected]>

### Win-builder
* https://win-builder.r-project.org/QAS2yDGgBqFS/

"Windows" - "10 x64" - "build 19044"

0 errors v | 0 warnings v | 0 notes v

### rhub::check_for_cran()
https://builder.r-hub.io/status/ag5Tools_0.0.1.tar.gz-a75e734ac5cb43a096aaa31b186d5f23
https://builder.r-hub.io/status/ag5Tools_0.0.1.tar.gz-9269a59d24624e7aa7e5caed04a011df
https://builder.r-hub.io/status/ag5Tools_0.0.1.tar.gz-05e183bb4b56439e8469011da32348f1

Note
https://builder.r-hub.io/status/ag5Tools_0.0.1.tar.gz-a75e734ac5cb43a096aaa31b186d5f23#L510


## Previous submission problem - Fixed
I have added \value to .Rd files regarding exported methods and explained
the functions results in the documentation. Thanks.



27 changes: 13 additions & 14 deletions inst/CITATION
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
citHeader("To cite package ‘ag5Tools’ in publications, please use:")

citEntry(entry = "Article",
title = "{ag5Tools: An R package for downloading and extracting agrometeorological data from the AgERA5 database}",
author = c(person("David", "Brown"), person("Kauê","de Sousa"),person("Jacob","van Etten")),
year = "2023",
doi = "10.1016/j.softx.2022.101267",
journal = "SoftwareX",
publisher = "Elsevier BV",
volume = 21,
number = 2023,
pages = 101267,
url = "https://doi.org/10.1016/j.softx.2022.101267",
textVersion = "Brown, D., de Sousa, K., & van Etten, J. (2023). ag5Tools: An R package for downloading and extracting agrometeorological data from the AgERA5 database. SoftwareX (Vol. 21, p. 101267). https://doi.org/10.1016/j.softx.2022.101267")
bibentry(
bibtype = "Article",
title = "{ag5Tools: An R package for downloading and extracting agrometeorological data from the AgERA5 database}",
author = c(person("David", "Brown"), person("Kauê","de Sousa"),person("Jacob","van Etten")),
year = "2023",
doi = "10.1016/j.softx.2022.101267",
journal = "SoftwareX",
publisher = "Elsevier BV",
volume = 21,
number = 2023,
pages = 101267,
url = "https://doi.org/10.1016/j.softx.2022.101267",
textVersion = "Brown, D., de Sousa, K., & van Etten, J. (2023). ag5Tools: An R package for downloading and extracting agrometeorological data from the AgERA5 database. SoftwareX (Vol. 21, p. 101267). https://doi.org/10.1016/j.softx.2022.101267")
2 changes: 1 addition & 1 deletion man/ag5_extract.Rd

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

0 comments on commit 8bc760f

Please sign in to comment.