diff --git a/NEWS.md b/NEWS.md index 7665934f..53a98d26 100755 --- a/NEWS.md +++ b/NEWS.md @@ -63,8 +63,9 @@ * Other small fixes #### Other -* Unit testing for all Linux and macOS releases of R 3.1 and higher: https://travis-ci.org/msberends/AMR -* Added units tests for Windows with AppVeyor +* Added integration tests (check if everything works as expected) for all releases of R 3.1 and higher + * Linux and macOS: https://travis-ci.org/msberends/AMR + * Windows: https://ci.appveyor.com/project/msberends/amr * Added thesis advisors to DESCRIPTION file # 0.2.0 (latest stable version) diff --git a/README.md b/README.md index cb452ebe..fe16dd61 100755 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ With the `MDRO` function (abbreviation of Multi Drug Resistant Organisms), you c This package [is published on CRAN](http://cran.r-project.org/package=AMR), the official R network. ### Install from CRAN -[![CRAN_Badge](https://img.shields.io/cran/v/AMR.svg?label=CRAN&colorB=3679BC)](http://cran.r-project.org/package=AMR) [![CRAN_Downloads](https://cranlogs.r-pkg.org/badges/grand-total/AMR)](http://cran.r-project.org/package=AMR) +[![CRAN_Badge](https://www.r-pkg.org/badges/version/dplyr)](http://cran.r-project.org/package=AMR) [![CRAN_Downloads](https://cranlogs.r-pkg.org/badges/grand-total/AMR)](http://cran.r-project.org/package=AMR) (Note: Downloads measured only by [cran.rstudio.com](https://cran.rstudio.com/package=AMR), this excludes e.g. the official [cran.r-project.org](https://cran.r-project.org/package=AMR)) diff --git a/appveyor.yml b/appveyor.yml index c6c14384..9e7b0275 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,6 +15,35 @@ cache: # Adapt as necessary starting from here +environment: + global: + R_ARCH: x64 + GCC_PATH: mingw_64 + WARNINGS_ARE_ERRORS: 1 + + matrix: + - R_VERSION: 3.1 + WARNINGS_ARE_ERRORS: 0 + + - R_VERSION: 3.2 + + - R_VERSION: 3.3 + + - R_VERSION: 3.4 + + - R_VERSION: release + + - R_VERSION: devel + +notifications: +- provider: Email + to: m.s.berends@umcg.nl + subject: 'AppVeyor: status changed' + message: The status of https://ci.appveyor.com/project/msberends/amr has changed. + on_build_success: false + on_build_failure: false + on_build_status_changed: true + build_script: - travis-tool.sh install_deps diff --git a/tests/testthat/test-atc.R b/tests/testthat/test-atc.R index 6c1240e9..061247ed 100755 --- a/tests/testthat/test-atc.R +++ b/tests/testthat/test-atc.R @@ -1,6 +1,8 @@ context("atc.R") test_that("atc_property works", { + skip_if(Sys.info()['sysname'] == "Windows") # security error on AppVeyor + if (!is.null(curl::nslookup("www.whocc.no", error = FALSE))) { expect_equal(tolower(atc_property("J01CA04", property = "Name")), "amoxicillin") expect_equal(atc_property("J01CA04", property = "unit"), "g")