diff --git a/.travis.yml b/.travis.yml index 2933e44c..a716c811 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ## ## Copyright 2017-2018,2020 by Claus Hunsen +## Copyright 2020 by Thomas Bock ## All Rights Reserved. # TravisCI container @@ -26,6 +27,7 @@ r: - 3.4 - 3.5 - 3.6 + - 4.0 cache: packages repos: CRAN: https://cloud.r-project.org diff --git a/NEWS.md b/NEWS.md index 4478c76d..b1bfc74b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,6 +9,8 @@ ### Changed/Improved - Adjust the function `get.authors.by.data.source`: Rename its single parameter to `data.sources` and change the function so that it can extract the authors for multiple data sources at once. The default value of the parameter is a vector containing all the available data sources (commits, mails, issues) (051a5f0287022f97e2367ed0e9591b9df9dbdb3d) +- Adjust recommended R version to 3.6.3 in README (92be262514277acb774ab2885c1c0d1c10f03373) +- Add R version 4.0 to test suite and adjust package installation in `install.R` to improve compatibility with Travis CI (40aa0d80e2a94434a8be75925dbefbde6d3518b2, 1ba036758a63767e2fcef525c98f5a4fd6938c39, #161) ## 3.6 diff --git a/README.md b/README.md index 13d7cf36..e8cbcbb1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you wonder: The name `coronet` derives as an acronym from the words "configur - [Integration](#integration) * [Requirements](#requirements) - * [R](#r-331) + * [R](#r) * [packrat (recommended)](#packrat) * [Folder structure of the input data](#folder-structure-of-the-input-data) * [Needed R packages](#needed-r-packages) @@ -53,9 +53,11 @@ If you wonder: The name `coronet` derives as an acronym from the words "configur While using the package, we require the following infrastructure. -#### [`R`](https://www.r-project.org/) `3.3.1` +#### [`R`](https://www.r-project.org/) -Later `R` versions should work (and are tested using our TravisCI script), but, for reliability reasons and `packrat` compatibility, only version `3.3.1` is supported. +Minimum requirement is `R` version `3.3.1`. Hence, later `R` versions also work. + +We currently recommend version `3.6.3` for reliability reasons and `packrat` compatibility, but also later versions (`>=4`) should work (and are tested using our TravisCI script). #### [`packrat`](http://rstudio.github.io/packrat/) (recommended) diff --git a/install.R b/install.R index 3b4c4758..132879d9 100644 --- a/install.R +++ b/install.R @@ -16,6 +16,7 @@ ## Copyright 2015 by Wolfgang Mauerer ## Copyright 2015-2017 by Claus Hunsen ## Copyright 2017 by Thomas Bock +## Copyright 2020 by Thomas Bock ## Copyright 2019 by Anselm Fehnker ## All Rights Reserved. ## @@ -55,5 +56,7 @@ filter.installed.packages = function(packageList) { p = filter.installed.packages(packages) if (length(p) > 0) { print(sprintf("Installing package '%s'.", p)) - install.packages(p, dependencies = TRUE, verbose = FALSE, quiet = FALSE) + + ## set dependencies to 'NA' to install only necessary dependencies (i.e., "Depends", "Imports", "LinkingTo") + install.packages(p, dependencies = NA, verbose = TRUE, quiet = TRUE) }