From 971a81e15d5191a9b72a7e681bde3258688f7ffe Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Mar 2024 18:15:47 +0100 Subject: [PATCH 1/3] Bump catboost to 1.2.3, remove 3.12 restriction --- requirements-freqai.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-freqai.txt b/requirements-freqai.txt index 0532562da..31366efa7 100644 --- a/requirements-freqai.txt +++ b/requirements-freqai.txt @@ -5,7 +5,7 @@ # Required for freqai scikit-learn==1.4.1.post1 joblib==1.3.2 -catboost==1.2.2; 'arm' not in platform_machine and python_version < '3.12' +catboost==1.2.3; 'arm' not in platform_machine lightgbm==4.3.0 xgboost==2.0.3 tensorboard==2.16.2 From c5f2a69d9c9836b2cf905a70fbccd5dc08c69eee Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Mar 2024 18:16:22 +0100 Subject: [PATCH 2/3] Allow running catboost tests on 3.12 --- tests/freqai/test_freqai_interface.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/freqai/test_freqai_interface.py b/tests/freqai/test_freqai_interface.py index 58648d97f..cceda8e8e 100644 --- a/tests/freqai/test_freqai_interface.py +++ b/tests/freqai/test_freqai_interface.py @@ -27,9 +27,6 @@ def is_arm() -> bool: def can_run_model(model: str) -> None: is_pytorch_model = 'Reinforcement' in model or 'PyTorch' in model - if is_py12() and ("Catboost" in model or 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.") From cb1f49e81ce142f830f5b0dd0f359a0171fea4b0 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Mar 2024 19:25:17 +0100 Subject: [PATCH 3/3] Don't run torch models on 3.12 yet --- tests/freqai/test_freqai_interface.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/freqai/test_freqai_interface.py b/tests/freqai/test_freqai_interface.py index cceda8e8e..e3c286fcd 100644 --- a/tests/freqai/test_freqai_interface.py +++ b/tests/freqai/test_freqai_interface.py @@ -27,6 +27,9 @@ def is_arm() -> bool: 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.")