diff --git a/DESCRIPTION b/DESCRIPTION index c3946b921..6f5d69684 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 3.0.1.9071 +Version: 3.0.1.9072 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 0907a1ed3..29a4837c9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 3.0.1.9071 +# AMR 3.0.1.9072 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 fc49aa603..8b85c0c5b 100644 --- a/data-raw/_generate_python_wrapper.sh +++ b/data-raw/_generate_python_wrapper.sh @@ -72,9 +72,9 @@ 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', quiet=True) - remotes = importr('remotes') - remotes.install_github('msberends/AMR', quiet=True) + utils.install_packages('remotes', repos='https://cloud.r-project.org', lib=r_lib_path, quiet=True) + remotes = importr('remotes', lib_loc=r_lib_path) + remotes.install_github('msberends/AMR', lib=r_lib_path, quiet=True) # Retrieve Python AMR version try: @@ -90,9 +90,9 @@ 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', quiet=True) - remotes = importr('remotes') - remotes.install_github('msberends/AMR', quiet=True) + utils.install_packages('remotes', repos='https://cloud.r-project.org', lib=r_lib_path, 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}"))') r_amr_version = str(r_amr_version[0]) except Exception as e: