Merge branch 'master' into ci/r-4.3

microsoft · Sep 19, 2023 · 0df0d7c · 0df0d7c
2 parents ff7f6ca + 646dfed
commit 0df0d7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.ci/test.sh b/.ci/test.sh
@@ -124,7 +124,7 @@ fi
 # ref: https://github.com/microsoft/LightGBM/issues/6030
 CONSTRAINED_DEPENDENCIES="'dask-core>=2023.5.0' 'distributed>=2023.5.0' 'pandas>=2.0'"
 if [[ $PYTHON_VERSION == "3.7" ]]; then
-    CONSTRAINED_DEPENDENCIES="'dask-core' 'distributed 'pandas<2.0'"
+    CONSTRAINED_DEPENDENCIES="'dask-core' 'distributed' 'pandas<2.0'"
 fi
 
 # including python=version[build=*cpython] to ensure that conda doesn't fall back to pypy

diff --git a/python-package/lightgbm/basic.py b/python-package/lightgbm/basic.py
@@ -1593,7 +1593,7 @@ def __init__(
         self.used_indices: Optional[List[int]] = None
         self._need_slice = True
         self._predictor: Optional[_InnerPredictor] = None
-        self.pandas_categorical = None
+        self.pandas_categorical: Optional[List[List]] = None
         self._params_back_up = None
         self.version = 0
         self._start_row = 0  # Used when pushing rows one by one.