From 4ca7fdf3d48d8f105e9dbeeda611f114a6839970 Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Fri, 26 Jun 2026 11:51:08 +0200 Subject: [PATCH] (v3.0.1.9073) yet another go --- DESCRIPTION | 2 +- NEWS.md | 2 +- data-raw/_generate_python_wrapper.sh | 18 ++++++++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6f5d69684..c6e580c85 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 3.0.1.9072 +Version: 3.0.1.9073 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 29a4837c9..6af730c21 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 3.0.1.9072 +# AMR 3.0.1.9073 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 8b85c0c5b..eb8751ada 100644 --- a/data-raw/_generate_python_wrapper.sh +++ b/data-raw/_generate_python_wrapper.sh @@ -72,8 +72,16 @@ base._libPaths(r_lib_path) # Check if the AMR package is installed in R 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', repos='https://cloud.r-project.org', lib=r_lib_path, quiet=True) + utils.install_packages( + 'remotes', + 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 @@ -90,7 +98,13 @@ r_amr_version = str(r_amr_version[0]) if r_amr_version != python_amr_version: try: print(f"AMR: Updating AMR package in {r_lib_path}...", flush=True) - utils.install_packages('remotes', repos='https://cloud.r-project.org', lib=r_lib_path, quiet=True) + utils.install_packages( + 'remotes', + repos='https://cloud.r-project.org', + lib=r_lib_path, + dependencies=True, + quiet=True + ) remotes = importr('remotes', lib_loc=r_lib_path) remotes.install_github('msberends/AMR', lib=r_lib_path, quiet=True) r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')