From 2c5cca4be683bc46fe6e345620d25105a74bf559 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 25 Dec 2023 15:58:33 +0100 Subject: [PATCH 1/3] Reinforcement learning does support 3.11 just fine. --- tests/freqai/test_freqai_interface.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/freqai/test_freqai_interface.py b/tests/freqai/test_freqai_interface.py index 9fc722ab1..990f3efff 100644 --- a/tests/freqai/test_freqai_interface.py +++ b/tests/freqai/test_freqai_interface.py @@ -20,8 +20,8 @@ from tests.freqai.conftest import (get_patched_freqai_strategy, is_mac, make_rl_ mock_pytorch_mlp_model_training_parameters) -def is_py11() -> bool: - return sys.version_info >= (3, 11) +def is_py12() -> bool: + return sys.version_info >= (3, 12) def is_arm() -> bool: @@ -523,8 +523,8 @@ def test_get_state_info(mocker, freqai_conf, dp_exists, caplog, tickers): if is_mac(): pytest.skip("Reinforcement learning module not available on intel based Mac OS") - if is_py11(): - pytest.skip("Reinforcement learning currently not available on python 3.11.") + if is_py12(): + pytest.skip("Reinforcement learning currently not available on python 3.12.") freqai_conf.update({"freqaimodel": "ReinforcementLearner"}) freqai_conf.update({"timerange": "20180110-20180130"}) From 16958eaef2b5aa918717e0f599c078b77a6618d5 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 25 Dec 2023 16:04:02 +0100 Subject: [PATCH 2/3] Update sklearn import --- freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py | 2 +- freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py b/freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py index 435c0e646..0db639065 100644 --- a/freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py +++ b/freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py @@ -2,8 +2,8 @@ import numpy as np from joblib import Parallel from sklearn.base import is_classifier from sklearn.multioutput import MultiOutputClassifier, _fit_estimator -from sklearn.utils.fixes import delayed from sklearn.utils.multiclass import check_classification_targets +from sklearn.utils.parallel import delayed from sklearn.utils.validation import has_fit_parameter from freqtrade.exceptions import OperationalException diff --git a/freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py b/freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py index 54136d5e0..ec565037b 100644 --- a/freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py +++ b/freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py @@ -1,6 +1,6 @@ from joblib import Parallel from sklearn.multioutput import MultiOutputRegressor, _fit_estimator -from sklearn.utils.fixes import delayed +from sklearn.utils.parallel import delayed from sklearn.utils.validation import has_fit_parameter From d78a5798e34c14c16bc96e3847bf854d8fbc8b17 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 25 Dec 2023 16:09:42 +0100 Subject: [PATCH 3/3] Fix further warning message due to old Parallel import --- freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py | 3 +-- freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py b/freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py index 0db639065..4646bb9a8 100644 --- a/freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py +++ b/freqtrade/freqai/base_models/FreqaiMultiOutputClassifier.py @@ -1,9 +1,8 @@ import numpy as np -from joblib import Parallel from sklearn.base import is_classifier from sklearn.multioutput import MultiOutputClassifier, _fit_estimator from sklearn.utils.multiclass import check_classification_targets -from sklearn.utils.parallel import delayed +from sklearn.utils.parallel import Parallel, delayed from sklearn.utils.validation import has_fit_parameter from freqtrade.exceptions import OperationalException diff --git a/freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py b/freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py index ec565037b..a6cc4f39b 100644 --- a/freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py +++ b/freqtrade/freqai/base_models/FreqaiMultiOutputRegressor.py @@ -1,6 +1,5 @@ -from joblib import Parallel from sklearn.multioutput import MultiOutputRegressor, _fit_estimator -from sklearn.utils.parallel import delayed +from sklearn.utils.parallel import Parallel, delayed from sklearn.utils.validation import has_fit_parameter