From 81a2a2066eb9a76e8c2e8fdc20c4612ba0e111c5 Mon Sep 17 00:00:00 2001 From: keisuke-umezawa Date: Mon, 8 Jan 2024 14:02:21 +0900 Subject: [PATCH 1/5] 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 From 8a1fe7defa382b3b73303ce2b1f750c94176d84f Mon Sep 17 00:00:00 2001 From: keisuke-umezawa Date: Wed, 10 Jan 2024 21:08:31 +0900 Subject: [PATCH 2/5] Fix optuna version --- .github/workflows/e2e-dashboard-tests.yml | 2 +- .github/workflows/python-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-dashboard-tests.yml b/.github/workflows/e2e-dashboard-tests.yml index 7e5b18c8..051e6300 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==3.1.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 diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index da6f4c84..b1a7dbc8 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -35,7 +35,7 @@ jobs: # 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', '3.11'] - optuna-version: ['optuna==3.1.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 - name: Setup Python${{ matrix.python-version }} From db6dcab81ba011f6b9fe683337d669ea1cf049d3 Mon Sep 17 00:00:00 2001 From: keisuke-umezawa Date: Mon, 22 Jan 2024 22:07:05 +0900 Subject: [PATCH 3/5] Follow review comments Skip artifact tests Fix error Fix error Fix error Fix error Fix error --- .github/workflows/e2e-dashboard-tests.yml | 4 +- .github/workflows/python-tests.yml | 47 ++++++++++++++++++++--- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e-dashboard-tests.yml b/.github/workflows/e2e-dashboard-tests.yml index 051e6300..e12b9e3b 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>=3.1.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,4 +48,4 @@ jobs: - name: Run e2e tests run: | - pytest e2e_tests/test_dashboard $ignore_option + pytest e2e_tests/test_dashboard diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index b1a7dbc8..a5f69159 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -18,7 +18,6 @@ jobs: python-version: '3.10' architecture: x64 - name: Install dependencies - # 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.1.0" @@ -32,10 +31,8 @@ jobs: runs-on: ubuntu-latest strategy: 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', '3.11'] - optuna-version: ['optuna>=3.1.0', 'git+https://github.com/optuna/optuna.git'] + optuna-version: ['optuna>=3.1.0'] steps: - uses: actions/checkout@v2 - name: Setup Python${{ matrix.python-version }} @@ -52,4 +49,44 @@ jobs: pip install --progress-bar off .[optional] pip install --progress-bar off .[test] pip install --progress-bar off . - - run: pytest python_tests \ No newline at end of file + - name: Run python unit tests + 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 + - 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 + - name: Run python unit tests + run: | + pytest python_tests + test-with-optuna-oldest: # Ideally, optuna==3.1.0, but lots of tests are broken. + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: '3.11' + architecture: x64 + - 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 optuna==3.4.0 + - name: Run python unit tests + run: | + pytest python_tests From 1a10f1bc3eb3ae27cf8cb810344fb1c9a88d76d6 Mon Sep 17 00:00:00 2001 From: keisuke-umezawa Date: Tue, 23 Jan 2024 09:25:04 +0900 Subject: [PATCH 4/5] Stop running test with optuna 3.4.0 --- .github/workflows/python-tests.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index a5f69159..2973ab06 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -71,22 +71,3 @@ jobs: - name: Run python unit tests run: | pytest python_tests - test-with-optuna-oldest: # Ideally, optuna==3.1.0, but lots of tests are broken. - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: '3.11' - architecture: x64 - - 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 optuna==3.4.0 - - name: Run python unit tests - run: | - pytest python_tests From 736d2ee1fe326fe7e3e4e813ee48fcd70c72dd7a Mon Sep 17 00:00:00 2001 From: keisuke umezawa Date: Tue, 23 Jan 2024 09:31:02 +0900 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: c-bata --- .github/workflows/python-coverage.yml | 1 - .github/workflows/python-tests.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/python-coverage.yml b/.github/workflows/python-coverage.yml index cd24264d..bc5e4fb5 100644 --- a/.github/workflows/python-coverage.yml +++ b/.github/workflows/python-coverage.yml @@ -28,7 +28,6 @@ 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.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 2973ab06..8f0ff58c 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -20,7 +20,6 @@ jobs: - name: Install dependencies run: | python -m pip install --progress-bar off --upgrade pip setuptools - 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