Merge remote-tracking branch 'origin' into remove-catalyst

.github/workflows/tests-integration.yml

@@ -77,10 +77,8 @@ jobs:
         if [ ${{ matrix.python-version }} == 3.11 ]; then
           pytest tests -m "integration" \
             --ignore tests/integration_tests/test_botorch.py \
-            --ignore tests/integration_tests/test_catboost.py \
             --ignore tests/integration_tests/test_fastaiv2.py \
             --ignore tests/integration_tests/test_lightgbm.py \
-            --ignore tests/integration_tests/test_mlflow.py \
             --ignore tests/integration_tests/test_mxnet.py \
             --ignore tests/integration_tests/test_pytorch_distributed.py \
             --ignore tests/integration_tests/test_pytorch_ignite.py \
@@ -104,10 +102,8 @@ jobs:
         if [ ${{ matrix.python-version }} == 3.11 ]; then
           pytest tests -m "integration and not slow" \
             --ignore tests/integration_tests/test_botorch.py \
-            --ignore tests/integration_tests/test_catboost.py \
             --ignore tests/integration_tests/test_fastaiv2.py \
             --ignore tests/integration_tests/test_lightgbm.py \
-            --ignore tests/integration_tests/test_mlflow.py \
             --ignore tests/integration_tests/test_mxnet.py \
             --ignore tests/integration_tests/test_pytorch_distributed.py \
             --ignore tests/integration_tests/test_pytorch_ignite.py \

.readthedocs.yml

@@ -4,6 +4,12 @@
 # Required
 version: 2
 
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/source/conf.py
@@ -15,7 +21,6 @@ formats: all
 python:
   # `sphinx` requires either Python >= 3.8 or `typed-ast` to reflect type comments 
   # in the documentation. See: https://github.com/sphinx-doc/sphinx/pull/6984
-  version: 3.8
   install:
     - method: pip
       path: .

optuna/storages/_rdb/storage.py

@@ -459,7 +459,7 @@ def _create_new_trial(
                     if n_retries > 2:
                         raise
 
-            n_retries += 1
+                n_retries += 1
 
             if template_trial:
                 frozen = copy.deepcopy(template_trial)

optuna/visualization/_timeline.py

@@ -140,4 +140,5 @@ def _get_timeline_plot(info: _TimelineInfo) -> "go.Figure":
             yaxis={"title": "Trial"},
         )
     )
+    fig.update_layout(showlegend=True)  # Draw a legend even if all TrialStates are the same.
     return fig

pyproject.toml

@@ -87,12 +87,13 @@ document = [
 ]
 integration = [
     "botorch>=0.4.0; python_version<'3.11'",
-    "catboost>=0.26; python_version<'3.11'",
+    "catboost>=0.26; sys_platform!='darwin'",
+    "catboost>=0.26,<1.2; sys_platform=='darwin'",
     "cma",
     "distributed",
     "fastai; python_version<'3.11'",
     "lightgbm; python_version<'3.11'",
-    "mlflow; python_version<'3.11'",
+    "mlflow",
     "mxnet; python_version<'3.11'",
     "pandas",
     "pytorch-ignite; python_version<'3.11'",