Merge branch 'develop' into patch-1

ropensci · Jun 5, 2024 · 205be79 · 205be79
2 parents be7c335 + 4c640ea
commit 205be79
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,15 +1,15 @@
 Package: beastier
 Type: Package
 Title: Call 'BEAST2'
-Version: 2.5.1
+Version: 2.5.2
 Authors@R: c(
-    person("Richèl J.C.", "Bilderbeek", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-1107-7049")),
+    person("Richèl J.C.", "Bilderbeek", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-1107-7049")),
     person("Joëlle", "Barido-Sottani", role = "rev", comment = "Joëlle reviewed the package for rOpenSci, see https://github.com/ropensci/onboarding/issues/209"),
     person("David", "Winter", role = "rev", comment = "David reviewed the package for rOpenSci, see https://github.com/ropensci/onboarding/issues/209"),
     person("Jason Griffiths", role = "ctb", comment = c(ORCID = "0000-0002-1667-8233")),
     person("Olivier", "Roy", role = "ctb"),
     person("Thijs", "Janzen", role = "ctb"))
-Maintainer: Richèl J.C. Bilderbeek <[email protected]>
+Maintainer: Richèl J.C. Bilderbeek <[email protected]>
 Description: 'BEAST2' (<https://www.beast2.org>) is a widely used
     Bayesian phylogenetic tool, that uses DNA/RNA/protein data
     and many model priors to create a posterior of jointly estimated 

diff --git a/NEWS.md b/NEWS.md
@@ -2,7 +2,7 @@
 
 Newest versions at top.
 
-# beastier 2.5.1 (unreleased)
+# beastier 2.5.2 (unreleased)
 
 ## NEW FEATURES
 
@@ -20,8 +20,27 @@ Newest versions at top.
 
   * None
 
+# beastier 2.5.1 (2024-06-5)
+
+## NEW FEATURES
+
+  * None
+
+## MINOR IMPROVEMENTS
+
+  * Update email address of maintainer
+
+## BUG FIXES
+
+  * None
+
+## DEPRECATED AND DEFUNCT
+
+  * None
+
 # beastier 2.5 (2023-11-07)
 
+
 ## NEW FEATURES
 
   * None

diff --git a/code_of_conduct.md b/code_of_conduct.md
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team at [email protected]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality regarding the reporter of an incident.