Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
jranke committed Sep 6, 2024
2 parents d34f2b0 + ba3eaa0 commit 7b14afb
Show file tree
Hide file tree
Showing 134 changed files with 86,697 additions and 2,153 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@
^vignettes/web_only/.*$
^.*\.Rproj$
^\.Rproj\.user$
^codecov\.yml$
^\.github$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
docs/articles/*_cache/
coverage/
install.log
inst/rmarkdown/templates/hierarchical_kinetics/skeleton/skeleton_cache
inst/rmarkdown/templates/hierarchical_kinetics/skeleton/skeleton_files
Expand Down
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@ script:

after_failure:
- ./run.sh dump_logs

after_success:
- travis_wait 40 ./run.sh coverage
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ VignetteBuilder: knitr
BugReports: https://github.com/jranke/mkin/issues/
URL: https://pkgdown.jrwb.de/mkin/
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
3 changes: 1 addition & 2 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ pd_all: roxygen
git add -A

coverage:
mkdir -p docs/dev/coverage
"$(RBIN)/Rscript" -e "covr::report(file = 'coverage/coverage.html')"
"$(RBIN)/Rscript" -e "covr::report(file = 'docs/coverage/coverage.html')"

r-forge:
git archive main > $(HOME)/git/mkin/mkin.tar;\
Expand Down
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

- 'R/create_deg_func.R: Make sure that no reversible reactions are specified in the case of two observed variables, as this is not supported

# mkin 1.2.8
# mkin 1.2.8 (unreleased)

- 'R/{mhmkin,status}.R': Deal with 'saem' fits that fail when updating an 'mhmkin' object

# mkin 1.2.7
# mkin 1.2.7 (unreleased)

- 'R/illparms.R': Fix a bug that prevented an ill-defined random effect to be found if there was only one random effect in the model. Also add a test for this.

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# mkin

<!-- badges: start -->
[![](https://www.r-pkg.org/badges/version/mkin)](https://cran.r-project.org/package=mkin)
[![mkin status badge](https://jranke.r-universe.dev/badges/mkin)](https://jranke.r-universe.dev/ui/#package:mkin)
[![Build Status](https://app.travis-ci.com/jranke/mkin.svg?token=Sq9VuYWyRz2FbBLxu6DK&branch=main)](https://app.travis-ci.com/jranke/mkin)
[![codecov](https://codecov.io/github/jranke/mkin/branch/main/graphs/badge.svg)](https://app.codecov.io/gh/jranke/mkin)
<!-- badges: end -->

The [R](https://www.r-project.org) package **mkin** provides calculation routines for the analysis of
chemical degradation data, including <b>m</b>ulticompartment <b>kin</b>etics as
Expand Down
3 changes: 3 additions & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ reference:
- multistart
- llhist
- parplot
- check_failed
- title: Datasets and known results
contents:
- ds_mixed
Expand Down Expand Up @@ -178,5 +179,7 @@ navbar:
href: articles/twa.html
- text: Example evaluation of NAFTA SOP Attachment examples
href: articles/web_only/NAFTA_examples.html
- text: Test coverage
href: coverage/coverage.html
- text: News
href: news/index.html
14 changes: 14 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
comment: false

coverage:
status:
project:
default:
target: auto
threshold: 1%
informational: true
patch:
default:
target: auto
threshold: 1%
informational: true
112 changes: 48 additions & 64 deletions docs/404.html

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

Loading

0 comments on commit 7b14afb

Please sign in to comment.