Skip to content

Commit

Permalink
Merge pull request #183 from bockthom/travis-fixes
Browse files Browse the repository at this point in the history
Travis fixes

Merged-by: Christian Hechtl <[email protected]>
  • Loading branch information
hechtlC authored Nov 15, 2020
2 parents 5e3baa8 + df367d2 commit bd1ab32
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
##
## Copyright 2017-2018,2020 by Claus Hunsen <[email protected]>
## Copyright 2020 by Thomas Bock <[email protected]>
## All Rights Reserved.

# TravisCI container
Expand All @@ -26,6 +27,7 @@ r:
- 3.4
- 3.5
- 3.6
- 4.0
cache: packages
repos:
CRAN: https://cloud.r-project.org
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down
5 changes: 4 additions & 1 deletion install.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
## Copyright 2015 by Wolfgang Mauerer <[email protected]>
## Copyright 2015-2017 by Claus Hunsen <[email protected]>
## Copyright 2017 by Thomas Bock <[email protected]>
## Copyright 2020 by Thomas Bock <[email protected]>
## Copyright 2019 by Anselm Fehnker <[email protected]>
## All Rights Reserved.
##
Expand Down Expand Up @@ -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)
}

0 comments on commit bd1ab32

Please sign in to comment.