From 6c177c82c985b6d052c78d2d71ee979c907c4fbd Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 11 Nov 2019 21:29:11 -0800 Subject: [PATCH] grouped conda install calls and fixed a few integer array things --- .ci/test.sh | 13 +++++-------- R-package/R/lgb.Dataset.R | 2 +- R-package/demo/leaf_stability.R | 6 +++--- R-package/man/slice.Rd | 2 +- R-package/tests/testthat/test_dataset.R | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.ci/test.sh b/.ci/test.sh index d53e578705d2..1b156eab7a71 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -53,18 +53,15 @@ fi if [[ $TRAVIS == "true" ]] && [[ $TASK == "lint" ]]; then conda install -q -y -n $CONDA_ENV \ pycodestyle \ - pydocstyle + pydocstyle \ + r-stringi # stringi needs to be installed separate from r-lintr to avoid issues like 'unable to load shared object stringi.so' + conda install -q -y -n $CONDA_ENV \ + -c conda-forge \ + r-lintr>=2.0 pip install --user cpplint echo "Linting Python code" pycodestyle --ignore=E501,W503 --exclude=./compute,./.nuget . || exit -1 pydocstyle --convention=numpy --add-ignore=D105 --match-dir="^(?!^compute|test|example).*" --match="(?!^test_|setup).*\.py" . || exit -1 - # stringi needs to be installed separate from r-lintr - # to avoid issues like 'unable to load shared object stringi.so' - conda install -y -n $CONDA_ENV \ - r-stringi - conda install -y -n $CONDA_ENV \ - -c conda-forge \ - r-lintr>=2.0 echo "Linting R code" Rscript ${BUILD_DIRECTORY}/.ci/lint_r_code.R ${BUILD_DIRECTORY} || exit -1 echo "Linting C++ code" diff --git a/R-package/R/lgb.Dataset.R b/R-package/R/lgb.Dataset.R index 5b66d68021a4..e7ac44bdba18 100644 --- a/R-package/R/lgb.Dataset.R +++ b/R-package/R/lgb.Dataset.R @@ -924,7 +924,7 @@ dimnames.lgb.Dataset <- function(x) { #' train <- agaricus.train #' dtrain <- lgb.Dataset(train$data, label = train$label) #' -#' dsub <- lightgbm::slice(dtrain, 1L:42L) +#' dsub <- lightgbm::slice(dtrain, seq_len(42L)) #' lgb.Dataset.construct(dsub) #' labels <- lightgbm::getinfo(dsub, "label") #' diff --git a/R-package/demo/leaf_stability.R b/R-package/demo/leaf_stability.R index 58fa1c6d85d3..dfa11c252c0e 100644 --- a/R-package/demo/leaf_stability.R +++ b/R-package/demo/leaf_stability.R @@ -53,7 +53,7 @@ new_data$binned <- .bincode( x = new_data$X , breaks = quantile( x = new_data$X - , probs = (1L:9L) / 10.0 + , probs = seq_len(9L) / 10.0 ) , right = TRUE , include.lowest = TRUE @@ -120,7 +120,7 @@ new_data2$binned <- .bincode( x = new_data2$X , breaks = quantile( x = new_data2$X - , probs = (1L:9L) / 10.0 + , probs = seq_len(9L) / 10.0 ) , right = TRUE , include.lowest = TRUE @@ -189,7 +189,7 @@ new_data3$binned <- .bincode( x = new_data3$X , breaks = quantile( x = new_data3$X - , probs = (1L:9L) / 10.0 + , probs = seq_len(9L) / 10.0 ) , right = TRUE , include.lowest = TRUE diff --git a/R-package/man/slice.Rd b/R-package/man/slice.Rd index ff8e9252fa42..53a1d2888b00 100644 --- a/R-package/man/slice.Rd +++ b/R-package/man/slice.Rd @@ -29,7 +29,7 @@ data(agaricus.train, package = "lightgbm") train <- agaricus.train dtrain <- lgb.Dataset(train$data, label = train$label) -dsub <- lightgbm::slice(dtrain, 1L:42L) +dsub <- lightgbm::slice(dtrain, seq_len(42L)) lgb.Dataset.construct(dsub) labels <- lightgbm::getinfo(dsub, "label") diff --git a/R-package/tests/testthat/test_dataset.R b/R-package/tests/testthat/test_dataset.R index 6be05ab7dc16..6a72a993e953 100644 --- a/R-package/tests/testthat/test_dataset.R +++ b/R-package/tests/testthat/test_dataset.R @@ -43,7 +43,7 @@ test_that("lgb.Dataset: slice, dim", { dtest <- lgb.Dataset(test_data, label = test_label) lgb.Dataset.construct(dtest) expect_equal(dim(dtest), dim(test_data)) - dsub1 <- slice(dtest, 1L:42L) + dsub1 <- slice(dtest, seq_len(42L)) lgb.Dataset.construct(dsub1) expect_equal(nrow(dsub1), 42L) expect_equal(ncol(dsub1), ncol(test_data))