Allways install xgboost and catboost

biolab · Sep 15, 2023 · 68b5d5f · 68b5d5f
1 parent 4da7e74
commit 68b5d5f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git 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
@@ -69,6 +69,8 @@ requirements:
     - cachecontrol >=0.12.6
     - qtconsole >=4.7.2
     - pygments >=2.8.0
+    - catboost >=1.0.1
+    - xgboost >=1.7.4
 
 test:
   # Python imports

diff --git 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>=1.7.4
diff --git a/requirements-opt.txt b/requirements-opt.txt
diff --git 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
@@ -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
@@ -66,7 +65,7 @@ deps =
     # oldest: pyyaml
     # oldest: openpyxl
     oldest: httpx==0.21.0
-    oldest: xgboost==1.5.0
+    oldest: xgboost==1.7.4
     oldest: catboost==1.0.1
 
 commands_pre =