1
0
mirror of https://github.com/msberends/AMR.git synced 2026-06-29 18:16:20 +02:00

(v3.0.1.9072) fix py again

This commit is contained in:
2026-06-26 11:47:11 +02:00
parent 61e1fbf1e0
commit 6edae2037a
3 changed files with 8 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
Package: AMR Package: AMR
Version: 3.0.1.9071 Version: 3.0.1.9072
Date: 2026-06-26 Date: 2026-06-26
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)

View File

@@ -1,4 +1,4 @@
# AMR 3.0.1.9071 # AMR 3.0.1.9072
Planned as v3.1.0, end of June 2026. Planned as v3.1.0, end of June 2026.

View File

@@ -72,9 +72,9 @@ base._libPaths(r_lib_path)
# Check if the AMR package is installed in R # Check if the AMR package is installed in R
if not isinstalled('AMR', lib_loc=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) print(f"AMR: Installing latest AMR R package to {r_lib_path}...", flush=True)
utils.install_packages('remotes', quiet=True) utils.install_packages('remotes', repos='https://cloud.r-project.org', lib=r_lib_path, quiet=True)
remotes = importr('remotes') remotes = importr('remotes', lib_loc=r_lib_path)
remotes.install_github('msberends/AMR', quiet=True) remotes.install_github('msberends/AMR', lib=r_lib_path, quiet=True)
# Retrieve Python AMR version # Retrieve Python AMR version
try: try:
@@ -90,9 +90,9 @@ r_amr_version = str(r_amr_version[0])
if r_amr_version != python_amr_version: if r_amr_version != python_amr_version:
try: try:
print(f"AMR: Updating AMR package in {r_lib_path}...", flush=True) print(f"AMR: Updating AMR package in {r_lib_path}...", flush=True)
utils.install_packages('remotes', quiet=True) utils.install_packages('remotes', repos='https://cloud.r-project.org', lib=r_lib_path, quiet=True)
remotes = importr('remotes') remotes = importr('remotes', lib_loc=r_lib_path)
remotes.install_github('msberends/AMR', quiet=True) 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}"))') r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')
r_amr_version = str(r_amr_version[0]) r_amr_version = str(r_amr_version[0])
except Exception as e: except Exception as e: