From d6a6b952eb8164046e0dacd66c75cb73118424a6 Mon Sep 17 00:00:00 2001
From: PrimozGodec <p.godec9@gmail.com>
Date: Tue, 12 Sep 2023 11:15:03 +0200
Subject: [PATCH] Allways install xgboost and catboost

---
 .github/workflows/test.yml   | 4 ----
 conda-recipe/meta.yaml       | 3 +++
 requirements-core.txt        | 2 ++
 requirements-opt.txt         | 2 --
 requirements-readthedocs.txt | 2 --
 tox.ini                      | 1 -
 6 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 requirements-opt.txt

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dbdb95bb714..d3c81bd30d2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -148,10 +148,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install system dependencies on MacOS
-        run: brew install libomp
-        if: runner.os == 'macOS'
-
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 3688ad46e50..7c4752eb22d 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -69,6 +69,9 @@ requirements:
     - cachecontrol >=0.12.6
     - qtconsole >=4.7.2
     - pygments >=2.8.0
+    - catboost >=1.0.1
+    # todo: set to xgboost >=2.0.0 when it will be released on conda-forge
+    - xgboost
 
 test:
   # Python imports
diff --git a/requirements-core.txt b/requirements-core.txt
index 1a4d7d4856a..5f650c162fb 100644
--- a/requirements-core.txt
+++ b/requirements-core.txt
@@ -26,3 +26,5 @@ pandas>=1.4.0,!=1.5.0,!=2.0.0
 pyyaml
 openpyxl
 httpx>=0.21.0
+catboost>=1.0.1
+xgboost>=2.0.0
diff --git a/requirements-opt.txt b/requirements-opt.txt
deleted file mode 100644
index 5ab6b24c9d0..00000000000
--- a/requirements-opt.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-catboost>=1.0.1
-xgboost>=2.0.0
diff --git a/requirements-readthedocs.txt b/requirements-readthedocs.txt
index 7db6a67749f..05d72518dd7 100644
--- a/requirements-readthedocs.txt
+++ b/requirements-readthedocs.txt
@@ -3,6 +3,4 @@ cython
 -r requirements-doc.txt
 -r requirements-gui.txt
 -r requirements-pyqt.txt
-# for orange data mining library catboost and xgboost required
--r requirements-opt.txt
 -e .
diff --git a/tox.ini b/tox.ini
index da5bbcc69fe..074fd72dc14 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,6 @@ deps =
     pyqt5==5.15.*;platform_system!="Windows" or python_version>='3.10'
     pyqtwebengine==5.12.*;platform_system=="Windows" and python_version<'3.10'
     pyqtwebengine==5.15.*;platform_system!="Windows" or python_version>='3.10'
-    -r {toxinidir}/requirements-opt.txt
     coverage
     psycopg2-binary
     pymssql<3.0