From a6606d334cd1b9d643bae84ba82902cf7c713953 Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Tue, 30 Jul 2019 19:20:13 +0200 Subject: [PATCH] (v0.7.1.9019) CI fix --- .gitlab-ci.yml | 2 +- DESCRIPTION | 2 +- NEWS.md | 2 +- appveyor.yml | 2 +- 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 +- git_premaster.sh | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71241730..b1721fda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,7 +118,7 @@ coverage: # install missing and outdated packages - Rscript -e 'source(".gitlab-ci.R"); gl_update_pkg_all(repos = "https://cran.rstudio.com", quiet = TRUE, install_pkgdown = TRUE)' # codecov token is set in https://gitlab.com/msberends/AMR/settings/ci_cd - - Rscript -e "cc <- covr::package_coverage(); covr::codecov(coverage = cc, token = '$codecov', exclusions = c('R/atc_online.R', 'R/mo_source.R')); cat('Code coverage:', covr::percent_coverage(cc))" + - Rscript -e "cc <- covr::package_coverage(); covr::codecov(coverage = cc, token = '$codecov', exclusions = c('R/atc_online.R', 'R/mo_source.R', 'R/resistance_predict.R')); cat('Code coverage:', covr::percent_coverage(cc))" coverage: '/Code coverage: \d+\.\d+/' pages: diff --git a/DESCRIPTION b/DESCRIPTION index 9fcdb6e0..7278687f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 0.7.1.9018 +Version: 0.7.1.9019 Date: 2019-07-30 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 307c7899..e29e9c86 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 0.7.1.9018 +# AMR 0.7.1.9019 ### 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. We decided to create a new package 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/appveyor.yml b/appveyor.yml index f82022c8..920694a4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,7 +39,7 @@ environment: GCC_PATH: mingw_64 WARNINGS_ARE_ERRORS: 1 PKGTYPE: win.binary - # USE_RTOOLS: true + USE_RTOOLS: true matrix: - R_VERSION: release diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 913c3c1f..d1e9c8df 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9018 + 0.7.1.9019 diff --git a/docs/articles/index.html b/docs/articles/index.html index 682baa3e..e2bc89d3 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9018 + 0.7.1.9019 diff --git a/docs/authors.html b/docs/authors.html index b4401049..e6be7ac4 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9018 + 0.7.1.9019 diff --git a/docs/index.html b/docs/index.html index 7fb66342..e1e50d79 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,7 +42,7 @@ AMR (for R) - 0.7.1.9018 + 0.7.1.9019 diff --git a/docs/news/index.html b/docs/news/index.html index 9d6e9a3e..dd3e3c42 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9018 + 0.7.1.9019 @@ -225,9 +225,9 @@ -
+

-AMR 0.7.1.9018 Unreleased +AMR 0.7.1.9019 Unreleased

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

Contents

    -
  • 0.7.1.9018
    • +
  • 0.7.1.9019
  • 0.7.1
  • 0.7.0
  • 0.6.1
    • diff --git a/docs/reference/index.html b/docs/reference/index.html index d2d3cdfa..7675812b 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9018 + 0.7.1.9019

diff --git a/git_premaster.sh b/git_premaster.sh index 66cd388c..d2743490 100755 --- a/git_premaster.sh +++ b/git_premaster.sh @@ -36,7 +36,7 @@ fi sed -i -- "s/^Version: .*/Version: ${new_version}/" DESCRIPTION # update 1st line of NEWS.md sed -i -- "1s/.*/# AMR ${new_version}/" NEWS.md -rm *-- +rm *-- || true echo "• First 3 lines of DESCRIPTION:" head -3 DESCRIPTION echo