From 81a2a2066eb9a76e8c2e8fdc20c4612ba0e111c5 Mon Sep 17 00:00:00 2001
From: keisuke-umezawa <keisuke.umezawa@gmail.com>
Date: Mon, 8 Jan 2024 14:02:21 +0900
Subject: [PATCH] Change to optuna>=3.1.0

---
 .github/workflows/e2e-dashboard-tests.yml |  7 +-----
 .github/workflows/python-coverage.yml     |  2 +-
 .github/workflows/python-tests.yml        | 27 +++++------------------
 pyproject.toml                            |  2 +-
 requirements.txt                          |  2 +-
 5 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/e2e-dashboard-tests.yml b/.github/workflows/e2e-dashboard-tests.yml
index a0396976..7e5b18c8 100644
--- a/.github/workflows/e2e-dashboard-tests.yml
+++ b/.github/workflows/e2e-dashboard-tests.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        optuna-version: ['optuna==2.10.0', 'git+https://github.com/optuna/optuna.git']
+        optuna-version: ['optuna==3.1.0', 'git+https://github.com/optuna/optuna.git']
     steps:
       - uses: actions/checkout@v2
 
@@ -48,9 +48,4 @@ jobs:
 
       - name: Run e2e tests
         run: |
-          if [ "${{ matrix.optuna-version }}" = "optuna==2.10.0" ]; then
-            ignore_option="--ignore e2e_tests/test_dashboard/test_usecases/test_preferential_optimization.py"
-          else
-            ignore_option=""
-          fi
           pytest e2e_tests/test_dashboard $ignore_option
diff --git a/.github/workflows/python-coverage.yml b/.github/workflows/python-coverage.yml
index c96f506b..cd24264d 100644
--- a/.github/workflows/python-coverage.yml
+++ b/.github/workflows/python-coverage.yml
@@ -28,7 +28,7 @@ jobs:
         python -m pip install --progress-bar off --upgrade pip setuptools
         pip install --progress-bar off .[optional]
         pip install --progress-bar off .[test]
-        pip install --progress-bar off "optuna>=3.0.0"
+        pip install --progress-bar off "optuna>=3.1.0"
         pip install --progress-bar off .
         echo 'import coverage; coverage.process_startup()' > sitecustomize.py
     - name: Tests
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index 60dd6ea0..da6f4c84 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -21,7 +21,7 @@ jobs:
         # python_tests requires optuna>=3.0.0 since it imports FloatDistribution
         run: |
           python -m pip install --progress-bar off --upgrade pip setuptools
-          pip install --progress-bar off "optuna>=3.0.0"
+          pip install --progress-bar off "optuna>=3.1.0"
           pip install --progress-bar off .
           pip install --progress-bar off flake8 black isort mypy mypy-boto3-s3
       - run: flake8 . --show-source
@@ -34,7 +34,8 @@ jobs:
       matrix:
         # Add Python '3.11' after released Optuna v3.1
         # since Optuna v3.0.4 depends on scipy<1.9.0 and >=1.7.0
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        optuna-version: ['optuna==3.1.0', 'git+https://github.com/optuna/optuna.git']
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python${{ matrix.python-version }}
@@ -42,29 +43,13 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
-      - name: Install dependencies
-        # python_tests requires optuna>=3.0.0 since it imports FloatDistribution
+      - name: Setup Optuna ${{ matrix.optuna-version }}
         run: |
           python -m pip install --progress-bar off --upgrade pip setuptools
-          pip install --progress-bar off .[optional]
-          pip install --progress-bar off .[test]
-          pip install --progress-bar off "optuna>=3.0.0"
-          pip install --progress-bar off .
-      - run: pytest python_tests
-  test-with-optuna-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-          architecture: x64
+          python -m pip install --progress-bar off --upgrade ${{ matrix.optuna-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --progress-bar off --upgrade pip setuptools
           pip install --progress-bar off .[optional]
           pip install --progress-bar off .[test]
           pip install --progress-bar off .
-          python -m pip install --progress-bar off --upgrade git+https://github.com/optuna/optuna.git
-      - run: pytest python_tests
+      - run: pytest python_tests
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 1f125735..d963bfc8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 ]
 dependencies = [
     "bottle",
-    "optuna>=2.4.0",
+    "optuna>=3.1.0",
     "packaging",
     "scikit-learn",
 ]
diff --git a/requirements.txt b/requirements.txt
index 59a9c586..c2ad9d23 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # project dependency
-optuna>=2.4
+optuna>=3.1
 bottle
 scikit-learn
 streamlit