From e6696337e4f068eb841c3f319deffd36d292dc19 Mon Sep 17 00:00:00 2001 From: Tong He Date: Mon, 18 Jun 2018 12:53:52 -0700 Subject: [PATCH] Fix CRAN check for lintr (#3372) * fix CRAN check * Update submodules dmlc-core and rabit * Add kintr to rmingw test --- R-package/DESCRIPTION | 5 +++-- appveyor.yml | 2 +- dmlc-core | 2 +- rabit | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION index 918d556c8..4a2f01bbc 100644 --- a/R-package/DESCRIPTION +++ b/R-package/DESCRIPTION @@ -1,8 +1,8 @@ Package: xgboost Type: Package Title: Extreme Gradient Boosting -Version: 0.71.1 -Date: 2018-05-11 +Version: 0.71.2 +Date: 2018-06-08 Authors@R: c( person("Tianqi", "Chen", role = c("aut"), email = "tianqi.tchen@gmail.com"), @@ -51,6 +51,7 @@ Suggests: Ckmeans.1d.dp (>= 3.3.1), vcd (>= 1.3), testthat, + lintr, igraph (>= 1.0.1) Depends: R (>= 3.3.0) diff --git a/appveyor.yml b/appveyor.yml index 5f7e54642..3f3405e64 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,7 +52,7 @@ install: Invoke-WebRequest http://raw.github.com/krlmlr/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "$Env:TEMP\appveyor-tool.ps1" Import-Module "$Env:TEMP\appveyor-tool.ps1" Bootstrap - $DEPS = "c('data.table','magrittr','stringi','ggplot2','DiagrammeR','Ckmeans.1d.dp','vcd','testthat','igraph','knitr','rmarkdown')" + $DEPS = "c('data.table','magrittr','stringi','ggplot2','DiagrammeR','Ckmeans.1d.dp','vcd','testthat','lintr','igraph','knitr','rmarkdown')" cmd.exe /c "R.exe -q -e ""install.packages($DEPS, repos='$CRAN', type='both')"" 2>&1" } diff --git a/dmlc-core b/dmlc-core index dadcd97fd..1c422a997 160000 --- a/dmlc-core +++ b/dmlc-core @@ -1 +1 @@ -Subproject commit dadcd97fdceb5f395e963b2a637f6ed377f59fc4 +Subproject commit 1c422a99786ba677db953a565807973154f6d374 diff --git a/rabit b/rabit index fc5072b10..87143deb4 160000 --- a/rabit +++ b/rabit @@ -1 +1 @@ -Subproject commit fc5072b1000294e9c10487f5f535b3aa4e2c50be +Subproject commit 87143deb4c0a34302f727ba35497e3380b2cced8