From 782c3bf33d8178db37414e274d36d3e503119544 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Sun, 21 Mar 2021 11:53:10 -0700 Subject: [PATCH 1/3] update funding sources --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 61654843..c1d8a963 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: ['https://www.gofundme.com/f/the-black-resilience-fund', 'https://www.raicestexas.org/donate/', 'https://sogoreate-landtrust.org/', 'https://www.blacktranstravelfund.com/donate'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] +custom: ['https://www.blackresiliencefund.com/', 'https://www.raicestexas.org/donate/', 'https://sogoreate-landtrust.org/', 'https://www.blacktranstravelfund.com/donate'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] From 261515d79674abb2f3ee5d07f0ecab4460e74067 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Sun, 21 Mar 2021 12:00:18 -0700 Subject: [PATCH 2/3] bump version --- DESCRIPTION | 2 +- NEWS.md | 10 ++++++++++ cran-comments.md | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ddebe1cf..d6b6e47a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: poppr Type: Package Title: Genetic Analysis of Populations with Mixed Reproduction -Version: 2.9.0 +Version: 2.9.1 Authors@R: c(person(c("Zhian", "N."), "Kamvar", role = c("cre", "aut"), email = "zkamvar@gmail.com", comment = c(ORCID = "0000-0003-1458-7108")), person(c("Javier", "F."), "Tabima", role = "aut", diff --git a/NEWS.md b/NEWS.md index 9e92b89c..58b3e773 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,13 @@ +poppr 2.9.1 +=========== + +DEPENDENCY UPDATE +---------------- + +* The {phangorn} package is no longer imported. We only used one line of code + from the package (upgma), so we copied over the implementation with the + author's permission (@KlausVigo, https://github.com/grunwaldlab/poppr/pull/237). + poppr 2.9.0 =========== diff --git a/cran-comments.md b/cran-comments.md index 943fafc6..5338bfd0 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,11 +1,11 @@ -# Poppr version 2.9.0 +# Poppr version 2.9.1 -This submission fixes an error occurring on Solaris in two vignettes. The offending code has been removed. +This update removes a dependency ## Test environments -* local macOS install, R 4.0.3 -* local ubuntu 20.04 install, R 4.0.3 +* local macOS install, R 4.0.4 +* local ubuntu 20.04 install, R 4.0.4 * windows R Under development (unstable) ## R CMD check results From 4c98801b625c6e0099a425a185d471c8f148a514 Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Sun, 21 Mar 2021 12:50:22 -0700 Subject: [PATCH 3/3] send to CRAN --- CRAN-RELEASE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRAN-RELEASE b/CRAN-RELEASE index 5dc81972..32feaa82 100644 --- a/CRAN-RELEASE +++ b/CRAN-RELEASE @@ -1,2 +1,2 @@ -This package was submitted to CRAN on 2021-02-06. -Once it is accepted, delete this file and tag the release (commit 1a0aa1b1). +This package was submitted to CRAN on 2021-03-21. +Once it is accepted, delete this file and tag the release (commit 261515d7).