mirror of
https://github.com/msberends/AMR.git
synced 2026-11-16 06:30:48 +01:00
(v3.1.0.9014) Fix the CI: replace a test unsupported by tinytest, run R 3.0 on Ubuntu 24.04, and use Python 3.12 for the PyPI package, since ubuntu-latest moved to Ubuntu 26.04
This commit is contained in:
1 parent
7f3c75ece7
commit
08fd165a60
5 files changed
+16
-5
No files matched your search
@@ -57,7 +57,8 @@ jobs:
|
|||||||
# - {os: ubuntu-latest, r: '3.3', allowfail: false}
|
# - {os: ubuntu-latest, r: '3.3', allowfail: false}
|
||||||
# - {os: ubuntu-latest, r: '3.2', allowfail: false}
|
# - {os: ubuntu-latest, r: '3.2', allowfail: false}
|
||||||
# - {os: ubuntu-latest, r: '3.1', allowfail: false}
|
# - {os: ubuntu-latest, r: '3.1', allowfail: false}
|
||||||
- {os: ubuntu-latest, r: '3.0', allowfail: false}
|
# R 3.0 cannot be resolved for ubuntu-latest (Ubuntu 26.04), so use Ubuntu 24.04
|
||||||
|
- {os: ubuntu-24.04, r: '3.0', allowfail: false}
|
||||||
|
|
||||||
env:
|
env:
|
||||||
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
|
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
|
||||||
|
|||||||
@@ -48,7 +48,8 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
with:
|
with:
|
||||||
python-version: '3.9'
|
# Python 3.9 is not available for ubuntu-latest (Ubuntu 26.04)
|
||||||
|
python-version: '3.12'
|
||||||
|
|
||||||
- name: Install build dependencies
|
- name: Install build dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
Package: AMR
|
Package: AMR
|
||||||
Version: 3.1.0.9013
|
Version: 3.1.0.9014
|
||||||
Date: 2026-10-30
|
Date: 2026-10-30
|
||||||
Title: Antimicrobial Resistance Data Analysis
|
Title: Antimicrobial Resistance Data Analysis
|
||||||
Description: Functions to simplify and standardise antimicrobial resistance (AMR)
|
Description: Functions to simplify and standardise antimicrobial resistance (AMR)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# AMR 3.1.0.9013
|
# AMR 3.1.0.9014
|
||||||
|
|
||||||
This version fixes a critical bug in WISCA that biased all coverage estimates of `wisca()` and `antibiogram(..., wisca = TRUE)` downwards since AMR 3.0.0. Users are strongly advised to re-run their WISCA analyses.
|
This version fixes a critical bug in WISCA that biased all coverage estimates of `wisca()` and `antibiogram(..., wisca = TRUE)` downwards since AMR 3.0.0. Users are strongly advised to re-run their WISCA analyses.
|
||||||
|
|
||||||
|
|||||||
@@ -75,7 +75,16 @@ test_that("test-antibiogram.R", {
|
|||||||
expect_false("B_BRCLL_MLTN" %in% retrieve_wisca_parameters(wisca_with)$mo)
|
expect_false("B_BRCLL_MLTN" %in% retrieve_wisca_parameters(wisca_with)$mo)
|
||||||
# warning for a large prior weight of rare pathogens
|
# warning for a large prior weight of rare pathogens
|
||||||
expect_warning(wisca(wisca_data, antimicrobials = "MEM", syndromic_group = "grp", simulations = 100, info = FALSE), "prior weight")
|
expect_warning(wisca(wisca_data, antimicrobials = "MEM", syndromic_group = "grp", simulations = 100, info = FALSE), "prior weight")
|
||||||
expect_warning(wisca(example_isolates, antimicrobials = "MEM", simulations = 100, info = FALSE), NA)
|
# (expect_warning(..., NA) is not supported by tinytest)
|
||||||
|
wisca_warnings <- character(0)
|
||||||
|
withCallingHandlers(
|
||||||
|
wisca(example_isolates, antimicrobials = "MEM", simulations = 100, info = FALSE),
|
||||||
|
warning = function(w) {
|
||||||
|
wisca_warnings <<- c(wisca_warnings, conditionMessage(w))
|
||||||
|
invokeRestart("muffleWarning")
|
||||||
|
}
|
||||||
|
)
|
||||||
|
expect_false(any(grepl("prior weight", wisca_warnings)))
|
||||||
if (AMR:::pkg_is_available("dplyr", min_version = "1.0.0", also_load = TRUE)) {
|
if (AMR:::pkg_is_available("dplyr", min_version = "1.0.0", also_load = TRUE)) {
|
||||||
ab_grouped <- tryCatch(
|
ab_grouped <- tryCatch(
|
||||||
# pathogen names are translated, so test in English, which must also hold on systems in another language
|
# pathogen names are translated, so test in English, which must also hold on systems in another language
|
||||||
|
|||||||
Reference in new issue
Block a user