From 08cff9890fd1abe7cb624e3559c091fe91b52be1 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 10 Mar 2024 13:11:56 +0100 Subject: [PATCH] Remove conditional checks for python 3.12 --- tests/freqai/conftest.py | 2 +- tests/freqai/test_freqai_interface.py | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/freqai/conftest.py b/tests/freqai/conftest.py index 55f0296a3..1a479d903 100644 --- a/tests/freqai/conftest.py +++ b/tests/freqai/conftest.py @@ -41,7 +41,7 @@ def patch_torch_initlogs(mocker) -> None: module_name = 'torch' mocked_module = types.ModuleType(module_name) sys.modules[module_name] = mocked_module - elif not is_py12(): + else: mocker.patch("torch._logging._init_logs") diff --git a/tests/freqai/test_freqai_interface.py b/tests/freqai/test_freqai_interface.py index 2e42f000e..9e0955bd2 100644 --- a/tests/freqai/test_freqai_interface.py +++ b/tests/freqai/test_freqai_interface.py @@ -14,16 +14,13 @@ from freqtrade.optimize.backtesting import Backtesting from freqtrade.persistence import Trade from freqtrade.plugins.pairlistmanager import PairListManager from tests.conftest import EXMS, create_mock_trades, get_patched_exchange, log_has_re -from tests.freqai.conftest import (get_patched_freqai_strategy, is_arm, is_mac, is_py12, - make_rl_config, mock_pytorch_mlp_model_training_parameters) +from tests.freqai.conftest import (get_patched_freqai_strategy, is_arm, is_mac, make_rl_config, + mock_pytorch_mlp_model_training_parameters) def can_run_model(model: str) -> None: is_pytorch_model = 'Reinforcement' in model or 'PyTorch' in model - if is_py12() and is_pytorch_model: - pytest.skip("Model not supported on python 3.12 yet.") - if is_arm() and "Catboost" in model: pytest.skip("CatBoost is not supported on ARM.") @@ -521,8 +518,6 @@ 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_py12(): - pytest.skip("Reinforcement learning currently not available on python 3.12.") freqai_conf.update({"freqaimodel": "ReinforcementLearner"}) freqai_conf.update({"timerange": "20180110-20180130"})