Skip to content

Commit

Permalink
attempt to use rchk
Browse files Browse the repository at this point in the history
  • Loading branch information
kingaa committed Apr 1, 2024
1 parent 784bbf2 commit 871ded7
Show file tree
Hide file tree
Showing 10 changed files with 1,874 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
examples/
rchk/
repo/
revdep/
scripts/
Expand All @@ -19,6 +20,7 @@ LICENSE\.md$
README\.(.?)$
CRAN\.md$
TODO\.md$
BUILD\.md$
^\.gitignore$
\.github
^\.travis\.yml$
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
*.gcda
*.gcno
*.pdf
*.sif
/scripts
lib
library
check
repo
wiki
tmp
covr.html
covr.rds
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: phylopomp
Type: Package
Title: Phylodynamic Inference for POMP Models
Version: 0.10.3.0
Date: 2024-02-14
Version: 0.10.3.1
Date: 2024-04-01
Authors@R: c(person(given=c("Aaron","A."),family="King",role=c("aut","cre"),email="[email protected]",comment=c(ORCID="0000-0001-6159-3207")),
person(given=c("Qianying"),family="Lin",role=c("aut"),comment=c(ORCID="0000-0001-8620-9910"))
)
Expand Down
2 changes: 1 addition & 1 deletion R/package.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##' Simulation and inference of Markov genealogy processes.
##'
##' @name phylopomp
##' @aliases phylopomp-package
##' @aliases phylopomp,package phylopomp-package
##' @author Aaron A. King, Qianying Lin
##' @import ggplot2
##' @useDynLib phylopomp, .registration = TRUE, .fixes="P_"
Expand Down
9 changes: 5 additions & 4 deletions R/yaml.R
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
##' YAML output
##'
##' Human- and machine-readable description
##' Human- and machine-readable description.
##'
##' @name yaml
##' @include getinfo.R
##'
##' @inheritParams getInfo
##' @return A string in yaml format, with class \dQuote{gpyaml}.
##' @return A string in YAML format, with class \dQuote{gpyaml}.
##' @examples
##' simulate("SIIR",time=1) |> yaml()
##'
##'
NULL

##' @rdname yaml
##' @export
yaml <- function (object) {
Expand Down
1 change: 1 addition & 0 deletions man/phylopomp.Rd

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

4 changes: 2 additions & 2 deletions man/yaml.Rd

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

14 changes: 14 additions & 0 deletions rchk/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
TARBALL = $(wildcard *.tar.gz)

rchk: rchk.sif
singularity run rchk.sif $(PWD)/$(TARBALL) | tee rchk.out

rchk.sif:
singularity pull rchk.sif shub://kalibera/rchk:def

clean:
$(RM) $(TARBALL)
$(RM) -r build lib libsonly

fresh: clean
$(RM) rchk.sif
1,836 changes: 1,836 additions & 0 deletions rchk/rchk.out

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ INSTDOCS = $(sort $(wildcard inst/doc/*))
SESSION_PKGS = datasets,utils,grDevices,graphics,stats,methods,tidyverse,$(PKG)

.PHONY: .check check clean covr debug default fresh \
htmlhelp manual publish qcheck qqcheck \
revdeps rhub rsession session www win wind xcheck \
xcovr vcheck ycheck
htmlhelp manual publish qcheck qqcheck rchk revdeps \
rhub rsession session www win wind xcheck xcovr vcheck ycheck

.dist manual www: export R_QPDF=qpdf
.headers: export LC_COLLATE=C
Expand Down Expand Up @@ -131,6 +130,12 @@ www: install

session debug rsession: .session

rchk: .rchk

.rchk: .dist
$(CP) $(TARBALL) rchk
make -C rchk

revdeps: .dist
mkdir -p revdep
$(CP) $(TARBALL) revdep
Expand Down Expand Up @@ -220,6 +225,7 @@ clean:
$(MAKE) -C inst/doc clean
$(MAKE) -C tests clean
$(MAKE) -C revdep clean
$(MAKE) -C rchk clean
$(RM) .dist

fresh: clean
Expand Down

0 comments on commit 871ded7

Please sign in to comment.