diff --git a/.github/workflows/check-old-tinytest.yaml b/.github/workflows/check-old-tinytest.yaml index f6f97c3a5..6eab5ec78 100644 --- a/.github/workflows/check-old-tinytest.yaml +++ b/.github/workflows/check-old-tinytest.yaml @@ -49,7 +49,7 @@ jobs: # Test all old versions of R >= 3.0, we support them all! # For these old versions, dependencies and vignettes will not be checked. # For recent R versions, see check-recent.yaml (r-lib and tidyverse support the latest 5 major R releases). - - {os: ubuntu-latest, r: '3.6', allowfail: false} + # - {os: ubuntu-latest, r: '3.6', allowfail: false} # - {os: windows-latest, r: '3.5', allowfail: false} # always fails, horrible with UTF-8 # - {os: ubuntu-latest, r: '3.4', allowfail: false} # 3.1-3.4 now always fails with Error in grep(warn_re, lines, invert = TRUE, value = TRUE) attempt to set index 46/46 in SET_STRING_ELT # - {os: ubuntu-latest, r: '3.3', allowfail: false} diff --git a/DESCRIPTION b/DESCRIPTION index c6e580c85..755c42457 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 3.0.1.9073 +Version: 3.0.1.9074 Date: 2026-06-26 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 6af730c21..afc891d5a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 3.0.1.9073 +# AMR 3.0.1.9074 Planned as v3.1.0, end of June 2026. diff --git a/data-raw/_generate_python_wrapper.sh b/data-raw/_generate_python_wrapper.sh index eb8751ada..1780c2a77 100644 --- a/data-raw/_generate_python_wrapper.sh +++ b/data-raw/_generate_python_wrapper.sh @@ -73,15 +73,12 @@ base._libPaths(r_lib_path) if not isinstalled('AMR', lib_loc=r_lib_path): print(f"AMR: Installing latest AMR R package to {r_lib_path}...", flush=True) utils.install_packages( - 'remotes', + StrVector(['remotes', 'desc']), repos='https://cloud.r-project.org', lib=r_lib_path, - dependencies=True, quiet=True ) - rint(f"AMR: Installed 'remotes'", flush=True) remotes = importr('remotes', lib_loc=r_lib_path) - rint(f"AMR: Loaded 'remotes'", flush=True) remotes.install_github('msberends/AMR', lib=r_lib_path, quiet=True) # Retrieve Python AMR version @@ -99,10 +96,9 @@ if r_amr_version != python_amr_version: try: print(f"AMR: Updating AMR package in {r_lib_path}...", flush=True) utils.install_packages( - 'remotes', + StrVector(['remotes', 'desc']), repos='https://cloud.r-project.org', lib=r_lib_path, - dependencies=True, quiet=True ) remotes = importr('remotes', lib_loc=r_lib_path)