From b11866af570bdbf830870421be3320304afb7d29 Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Sat, 13 Sep 2025 14:02:59 +0200 Subject: [PATCH] (v3.0.0.9032) add GitHub Action for dev version of packages --- .../check-current-testthat-dev-versions.yaml | 86 +++++++++++++++++++ DESCRIPTION | 4 +- NEWS.md | 6 +- 3 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/check-current-testthat-dev-versions.yaml diff --git a/.github/workflows/check-current-testthat-dev-versions.yaml b/.github/workflows/check-current-testthat-dev-versions.yaml new file mode 100644 index 000000000..af1ae5902 --- /dev/null +++ b/.github/workflows/check-current-testthat-dev-versions.yaml @@ -0,0 +1,86 @@ +# ==================================================================== # +# TITLE: # +# AMR: An R Package for Working with Antimicrobial Resistance Data # +# # +# SOURCE CODE: # +# https://github.com/msberends/AMR # +# # +# PLEASE CITE THIS SOFTWARE AS: # +# Berends MS, Luz CF, Friedrich AW, et al. (2022). # +# AMR: An R Package for Working with Antimicrobial Resistance Data. # +# Journal of Statistical Software, 104(3), 1-31. # +# https://doi.org/10.18637/jss.v104.i03 # +# # +# Developed at the University of Groningen and the University Medical # +# Center Groningen in The Netherlands, in collaboration with many # +# colleagues from around the world, see our website. # +# # +# This R package is free software; you can freely use and distribute # +# it for both personal and commercial purposes under the terms of the # +# GNU General Public License version 2.0 (GNU GPL-2), as published by # +# the Free Software Foundation. # +# We created this package for both routine data analysis and academic # +# research and it was publicly released in the hope that it will be # +# useful, but it comes WITHOUT ANY WARRANTY OR LIABILITY. # +# # +# Visit our website for the full manual and a complete tutorial about # +# how to conduct AMR data analysis: https://amr-for-r.org # +# ==================================================================== # + +on: + pull_request: + # run in each PR in this repo + branches: '**' + push: + branches: '**' + schedule: + # also run a schedule everyday at 1 AM. + # this is to check that all dependencies are still available (see R/zzz.R) + - cron: '0 1 * * *' + +name: check-recent + +jobs: + R-code-check: + runs-on: ${{ matrix.config.os }} + + continue-on-error: ${{ matrix.config.allowfail }} + + name: ${{ matrix.config.os }} (dev-pkgs) + + strategy: + fail-fast: false + matrix: + config: + # current 'release' version on Ubuntu + - {os: ubuntu-latest, r: 'release', allowfail: false} + + env: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + R_KEEP_PKG_SOURCE: yes + + steps: + - uses: actions/checkout@v4 + + - uses: r-lib/actions/setup-pandoc@v2 + + - uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ matrix.config.r }} + use-public-rspm: false + extra-repositories: > + https://tidyverse.r-universe.dev + https://r-lib.r-universe.dev + https://tidymodels.r-universe.dev + https://yihui.r-universe.dev + + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::rcmdcheck + needs: check + upgrade: 'TRUE' + + - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true + build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' diff --git a/DESCRIPTION b/DESCRIPTION index 575e6fc58..7a34b7db4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 3.0.0.9031 -Date: 2025-09-12 +Version: 3.0.0.9032 +Date: 2025-09-13 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) data analysis and to work with microbial and antimicrobial properties by diff --git a/NEWS.md b/NEWS.md index fd97c0436..4221e1a5c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,9 @@ -# AMR 3.0.0.9031 +# AMR 3.0.0.9032 This is a bugfix release following the release of v3.0.0 in June 2025. ### Changed -* Allow support for newest `ggplot2` v4.0.0 +* Fixed bugs introduced by `ggplot2` v4.0.0 (#236) * Fixed a bug in `antibiogram()` for when no antimicrobials are set * Fixed a bug in `antibiogram()` to allow column names containing the `+` character (#222) * Fixed a bug in `as.ab()` for antimicrobial codes with a number in it if they are preceded by a space @@ -22,7 +22,7 @@ This is a bugfix release following the release of v3.0.0 in June 2025. * Added `names` to `age_groups()` so that custom names can be given (#215) * Added note to `as.sir()` to make it explicit when higher-level taxonomic breakpoints are used (#218) * Added antibiotic codes from the Comprehensive Antibiotic Resistance Database (CARD) to the `antimicrobials` data set (#225) -* Updated Fosfomycin to be of antibiotic class 'Phosphonics' (#225) +* Updated Fosfomycin to be of antibiotic class Phosphonics (#225) * Updated `random_mic()` and `random_disk()` to set skewedness of the distribution and allow multiple microorganisms