diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index aa0128f0..598e404b 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -53,38 +53,34 @@ jobs: matrix: config: # these are the developmental version of R - we allow those tests to fail - - {os: macOS-latest, r: 'devel', allowfail: false} - - {os: windows-latest, r: 'devel', allowfail: false} - - {os: ubuntu-20.04, r: 'devel', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - # test all systems against all released versions of R >= 3.0, we support them all! - - {os: macOS-latest, r: '4.1', allowfail: false} + # - {os: macOS-latest, r: 'devel', allowfail: false} + # - {os: windows-latest, r: 'devel', allowfail: false} + # - {os: ubuntu-20.04, r: 'devel', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # + # # test all systems against all released versions of R >= 3.0, we support them all! + # - {os: macOS-latest, r: '4.1', allowfail: false} - {os: windows-latest, r: '4.1', allowfail: false} - - {os: ubuntu-20.04, r: '4.1', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: macOS-latest, r: '4.0', allowfail: false} + # - {os: ubuntu-20.04, r: '4.1', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: macOS-latest, r: '4.0', allowfail: false} - {os: windows-latest, r: '4.0', allowfail: false} - - {os: ubuntu-20.04, r: '4.0', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: macOS-latest, r: '3.6', allowfail: false} + # - {os: ubuntu-20.04, r: '4.0', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: macOS-latest, r: '3.6', allowfail: false} - {os: windows-latest, r: '3.6', allowfail: false} - - {os: ubuntu-20.04, r: '3.6', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: macOS-latest, r: '3.5', allowfail: false} + # - {os: ubuntu-20.04, r: '3.6', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: macOS-latest, r: '3.5', allowfail: false} - {os: windows-latest, r: '3.5', allowfail: false} - - {os: ubuntu-20.04, r: '3.5', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: macOS-latest, r: '3.4', allowfail: false} + # - {os: ubuntu-20.04, r: '3.5', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: macOS-latest, r: '3.4', allowfail: false} - {os: windows-latest, r: '3.4', allowfail: false} - - {os: ubuntu-20.04, r: '3.4', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: macOS-latest, r: '3.3', allowfail: false} + # - {os: ubuntu-20.04, r: '3.4', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: macOS-latest, r: '3.3', allowfail: false} - {os: windows-latest, r: '3.3', allowfail: false} - - {os: ubuntu-20.04, r: '3.3', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: macOS-latest, r: '3.2', allowfail: false} + # - {os: ubuntu-20.04, r: '3.3', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: macOS-latest, r: '3.2', allowfail: false} - {os: windows-latest, r: '3.2', allowfail: false} - - {os: ubuntu-20.04, r: '3.2', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - # - {os: macOS-latest, r: '3.1', allowfail: false} - # - {os: windows-latest, r: '3.1', allowfail: false} - - {os: ubuntu-20.04, r: '3.1', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - # - {os: macOS-latest, r: '3.0', allowfail: false} - # - {os: windows-latest, r: '3.0', allowfail: false} - - {os: ubuntu-20.04, r: '3.0', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: ubuntu-20.04, r: '3.2', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: ubuntu-20.04, r: '3.1', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + # - {os: ubuntu-20.04, r: '3.0', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true diff --git a/DESCRIPTION b/DESCRIPTION index a20afd31..007fda78 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.7.1.9035 +Version: 1.7.1.9036 Date: 2021-08-30 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 89eb5e96..b3927b46 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# `AMR` 1.7.1.9035 +# `AMR` 1.7.1.9036 ## Last updated: 30 August 2021 ### Breaking changes diff --git a/data-raw/AMR_latest.tar.gz b/data-raw/AMR_latest.tar.gz index ff1794e6..4851f849 100644 Binary files a/data-raw/AMR_latest.tar.gz and b/data-raw/AMR_latest.tar.gz differ diff --git a/docs/articles/datasets.html b/docs/articles/datasets.html index bac7a7de..37a14e37 100644 --- a/docs/articles/datasets.html +++ b/docs/articles/datasets.html @@ -44,7 +44,7 @@ AMR (for R) - 1.7.1.9035 + 1.7.1.9036 diff --git a/docs/news/index.html b/docs/news/index.html index 32151e08..364687b3 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -92,7 +92,7 @@ AMR (for R) - 1.7.1.9035 + 1.7.1.9036 @@ -240,9 +240,9 @@ Source: NEWS.md -
-

- Unreleased AMR 1.7.1.9035

+
+

+ Unreleased AMR 1.7.1.9036

Last updated: 30 August 2021 diff --git a/inst/tinytest/test-first_isolate.R b/inst/tinytest/test-first_isolate.R index 8b487f54..2d6afd98 100755 --- a/inst/tinytest/test-first_isolate.R +++ b/inst/tinytest/test-first_isolate.R @@ -117,12 +117,14 @@ if (AMR:::pkg_is_available("dplyr")) { first_isolate(col_date = "date", col_mo = "mo", col_patient_id = "patient_id", - info = FALSE), + info = FALSE, + require_cur_data = TRUE), example_isolates %>% first_isolate(col_date = "date", col_mo = "mo", col_patient_id = "patient_id", - info = FALSE)) + info = FALSE, + require_cur_data = TRUE)) # support for WHONET expect_message(example_isolates %>%