From 5dbff3e170a0be510e42d4a0b62706908befb317 Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Mon, 7 Oct 2019 15:12:42 +0200 Subject: [PATCH] (v0.7.1.9098) mdro() unit test fix --- DESCRIPTION | 2 +- NEWS.md | 2 +- docs/404.html | 2 +- docs/LICENSE-text.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 8 ++++---- docs/reference/index.html | 2 +- git_merge.sh | 9 +++++++++ git_premaster.sh | 8 +------- tests/testthat/test-mdro.R | 3 --- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 36836eb8..d851c682 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 0.7.1.9097 +Version: 0.7.1.9098 Date: 2019-10-07 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index c05e9bfe..19ef8f91 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 0.7.1.9097 +# AMR 0.7.1.9098 Last updated: 07-Oct-2019 ### Breaking diff --git a/docs/404.html b/docs/404.html index 63add945..3803545d 100644 --- a/docs/404.html +++ b/docs/404.html @@ -84,7 +84,7 @@ AMR (for R) - 0.7.1.9097 + 0.7.1.9098 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 3ef695bd..089f54fa 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -84,7 +84,7 @@ AMR (for R) - 0.7.1.9097 + 0.7.1.9098 diff --git a/docs/articles/index.html b/docs/articles/index.html index 13420387..c7cea356 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.7.1.9097 + 0.7.1.9098 diff --git a/docs/authors.html b/docs/authors.html index a907ca61..9170d5d1 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -84,7 +84,7 @@ AMR (for R) - 0.7.1.9097 + 0.7.1.9098 diff --git a/docs/index.html b/docs/index.html index bdc38303..3a81e570 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 0.7.1.9097 + 0.7.1.9098 diff --git a/docs/news/index.html b/docs/news/index.html index 8053f8e3..1f6e4004 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.7.1.9097 + 0.7.1.9098 @@ -231,9 +231,9 @@ -
+

-AMR 0.7.1.9097 Unreleased +AMR 0.7.1.9098 Unreleased

Last updated: 07-Oct-2019

@@ -1289,7 +1289,7 @@ Using as.mo(..., allow_uncertain = 3)

Contents

    -
  • 0.7.1.9097
    • +
  • 0.7.1.9098
  • 0.7.1
  • 0.7.0
  • 0.6.1
    • diff --git a/docs/reference/index.html b/docs/reference/index.html index 1155d4c1..49d9cd30 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.7.1.9097 + 0.7.1.9098
diff --git a/git_merge.sh b/git_merge.sh index 69ff7fe8..436f6552 100755 --- a/git_merge.sh +++ b/git_merge.sh @@ -23,7 +23,16 @@ echo "• pushed changes to master" git checkout premaster --quiet echo "• changed branch back to premaster" git status --short +echo +read -p "Use R-hub to simulate all CRAN checks (y/N)? " choice +case "$choice" in + y|Y|j|J ) ;; + * ) exit 1;; +esac +Rscript -e "rhub::check(devtools::build(), platform = c('debian-clang-devel', 'debian-gcc-devel', 'fedora-clang-devel', 'fedora-gcc-devel', 'windows-x86_64-devel', 'debian-gcc-patched', 'solaris-x86-patched', 'debian-gcc-release', 'windows-x86_64-release', 'macos-elcapitan-release', +'windows-x86_64-oldrel'))" +echo # and get stashed changes back # git stash apply --quiet diff --git a/git_premaster.sh b/git_premaster.sh index 1e287397..1754292d 100755 --- a/git_premaster.sh +++ b/git_premaster.sh @@ -90,10 +90,4 @@ echo "•••••••••" echo "• Done •" echo "••••••••" echo -read -p "Upload to R-hub builder (y/N)? " choice -case "$choice" in - y|Y|j|J ) ;; - * ) exit 1;; -esac -Rscript -e "rhub::check_for_cran(devtools::build())" -echo + diff --git a/tests/testthat/test-mdro.R b/tests/testthat/test-mdro.R index dcafecb0..7aa60a7d 100755 --- a/tests/testthat/test-mdro.R +++ b/tests/testthat/test-mdro.R @@ -45,9 +45,6 @@ test_that("mdro works", { expect_equal(brmo(example_isolates, info = FALSE), mdro(example_isolates, guideline = "BRMO", info = FALSE)) - # still working on German guidelines - expect_error(suppressWarnings(mrgn(example_isolates, info = TRUE))) - # test Dutch P. aeruginosa MDRO expect_equal( as.character(mdro(data.frame(mo = as.mo("P. aeruginosa"),