fix conflicts

microsoft · Oct 6, 2024 · 330df3f · 330df3f
2 parents 4233d70 + f2cb2fe
commit 330df3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python-package/lightgbm/compat.py b/python-package/lightgbm/compat.py
@@ -34,7 +34,7 @@ def _check_sample_weight(sample_weight: Any, X: Any, dtype: Any = None) -> Any:
         from sklearn.utils.validation import validate_data
     except ImportError:
         # validate_data() was added in scikit-learn 1.6, this function roughly imitates it for older versions.
-        # It can be removed when lightbm's minimum scikit-learn version is at least 1.6.
+        # It can be removed when lightgbm's minimum scikit-learn version is at least 1.6.
         def validate_data(
             _estimator,
             X,

diff --git a/tests/python_package_test/test_sklearn.py b/tests/python_package_test/test_sklearn.py
@@ -1442,7 +1442,7 @@ def test_sklearn_integration(estimator, check):
 def test_sklearn_tags_should_correctly_reflect_lightgbm_specific_values(estimator_class):
     est = estimator_class()
     more_tags = est._more_tags()
-    err_msg = "List of supported X_types has changed. Update LGBMModel.__sklearn__tags() to match."
+    err_msg = "List of supported X_types has changed. Update LGBMModel.__sklearn_tags__() to match."
     assert more_tags["X_types"] == ["2darray", "sparse", "1dlabels"], err_msg
     # the try-except part of this should be removed once lightgbm's
     # minimum supported scikit-learn version is at least 1.6