From e76356aff5a55749a1e53f958804a9f0f9dc186b Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 2 May 2023 07:23:38 +0200 Subject: [PATCH 1/4] Bump catboost to 1.2, disable some constraints --- requirements-freqai.txt | 2 +- tests/freqai/test_freqai_interface.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-freqai.txt b/requirements-freqai.txt index e5bc23d56..9f6390e56 100644 --- a/requirements-freqai.txt +++ b/requirements-freqai.txt @@ -5,7 +5,7 @@ # Required for freqai scikit-learn==1.1.3 joblib==1.2.0 -catboost==1.1.1; platform_machine != 'aarch64' and 'arm' not in platform_machine and python_version < '3.11' +catboost==1.2; 'arm' not in platform_machine lightgbm==3.3.5 xgboost==1.7.5 tensorboard==2.13.0 diff --git a/tests/freqai/test_freqai_interface.py b/tests/freqai/test_freqai_interface.py index e27c8d2c0..95efaac52 100644 --- a/tests/freqai/test_freqai_interface.py +++ b/tests/freqai/test_freqai_interface.py @@ -34,7 +34,7 @@ def is_mac() -> bool: def can_run_model(model: str) -> None: - if (is_arm() or is_py11()) and "Catboost" in model: + if is_arm() and "Catboost" in model: pytest.skip("CatBoost is not supported on ARM.") is_pytorch_model = 'Reinforcement' in model or 'PyTorch' in model From 106db716f8c1cd351d321f2056422c9b6280cf06 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 13 May 2023 16:30:18 +0200 Subject: [PATCH 2/4] Force smaller catboost version on 3.8 macos --- requirements-freqai.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-freqai.txt b/requirements-freqai.txt index 9f6390e56..60eaad131 100644 --- a/requirements-freqai.txt +++ b/requirements-freqai.txt @@ -5,6 +5,7 @@ # Required for freqai scikit-learn==1.1.3 joblib==1.2.0 +catboost==1.1.1; platform_machine == 'darwin' and python_version < '3.9' catboost==1.2; 'arm' not in platform_machine lightgbm==3.3.5 xgboost==1.7.5 From 838fbb76abc26a6e373114cc9718824d936ed062 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 13 May 2023 16:43:45 +0200 Subject: [PATCH 3/4] Improve version constraints --- requirements-freqai.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-freqai.txt b/requirements-freqai.txt index 60eaad131..5dbf70409 100644 --- a/requirements-freqai.txt +++ b/requirements-freqai.txt @@ -6,7 +6,7 @@ scikit-learn==1.1.3 joblib==1.2.0 catboost==1.1.1; platform_machine == 'darwin' and python_version < '3.9' -catboost==1.2; 'arm' not in platform_machine +catboost==1.2; 'arm' not in platform_machine and (platform_machine != 'darwin' or python_version >= '3.9') lightgbm==3.3.5 xgboost==1.7.5 tensorboard==2.13.0 From 784087384c57c8bb379ec86d6262bf82db59291f Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 13 May 2023 17:22:11 +0200 Subject: [PATCH 4/4] darwin excludes must use "sys_platform" --- requirements-freqai.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-freqai.txt b/requirements-freqai.txt index 5dbf70409..ad069ade2 100644 --- a/requirements-freqai.txt +++ b/requirements-freqai.txt @@ -5,8 +5,8 @@ # Required for freqai scikit-learn==1.1.3 joblib==1.2.0 -catboost==1.1.1; platform_machine == 'darwin' and python_version < '3.9' -catboost==1.2; 'arm' not in platform_machine and (platform_machine != 'darwin' or python_version >= '3.9') +catboost==1.1.1; sys_platform == 'darwin' and python_version < '3.9' +catboost==1.2; 'arm' not in platform_machine and (sys_platform != 'darwin' or python_version >= '3.9') lightgbm==3.3.5 xgboost==1.7.5 tensorboard==2.13.0