Skip to content

Commit 5d40c2c

Browse files
authored
Merge branch 'master' into docs/code-coverage
2 parents e5819c3 + 05881f9 commit 5d40c2c

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

.ci/lint-cpp.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,6 @@ cpplint \
99
|| exit 1
1010
echo "done running cpplint"
1111

12-
echo "running cmakelint"
13-
find \
14-
. \
15-
-type f \
16-
\( -name CMakeLists.txt -o -path "./cmake/*.cmake" \) \
17-
-not -path './external_libs/*' \
18-
-exec cmakelint \
19-
--linelength=120 \
20-
--filter=-convention/filename,-package/stdargs,-readability/wonkycase \
21-
{} \+ \
22-
|| exit 1
23-
echo "done running cmakelint"
24-
2512
echo "checking that all OpenMP pragmas specify num_threads()"
2613
get_omp_pragmas_without_num_threads() {
2714
grep \

.ci/test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ if [[ $TASK == "lint" ]]; then
105105
conda create -q -y -n "${CONDA_ENV}" \
106106
"${CONDA_PYTHON_REQUIREMENT}" \
107107
'biome>=1.9.3' \
108-
'cmakelint>=1.4.3' \
109108
'cpplint>=1.6.0' \
110109
'matplotlib-base>=3.9.1' \
111110
'mypy>=1.11.1' \

.pre-commit-config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ repos:
1717
hooks:
1818
- id: end-of-file-fixer
1919
- id: trailing-whitespace
20+
- repo: https://github.com/cmake-lint/cmake-lint
21+
rev: '1.4.3'
22+
hooks:
23+
- id: cmakelint
24+
args: ["--linelength=120", "--filter=-convention/filename,-package/stdargs,-readability/wonkycase"]
2025
- repo: https://github.com/adrienverge/yamllint
2126
rev: v1.37.1
2227
hooks:

tests/python_package_test/test_dask.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,13 @@ def test_regressor_custom_objective(output, cluster):
668668
assert_eq(p2, y, **assert_precision)
669669

670670

671+
@pytest.mark.xfail(
672+
platform.lower().startswith("darwin"),
673+
reason=(
674+
"learning-to-rank Dask tests are unreliable on macOS. "
675+
"See https://github.com/microsoft/LightGBM/issues/4074#issuecomment-3124996317"
676+
),
677+
)
671678
@pytest.mark.parametrize("output", ["array", "dataframe", "dataframe-with-categorical"])
672679
@pytest.mark.parametrize("group", [None, group_sizes])
673680
@pytest.mark.parametrize("boosting_type", boosting_types)

0 commit comments

Comments
 (0)