mirror of
https://github.com/msberends/AMR.git
synced 2024-12-26 04:46:11 +01:00
(v1.7.1.9036) dplyr grouping fix on windows?
This commit is contained in:
parent
986bd826ee
commit
953dfac9e5
46
.github/workflows/check.yaml
vendored
46
.github/workflows/check.yaml
vendored
@ -53,38 +53,34 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
config:
|
config:
|
||||||
# these are the developmental version of R - we allow those tests to fail
|
# these are the developmental version of R - we allow those tests to fail
|
||||||
- {os: macOS-latest, r: 'devel', allowfail: false}
|
# - {os: macOS-latest, r: 'devel', allowfail: false}
|
||||||
- {os: windows-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"}
|
# - {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!
|
# # 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: '4.1', allowfail: false}
|
||||||
- {os: windows-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: 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: macOS-latest, r: '4.0', allowfail: false}
|
||||||
- {os: windows-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: 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: macOS-latest, r: '3.6', allowfail: false}
|
||||||
- {os: windows-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: 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: macOS-latest, r: '3.5', allowfail: false}
|
||||||
- {os: windows-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: 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: macOS-latest, r: '3.4', allowfail: false}
|
||||||
- {os: windows-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: 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: macOS-latest, r: '3.3', allowfail: false}
|
||||||
- {os: windows-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: 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: macOS-latest, r: '3.2', allowfail: false}
|
||||||
- {os: windows-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: 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: ubuntu-20.04, r: '3.1', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
|
||||||
# - {os: windows-latest, r: '3.1', 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.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"}
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
|
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
Package: AMR
|
Package: AMR
|
||||||
Version: 1.7.1.9035
|
Version: 1.7.1.9036
|
||||||
Date: 2021-08-30
|
Date: 2021-08-30
|
||||||
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)
|
||||||
|
|||||||
2
NEWS.md
2
NEWS.md
@ -1,4 +1,4 @@
|
|||||||
# `AMR` 1.7.1.9035
|
# `AMR` 1.7.1.9036
|
||||||
## <small>Last updated: 30 August 2021</small>
|
## <small>Last updated: 30 August 2021</small>
|
||||||
|
|
||||||
### Breaking changes
|
### Breaking changes
|
||||||
|
|||||||
Binary file not shown.
@ -44,7 +44,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
||||||
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.7.1.9035</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.7.1.9036</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -92,7 +92,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
||||||
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.7.1.9035</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.7.1.9036</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -240,9 +240,9 @@
|
|||||||
<small>Source: <a href='https://github.com/msberends/AMR/blob/master/NEWS.md'><code>NEWS.md</code></a></small>
|
<small>Source: <a href='https://github.com/msberends/AMR/blob/master/NEWS.md'><code>NEWS.md</code></a></small>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="amr-1719035" class="section level1">
|
<div id="amr-1719036" class="section level1">
|
||||||
<h1 class="page-header" data-toc-text="1.7.1.9035">
|
<h1 class="page-header" data-toc-text="1.7.1.9036">
|
||||||
<a href="#amr-1719035" class="anchor" aria-hidden="true"></a><small> Unreleased </small><code>AMR</code> 1.7.1.9035</h1>
|
<a href="#amr-1719036" class="anchor" aria-hidden="true"></a><small> Unreleased </small><code>AMR</code> 1.7.1.9036</h1>
|
||||||
<div id="last-updated-30-august-2021" class="section level2">
|
<div id="last-updated-30-august-2021" class="section level2">
|
||||||
<h2 class="hasAnchor">
|
<h2 class="hasAnchor">
|
||||||
<a href="#last-updated-30-august-2021" class="anchor" aria-hidden="true"></a><small>Last updated: 30 August 2021</small>
|
<a href="#last-updated-30-august-2021" class="anchor" aria-hidden="true"></a><small>Last updated: 30 August 2021</small>
|
||||||
|
|||||||
@ -117,12 +117,14 @@ if (AMR:::pkg_is_available("dplyr")) {
|
|||||||
first_isolate(col_date = "date",
|
first_isolate(col_date = "date",
|
||||||
col_mo = "mo",
|
col_mo = "mo",
|
||||||
col_patient_id = "patient_id",
|
col_patient_id = "patient_id",
|
||||||
info = FALSE),
|
info = FALSE,
|
||||||
|
require_cur_data = TRUE),
|
||||||
example_isolates %>%
|
example_isolates %>%
|
||||||
first_isolate(col_date = "date",
|
first_isolate(col_date = "date",
|
||||||
col_mo = "mo",
|
col_mo = "mo",
|
||||||
col_patient_id = "patient_id",
|
col_patient_id = "patient_id",
|
||||||
info = FALSE))
|
info = FALSE,
|
||||||
|
require_cur_data = TRUE))
|
||||||
|
|
||||||
# support for WHONET
|
# support for WHONET
|
||||||
expect_message(example_isolates %>%
|
expect_message(example_isolates %>%
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user