From 50f65b528cdf5c50937724263ab693e78b204467 Mon Sep 17 00:00:00 2001 From: Fonti Kar Date: Wed, 29 May 2024 16:33:53 +1000 Subject: [PATCH 1/8] Added example for default_version, updated LICENSE year, added R CMD CHECK results --- LICENSE | 2 +- R/load_taxonomic_resources.R | 2 +- cran-comments.md | 15 +-------------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/LICENSE b/LICENSE index 326c98ed..bad78ab4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,2 @@ -YEAR: 2023 +YEAR: 2024 COPYRIGHT HOLDER: Daniel Falster diff --git a/R/load_taxonomic_resources.R b/R/load_taxonomic_resources.R index 91b2acde..b7b6dbc6 100644 --- a/R/load_taxonomic_resources.R +++ b/R/load_taxonomic_resources.R @@ -372,7 +372,7 @@ dataset_access_function <- #' version is specified. #' #' @return A character string representing the default version for stable data. -#' +#' @example default_version() #' #' @export diff --git a/cran-comments.md b/cran-comments.md index ed3322da..62c010f5 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,18 +1,5 @@ -## Resubmission -This is a resubmission. This version we have: - -* Added measures to gracefully fail should API/internet resources/network is down. - -* Minor update to documentation for one function - ## R CMD check results 0 errors | 0 warnings | 0 note - -## Rev Deps - -* There are no reverse dependencies that needed to be checked - - - +* This is a new release. From 2cb4a4bcb675c9eac247fdcd913de6789e2600a2 Mon Sep 17 00:00:00 2001 From: Fonti Kar Date: Wed, 29 May 2024 16:49:40 +1000 Subject: [PATCH 2/8] Comment about Tidy and Mac and HTML validation --- cran-comments.md | 1 + 1 file changed, 1 insertion(+) diff --git a/cran-comments.md b/cran-comments.md index 62c010f5..9cff41ac 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -3,3 +3,4 @@ 0 errors | 0 warnings | 0 note * This is a new release. +* 2 notes with HTML validation problems on MacOS 14.5 From 6ba2831c69cf9ba0d42b4af46bedded02d26a375 Mon Sep 17 00:00:00 2001 From: Fonti Kar Date: Thu, 30 May 2024 08:53:59 +1000 Subject: [PATCH 3/8] Updated CITATION file --- inst/CITATION | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inst/CITATION b/inst/CITATION index 4dd88ad2..bab61365 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -1,6 +1,7 @@ bibentry( - bibtype = "Unpublished", + bibtype = "Article", title = "APCalign: an R package workflow and app for aligning and updating flora names to the Australian Plant Census", + journal = "Australian Journal of Botany", author = c( person(given = "Elizabeth", family = "Wenk", role = c("aut", "ctb"), email = "e.wenk@unsw.edu.au", comment = c(ORCID = "0000-0001-5640-5910")), person(given = "Will", family = "Cornwell", role = c("aut", "ctb"), email = "w.cornwell@unsw.edu.au", comment = c(ORCID = "0000-0003-4080-4073")), From a9e03e9bcf3c9eca047a1fea276d976a06bcdeb9 Mon Sep 17 00:00:00 2001 From: Fonti Kar Date: Thu, 30 May 2024 08:56:17 +1000 Subject: [PATCH 4/8] Updated version numbers --- DESCRIPTION | 2 +- NEWS.md | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index bc69a063..8cafa3e5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: APCalign Title: Resolving Plant Taxon Names Using the Australian Plant Census -Version: 1.0.0.9000 +Version: 1.0.1 Authors@R: c( person(given = "Daniel", family = "Falster", role = c("aut", "cre", "cph"), email = "daniel.falster@unsw.edu.au", comment = c(ORCID = "0000-0002-9814-092X")), person(given = "Elizabeth", family = "Wenk", role = c("aut", "ctb"), email = "e.wenk@unsw.edu.au", comment = c(ORCID = "0000-0001-5640-5910")), diff --git a/NEWS.md b/NEWS.md index a1dce0ec..bc7e5cc2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# APCalign 1.0.0 +# APCalign 1.0.1 First major release of APCalign. A preprint is available at https://www.biorxiv.org/content/10.1101/2024.02.02.578715v1. @@ -23,10 +23,6 @@ and removing functions from @import * Refine tests * Make messages to console optional * Fix issue with fails when github is down (https://github.com/traitecoevo/APCalign/issues/205) - -# APCalign 0.1.5 - - * Update installation instructions * Added how to cite and version APCalign as an article * Exported `default_version` From b983458a71986a7df68c8d998563b9475d52c301 Mon Sep 17 00:00:00 2001 From: Fonti Kar Date: Thu, 30 May 2024 11:04:49 +1000 Subject: [PATCH 5/8] Removed auto package version in citation --- CRAN-SUBMISSION | 3 +++ inst/CITATION | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 CRAN-SUBMISSION diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION new file mode 100644 index 00000000..228c3e46 --- /dev/null +++ b/CRAN-SUBMISSION @@ -0,0 +1,3 @@ +Version: 1.0.1 +Date: 2024-05-29 22:57:15 UTC +SHA: a9e03e9bcf3c9eca047a1fea276d976a06bcdeb9 diff --git a/inst/CITATION b/inst/CITATION index bab61365..534ae7d4 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -13,6 +13,6 @@ bibentry( person(given = "Daniel", family = "Falster", role = c("aut", "cre", "cph"), email = "daniel.falster@unsw.edu.au", comment = c(ORCID = "0000-0002-9814-092X")) ), year = 2024, - note = paste("R package version:", packageVersion("APCalign")), + note = "R package version: 1.0.1"", url = "https://www.biorxiv.org/content/10.1101/2024.02.02.578715v1" ) From 6992521945b356386e1fea91abedcbcffd4e4b6d Mon Sep 17 00:00:00 2001 From: Fonti Kar Date: Thu, 30 May 2024 11:06:17 +1000 Subject: [PATCH 6/8] Updated CRAN comments --- cran-comments.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index 9cff41ac..7402b7ab 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -2,5 +2,6 @@ 0 errors | 0 warnings | 0 note -* This is a new release. -* 2 notes with HTML validation problems on MacOS 14.5 +* This is a resubmission +* Removed `packageVersion()` from CITATION file +* 2 notes with HTML validation problems on MacOS 14.5 From be4da3ec059e3058eda7799cc9f6396be459d455 Mon Sep 17 00:00:00 2001 From: Fonti Kar Date: Thu, 30 May 2024 11:12:18 +1000 Subject: [PATCH 7/8] Fixed typo in CITATION --- inst/CITATION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/CITATION b/inst/CITATION index 534ae7d4..e856633d 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -13,6 +13,6 @@ bibentry( person(given = "Daniel", family = "Falster", role = c("aut", "cre", "cph"), email = "daniel.falster@unsw.edu.au", comment = c(ORCID = "0000-0002-9814-092X")) ), year = 2024, - note = "R package version: 1.0.1"", + note = "R package version: 1.0.1", url = "https://www.biorxiv.org/content/10.1101/2024.02.02.578715v1" ) From d48a61af0179b864fbaec8064c456484409e15b9 Mon Sep 17 00:00:00 2001 From: Fonti Kar Date: Thu, 30 May 2024 13:04:33 +1000 Subject: [PATCH 8/8] Resubmitted --- CRAN-SUBMISSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index 228c3e46..d23661b4 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ Version: 1.0.1 -Date: 2024-05-29 22:57:15 UTC -SHA: a9e03e9bcf3c9eca047a1fea276d976a06bcdeb9 +Date: 2024-05-30 01:18:42 UTC +SHA: be4da3ec059e3058eda7799cc9f6396be459d455