From 9520977a104ce43dd618715bb06bbc42a93f7e03 Mon Sep 17 00:00:00 2001 From: Matthijs Berends <m.s.berends@umcg.nl> Date: Mon, 27 Jan 2025 22:06:32 +0100 Subject: [PATCH] (v2.1.1.9133) (v2.1.1.9132) unit test, final fixes --- .github/workflows/check-current-testthat.yaml | 14 ++++++-------- .github/workflows/check-old-tinytest.yaml | 1 + DESCRIPTION | 2 +- NEWS.md | 2 +- PythonPackage/AMR/AMR.egg-info/PKG-INFO | 2 +- PythonPackage/AMR/AMR/datasets.py | 4 ++++ ...ny.whl => AMR-2.1.1.9133-py3-none-any.whl} | Bin 10161 -> 10179 bytes PythonPackage/AMR/dist/amr-2.1.1.9131.tar.gz | Bin 10013 -> 0 bytes PythonPackage/AMR/dist/amr-2.1.1.9133.tar.gz | Bin 0 -> 10019 bytes PythonPackage/AMR/setup.py | 2 +- _pkgdown.yml | 7 ++++--- cran-comments.md | 6 +----- data-raw/_generate_python_wrapper.sh | 4 ++++ ....txt => gpt_training_text_v2.1.1.9133.txt} | 2 +- 14 files changed, 25 insertions(+), 21 deletions(-) rename PythonPackage/AMR/dist/{AMR-2.1.1.9131-py3-none-any.whl => AMR-2.1.1.9133-py3-none-any.whl} (73%) delete mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9131.tar.gz create mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9133.tar.gz rename data-raw/{gpt_training_text_v2.1.1.9131.txt => gpt_training_text_v2.1.1.9133.txt} (99%) diff --git a/.github/workflows/check-current-testthat.yaml b/.github/workflows/check-current-testthat.yaml index c00d160b2..9b02589e2 100644 --- a/.github/workflows/check-current-testthat.yaml +++ b/.github/workflows/check-current-testthat.yaml @@ -53,22 +53,20 @@ jobs: matrix: config: # current development version, check all major OSes: - - {os: macOS-latest, r: 'devel', allowfail: false} + - {os: macOS-latest, r: 'devel', allowfail: true} - {os: windows-latest, r: 'devel', allowfail: false} - {os: ubuntu-latest, r: 'devel', allowfail: false, http-user-agent: 'release'} # current 'release' version, check all major OSes: - - {os: macOS-latest, r: 'release', allowfail: false} + - {os: macOS-latest, r: 'release', allowfail: true} - {os: windows-latest, r: 'release', allowfail: false} - {os: ubuntu-latest, r: 'release', allowfail: false} # older versions (see also check-old-tinytest.yaml for even older versions): - - {os: ubuntu-latest, r: '4.3', allowfail: false} - - {os: ubuntu-latest, r: '4.2', allowfail: false} - - {os: ubuntu-latest, r: '4.1', allowfail: false} - - {os: ubuntu-latest, r: '4.0', allowfail: false} - - {os: ubuntu-latest, r: '3.6', allowfail: false} - # when testthat loses support for a version, move it to check-old-tinytest.yaml + - {os: ubuntu-latest, r: 'oldrel', allowfail: false} + - {os: ubuntu-latest, r: 'oldrel-1', allowfail: false} + - {os: ubuntu-latest, r: 'oldrel-2', allowfail: false} + - {os: ubuntu-latest, r: 'oldrel-3', allowfail: false} env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/check-old-tinytest.yaml b/.github/workflows/check-old-tinytest.yaml index b740a953d..2a9c94379 100644 --- a/.github/workflows/check-old-tinytest.yaml +++ b/.github/workflows/check-old-tinytest.yaml @@ -122,5 +122,6 @@ jobs: if: always() run: | cd ../AMR.Rcheck + ls find . -name 'tinytest.Rout*' -exec cat '{}' \; || true shell: bash diff --git a/DESCRIPTION b/DESCRIPTION index 011ea1bf1..da893faff 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9131 +Version: 2.1.1.9133 Date: 2025-01-27 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 5a8659664..297421965 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9131 +# AMR 2.1.1.9133 *(this beta version will eventually become v3.0. We're happy to reach a new major milestone soon, which will be all about the new One Health support! Install this beta using [the instructions here](https://msberends.github.io/AMR/#latest-development-version).)* diff --git a/PythonPackage/AMR/AMR.egg-info/PKG-INFO b/PythonPackage/AMR/AMR.egg-info/PKG-INFO index 943704a47..0086df7ed 100644 --- a/PythonPackage/AMR/AMR.egg-info/PKG-INFO +++ b/PythonPackage/AMR/AMR.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.2 Name: AMR -Version: 2.1.1.9131 +Version: 2.1.1.9133 Summary: A Python wrapper for the AMR R package Home-page: https://github.com/msberends/AMR Author: Matthijs Berends diff --git a/PythonPackage/AMR/AMR/datasets.py b/PythonPackage/AMR/AMR/datasets.py index 28774b333..546f74d6a 100644 --- a/PythonPackage/AMR/AMR/datasets.py +++ b/PythonPackage/AMR/AMR/datasets.py @@ -18,6 +18,8 @@ os.makedirs(r_lib_path, exist_ok=True) base = importr('base') utils = importr('utils') +base.options(warn = -1) + # Override R library paths globally for the session robjects.r(f'.Library <- "{r_lib_path}"') # Replace default library robjects.r(f'.Library.site <- "{r_lib_path}"') # Replace site-specific library @@ -73,4 +75,6 @@ microorganisms = pandas2ri.rpy2py(robjects.r('AMR::microorganisms[, !sapply(AMR: antibiotics = pandas2ri.rpy2py(robjects.r('AMR::antibiotics[, !sapply(AMR::antibiotics, is.list)]')) clinical_breakpoints = pandas2ri.rpy2py(robjects.r('AMR::clinical_breakpoints[, !sapply(AMR::clinical_breakpoints, is.list)]')) +base.options(warn = 0) + print(f"AMR: Done.", flush=True) diff --git a/PythonPackage/AMR/dist/AMR-2.1.1.9131-py3-none-any.whl b/PythonPackage/AMR/dist/AMR-2.1.1.9133-py3-none-any.whl similarity index 73% rename from PythonPackage/AMR/dist/AMR-2.1.1.9131-py3-none-any.whl rename to PythonPackage/AMR/dist/AMR-2.1.1.9133-py3-none-any.whl index 785e61c5a0a52a7bfc2a88b3775fc69367140953..8fc5e165ddf7c7e77048431bb65227a49f9cc2ce 100644 GIT binary patch delta 1784 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 delta 1756 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 diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9131.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9131.tar.gz deleted file mode 100644 index 2f87749444bf33ef6d5e5b54ba750c5413624b5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10013 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 diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9133.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9133.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5347ec49e73b6769d89a538ee8ad4cb50595d983 GIT binary patch literal 10019 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 DrFome literal 0 HcmV?d00001 diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index c4cc427cd..c27ecdd1b 100644 --- a/PythonPackage/AMR/setup.py +++ b/PythonPackage/AMR/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='AMR', - version='2.1.1.9131', + version='2.1.1.9133', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/_pkgdown.yml b/_pkgdown.yml index 64a267a82..93b476bda 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -173,9 +173,10 @@ reference: desc: > Use these function for the analysis part. You can use `susceptibility()` or `resistance()` on any antibiotic column. With `antibiogram()`, you can generate a traditional, combined, syndromic, or weighted-incidence syndromic combination - antibiogram(WISCA). This function also comes with support for R Markdown and Quarto. + antibiogram (WISCA). This function also comes with support for R Markdown and Quarto. Be sure to first select the isolates that are appropiate for analysis, by using `first_isolate()` or `is_new_episode()`. - You can also filter your data on certain resistance in certain antibiotic classes (`carbapenems()`, `aminoglycosides()`), or determine multi-drug resistant microorganisms (MDRO, `mdro()`). + You can also filter your data on certain resistance in certain antibiotic classes (`carbapenems()`, `aminoglycosides()`), + or determine multi-drug resistant microorganisms (MDRO, `mdro()`). contents: - "`antibiogram`" - "`proportion`" @@ -184,9 +185,9 @@ reference: - "`first_isolate`" - "`key_antimicrobials`" - "`mdro`" - - "`count`" - "`bug_drug_combinations`" - "`antimicrobial_class_selectors`" + - "`top_n_microorganisms`" - "`mean_amr_distance`" - "`resistance_predict`" - "`guess_ab_col`" diff --git a/cran-comments.md b/cran-comments.md index 13a5d98b6..c131e679d 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,9 +1,5 @@ -**On the 15th of October, 2023, we received an email from Prof Ripley about an issue in UTF-8 strings in our documentation. This version contains a fix to this issue.** - -Previous comments: - As with all previous >20 releases, some CHECKs might return a NOTE for *just* hitting the installation size limit, though its size has been brought down to a minimum in collaboration with CRAN maintainers previously. -We consider this a high-impact package: it was published in the Journal of Statistical Software (2022), is included in a CRAN Task View (Epidemiology), and is according to download stats used in almost all countries in the world. If there is anything to note, please let us know up-front without directly archiving the current version. That said, we continually unit test our package extensively and have no reason to assume that anything is wrong. +We consider this a high-impact package: it was published in the Journal of Statistical Software (2022), is included in a CRAN Task View (Epidemiology), and is according to download stats (cranlogs) used in almost all countries in the world. If there is anything to note, please let us know up-front without directly archiving the current version. That said, we continually unit test our package extensively and have no reason to assume that anything is wrong. Thanks for maintaining and hosting CRAN! It's empowering R and its use enormously! diff --git a/data-raw/_generate_python_wrapper.sh b/data-raw/_generate_python_wrapper.sh index e5f7519e1..87da6e854 100644 --- a/data-raw/_generate_python_wrapper.sh +++ b/data-raw/_generate_python_wrapper.sh @@ -62,6 +62,8 @@ os.makedirs(r_lib_path, exist_ok=True) base = importr('base') utils = importr('utils') +base.options(warn = -1) + # Override R library paths globally for the session robjects.r(f'.Library <- "{r_lib_path}"') # Replace default library robjects.r(f'.Library.site <- "{r_lib_path}"') # Replace site-specific library @@ -117,6 +119,8 @@ microorganisms = pandas2ri.rpy2py(robjects.r('AMR::microorganisms[, !sapply(AMR: antibiotics = pandas2ri.rpy2py(robjects.r('AMR::antibiotics[, !sapply(AMR::antibiotics, is.list)]')) clinical_breakpoints = pandas2ri.rpy2py(robjects.r('AMR::clinical_breakpoints[, !sapply(AMR::clinical_breakpoints, is.list)]')) +base.options(warn = 0) + print(f"AMR: Done.", flush=True) EOL diff --git a/data-raw/gpt_training_text_v2.1.1.9131.txt b/data-raw/gpt_training_text_v2.1.1.9133.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9131.txt rename to data-raw/gpt_training_text_v2.1.1.9133.txt index 478b94be3..0e9ad65b3 100644 --- a/data-raw/gpt_training_text_v2.1.1.9131.txt +++ b/data-raw/gpt_training_text_v2.1.1.9133.txt @@ -1,6 +1,6 @@ This knowledge base contains all context you must know about the AMR package for R. You are a GPT trained to be an assistant for the AMR package in R. You are an incredible R specialist, especially trained in this package and in the tidyverse. -First and foremost, you are trained on version 2.1.1.9131. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9133. Remember this whenever someone asks which AMR package version you’re at. Below are the contents of the file, the file, and all the files (documentation) in the package. Every file content is split using 100 hypens. ----------------------------------------------------------------------------------------------------