Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
richelbilderbeek committed Sep 25, 2023
2 parents 7dcdca3 + 6c07969 commit f90dbd6
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 49 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/check_bash_style.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Check bash style

on:
push:
pull_request:
schedule:
- cron: "0 0 16 * *"


jobs:
check_bash_style:

runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:

- name: Set up Git repository
uses: actions/checkout@v2

- name: Check bash scripts for style
run: shellcheck *.sh scripts/*.sh
19 changes: 19 additions & 0 deletions .github/workflows/check_links.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
on:
push:
pull_request:
schedule:
- cron: "0 0 12 * *"

name: check-links

jobs:
check-links:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2

- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
config-file: 'mlc_config.json'
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Description: 'BEAST2' (<https://www.beast2.org>) is a widely used
from an 'R' function call.
License: GPL-3
Encoding: UTF-8
RoxygenNote: 7.2.1
RoxygenNote: 7.2.3
Imports:
ape,
assertive,
beautier (>= 2.6.6),
beautier (>= 2.6.9),
devtools,
phangorn,
rappdirs,
Expand All @@ -39,7 +39,7 @@ Suggests:
spelling,
testit,
testthat (>= 2.1.0),
tracerer
tracerer (>= 2.2.3)
URL: https://docs.ropensci.org/beastier/ (website)
https://github.com/ropensci/beastier/
BugReports: https://github.com/ropensci/beastier
Expand Down
5 changes: 3 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

Newest versions at top.

## beastier 2.4.12 (unreleased)
## beastier 2.4.12 (2023-09-25)

### NEW FEATURES

* None

### MINOR IMPROVEMENTS

* None
* Use new CITATION style
* Did `usethis::use_package_doc()`

### BUG FIXES

Expand Down
24 changes: 7 additions & 17 deletions inst/CITATION
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
citHeader("To cite reports in publications, please use:")

citEntry(entry = "article",
title="babette: BEAUti 2, BEAST 2 and Tracer for R",
author="Richèl JC Bilderbeek and Rampal S Etienne",
journal="Methods in Ecology and Evolution",
year="2018",
publisher="Wiley Online Library",
url="https://besjournals.onlinelibrary.wiley.com/doi/10.1111/2041-210X.13032",
textVersion = paste(
"Bilderbeek, Richèl JC, and Etienne, Rampal S.",
"babette: BEAUti 2, BEAST 2 and Tracer for R.",
"Methods in Ecology and Evolution (2018).",
"https://doi.org/10.1111/2041-210X.13032"
)
bibentry(
bibtype = "Article",
author = "Richèl JC Bilderbeek and Rampal S Etienne",
title = "babette: BEAUti 2, BEAST 2 and Tracer for R",
journal = "Methods in Ecology and Evolution",
year = "2008",
url = "https://doi.org/10.1111/2041-210X.13032",
)


Binary file removed man/figures/TravisCI.png
Binary file not shown.
Binary file removed pics/TravisCI.png
Binary file not shown.
15 changes: 6 additions & 9 deletions scripts/build_cran.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@
rm -rf build
mkdir build

cp -r ../R build
cp -r ../inst build
cp -r ../man build
# cp -r ../Meta build
cp -r ../R build
# cp -r ../src build
cp -r ../vignettes build
cp ../DESCRIPTION build
cp ../NAMESPACE build

cd build
cd build || exit 42
R CMD build .
R CMD check --as-cran $(ls *.tar.gz)


if [[ $HOSTNAME == "N141CU" ]]; then
notify-send "Done building beastier"
fi

gz_files=$(ls ./*.tar.gz)
R CMD check --as-cran "${gz_files}"
18 changes: 0 additions & 18 deletions scripts/check_dead_links.sh

This file was deleted.

0 comments on commit f90dbd6

Please sign in to comment.