From effaa5ecc12e543f59fbce8412705ff3d20e1efd Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 14 May 2020 22:38:52 -0500 Subject: [PATCH 1/6] [R-package] [docs] fix warnings in pkgdown sitte building --- .gitignore | 1 + R-package/R/lightgbm.R | 1 + R-package/man/lgb_shared_params.Rd | 1 + R-package/pkgdown/_pkgdown.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 5a06037ed68f..c5bcfa0337fa 100644 --- a/.gitignore +++ b/.gitignore @@ -397,6 +397,7 @@ python-package/compile/ python-package/lightgbm/VERSION.txt # R build artefacts +R-package/docs R-package/src/CMakeLists.txt R-package/src/lib_lightgbm.so.dSYM/ R-package/src/src/ diff --git a/R-package/R/lightgbm.R b/R-package/R/lightgbm.R index 12640ecfb0af..84e2503db2f6 100644 --- a/R-package/R/lightgbm.R +++ b/R-package/R/lightgbm.R @@ -15,6 +15,7 @@ #' @param nrounds number of training rounds #' @param params List of parameters #' @param verbose verbosity for output, if <= 0, also will disable the print of evaluation during training +#' @keywords internal NULL #' @name lightgbm diff --git a/R-package/man/lgb_shared_params.Rd b/R-package/man/lgb_shared_params.Rd index a7143179495e..501997fd2e2d 100644 --- a/R-package/man/lgb_shared_params.Rd +++ b/R-package/man/lgb_shared_params.Rd @@ -29,3 +29,4 @@ If early stopping occurs, the model will have 'best_iter' field.} \description{ Parameter docs shared by \code{lgb.train}, \code{lgb.cv}, and \code{lightgbm} } +\keyword{internal} diff --git a/R-package/pkgdown/_pkgdown.yml b/R-package/pkgdown/_pkgdown.yml index dce99357840e..91f97a9e84d3 100644 --- a/R-package/pkgdown/_pkgdown.yml +++ b/R-package/pkgdown/_pkgdown.yml @@ -72,6 +72,7 @@ reference: - '`lgb.prepare2`' - '`lgb.prepare_rules`' - '`lgb.prepare_rules2`' + - '`lightgbm`' - '`lgb.train`' - '`lgb.cv`' - title: Saving / Loading Models From 074a6ff84da88016535ec92ac23259663859868a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 15 May 2020 16:49:52 -0500 Subject: [PATCH 2/6] trying to get better Travis logs --- .ci/test_r_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index d110260f36e2..da3850725d0e 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -71,7 +71,7 @@ fi Rscript --vanilla -e "install.packages(${packages}, repos = '${CRAN_MIRROR}', lib = '${R_LIB_PATH}', dependencies = c('Depends', 'Imports', 'LinkingTo'))" || exit -1 cd ${BUILD_DIRECTORY} -Rscript build_r.R --skip-install || exit -1 +Rscript build_r.R || exit -1 PKG_TARBALL="lightgbm_${LGB_VER}.tar.gz" LOG_FILE_NAME="lightgbm.Rcheck/00check.log" From 94cc3df13af4751f7a4ff16aae52c3e04ed64745 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 16 May 2020 00:54:29 -0500 Subject: [PATCH 3/6] undo testing fix --- .ci/test_r_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index da3850725d0e..d110260f36e2 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -71,7 +71,7 @@ fi Rscript --vanilla -e "install.packages(${packages}, repos = '${CRAN_MIRROR}', lib = '${R_LIB_PATH}', dependencies = c('Depends', 'Imports', 'LinkingTo'))" || exit -1 cd ${BUILD_DIRECTORY} -Rscript build_r.R || exit -1 +Rscript build_r.R --skip-install || exit -1 PKG_TARBALL="lightgbm_${LGB_VER}.tar.gz" LOG_FILE_NAME="lightgbm.Rcheck/00check.log" From dc6b58297f4419fd10cf694e26feb90181d0403e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 15 May 2020 16:49:52 -0500 Subject: [PATCH 4/6] trying to get better Travis logs --- .ci/test_r_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index d110260f36e2..da3850725d0e 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -71,7 +71,7 @@ fi Rscript --vanilla -e "install.packages(${packages}, repos = '${CRAN_MIRROR}', lib = '${R_LIB_PATH}', dependencies = c('Depends', 'Imports', 'LinkingTo'))" || exit -1 cd ${BUILD_DIRECTORY} -Rscript build_r.R --skip-install || exit -1 +Rscript build_r.R || exit -1 PKG_TARBALL="lightgbm_${LGB_VER}.tar.gz" LOG_FILE_NAME="lightgbm.Rcheck/00check.log" From 53044793dab8365d051933aaec8c09791ea63129 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 16 May 2020 00:54:29 -0500 Subject: [PATCH 5/6] undo testing fix --- .ci/test_r_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index da3850725d0e..d110260f36e2 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -71,7 +71,7 @@ fi Rscript --vanilla -e "install.packages(${packages}, repos = '${CRAN_MIRROR}', lib = '${R_LIB_PATH}', dependencies = c('Depends', 'Imports', 'LinkingTo'))" || exit -1 cd ${BUILD_DIRECTORY} -Rscript build_r.R || exit -1 +Rscript build_r.R --skip-install || exit -1 PKG_TARBALL="lightgbm_${LGB_VER}.tar.gz" LOG_FILE_NAME="lightgbm.Rcheck/00check.log" From 4a44bb91c63269e88362f0ae744b6ed70ee1f5b7 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 16 May 2020 14:29:23 -0500 Subject: [PATCH 6/6] empty commit