From c44c5e3913c620d4c546089605d97d2b2334e338 Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Mon, 12 Aug 2019 15:34:49 +0200 Subject: [PATCH] (v0.7.1.9037) CI and global env fix --- .gitlab-ci.yml | 2 +- DESCRIPTION | 2 +- NEWS.md | 2 +- R/globals.R | 1 + docs/LICENSE-text.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 8 ++++---- docs/reference/index.html | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac0915d6..8e301830 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ before_script: # install dependencies for packages - apt-get install -y wget locales libxml2-dev libssl-dev libcurl4-openssl-dev zlib1g-dev > /dev/null # recent pandoc - - wget --quiet https://github.com/jgm/pandoc/releases/download/2.7.2/pandoc-2.7.2-1-amd64.deb + - wget --quiet https://github.com/jgm/pandoc/releases/download/2.7.3/pandoc-2.7.3-1-amd64.deb - dpkg -i pandoc*.deb - rm pandoc*.deb # set R system language diff --git a/DESCRIPTION b/DESCRIPTION index 72421288..19cae831 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 0.7.1.9036 +Version: 0.7.1.9037 Date: 2019-08-12 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index e73741c2..d50f23da 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 0.7.1.9036 +# AMR 0.7.1.9037 ### Breaking * Function `freq()` has moved to a new package, [`clean`](https://github.com/msberends/clean) ([CRAN link](https://cran.r-project.org/package=clean)). Creating frequency tables is actually not the scope of this package (never was) and this function has matured a lot over the last two years. Therefore, a new package was created for data cleaning and checking and it perfectly fits the `freq()` function. The [`clean`](https://github.com/msberends/clean) package is available on CRAN and will be installed automatically when updating the `AMR` package, that now imports it. In a later stage, the `skewness()` and `kurtosis()` functions will be moved to the `clean` package too. diff --git a/R/globals.R b/R/globals.R index 8954948b..46f68624 100755 --- a/R/globals.R +++ b/R/globals.R @@ -36,6 +36,7 @@ globalVariables(c(".", "fullname_lower", "genus", "gramstain", + "group", "index", "input", "interpretation", diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 37a2ca89..fa7afb69 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9036 + 0.7.1.9037 diff --git a/docs/articles/index.html b/docs/articles/index.html index 4b572158..823a7563 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9036 + 0.7.1.9037 diff --git a/docs/authors.html b/docs/authors.html index 38ef6d49..1c7d8097 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9036 + 0.7.1.9037 diff --git a/docs/index.html b/docs/index.html index 67083bd3..5b68dca2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,7 +42,7 @@ AMR (for R) - 0.7.1.9036 + 0.7.1.9037 diff --git a/docs/news/index.html b/docs/news/index.html index b1435014..8f2d95eb 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9036 + 0.7.1.9037 @@ -225,9 +225,9 @@ -
+

-AMR 0.7.1.9036 Unreleased +AMR 0.7.1.9037 Unreleased

@@ -1236,7 +1236,7 @@ Using as.mo(..., allow_uncertain = 3)

Contents

    -
  • 0.7.1.9036
    • +
  • 0.7.1.9037
  • 0.7.1
  • 0.7.0
  • 0.6.1
    • diff --git a/docs/reference/index.html b/docs/reference/index.html index 18ece678..7e037bf3 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9036 + 0.7.1.9037