From 48317c2307906ff50635b2830b40d1c5f379963c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:13:58 +0000 Subject: [PATCH 1/4] Bump scikit-learn from 1.1.3 to 1.3.2 Bumps [scikit-learn](https://github.com/scikit-learn/scikit-learn) from 1.1.3 to 1.3.2. - [Release notes](https://github.com/scikit-learn/scikit-learn/releases) - [Commits](https://github.com/scikit-learn/scikit-learn/compare/1.1.3...1.3.2) --- updated-dependencies: - dependency-name: scikit-learn dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements-freqai.txt | 2 +- requirements-hyperopt.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-freqai.txt b/requirements-freqai.txt index d990b0714..7d817c2d9 100644 --- a/requirements-freqai.txt +++ b/requirements-freqai.txt @@ -3,7 +3,7 @@ -r requirements-plot.txt # Required for freqai -scikit-learn==1.1.3 +scikit-learn==1.3.2 joblib==1.3.2 catboost==1.2.2; 'arm' not in platform_machine lightgbm==4.1.0 diff --git a/requirements-hyperopt.txt b/requirements-hyperopt.txt index b4bca9751..639d48da9 100644 --- a/requirements-hyperopt.txt +++ b/requirements-hyperopt.txt @@ -3,6 +3,6 @@ # Required for hyperopt scipy==1.11.4 -scikit-learn==1.1.3 +scikit-learn==1.3.2 scikit-optimize==0.9.0 filelock==3.13.1 From 3bdfa85237b48d1c6d60b1f902873b17c8b59e96 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Dec 2023 12:12:30 +0100 Subject: [PATCH 2/4] Update scikit-optimize to ft-scikit-optimize Compatibility fork of scikit-optimize. --- requirements-hyperopt.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-hyperopt.txt b/requirements-hyperopt.txt index 639d48da9..d7f440c0a 100644 --- a/requirements-hyperopt.txt +++ b/requirements-hyperopt.txt @@ -4,5 +4,5 @@ # Required for hyperopt scipy==1.11.4 scikit-learn==1.3.2 -scikit-optimize==0.9.0 +ft-scikit-optimize==0.9.2 filelock==3.13.1 diff --git a/setup.py b/setup.py index 2e92d0839..6bebf1553 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ plot = ['plotly>=4.0'] hyperopt = [ 'scipy', 'scikit-learn<=1.1.3', - 'scikit-optimize>=0.7.0', + 'ft-scikit-optimize>=0.9.2', 'filelock', ] From d428d483937273401b8e61c42cc3888081258d2a Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Dec 2023 12:12:52 +0100 Subject: [PATCH 3/4] Ease install dependencies for scikit-learn --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6bebf1553..e8215a3e2 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup plot = ['plotly>=4.0'] hyperopt = [ 'scipy', - 'scikit-learn<=1.1.3', + 'scikit-learn', 'ft-scikit-optimize>=0.9.2', 'filelock', ] From dd08c134b4e5d8ffbd444511c5cebbe9e301b2a7 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Dec 2023 13:40:00 +0100 Subject: [PATCH 4/4] Remove macos 13 ci again --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a1eca7a7..1eb291a92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ "macos-latest", "macos-13" ] + os: [ "macos-latest" ] python-version: ["3.9", "3.10", "3.11"] steps: