fix build CI failing due to old pip-tools failing with latest pip (#2200

)
microsoft · Aug 2, 2023 · 0327bb2 · 0327bb2
1 parent 06c00b3
commit 0327bb2
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/CI-e2e-notebooks-vision.yml b/.github/workflows/CI-e2e-notebooks-vision.yml
@@ -88,7 +88,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade setuptools
-          pip install --upgrade "pip-tools<=6.13.0"
+          pip install --upgrade "pip-tools<=7.1.0"
 
       - name: Install dependencies
         shell: bash -l {0}

diff --git a/.github/workflows/CI-e2e-notebooks.yml b/.github/workflows/CI-e2e-notebooks.yml
@@ -88,7 +88,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade setuptools
-          pip install --upgrade "pip-tools<=6.13.0"
+          pip install --upgrade "pip-tools<=7.1.0"
 
       - name: Install dependencies
         shell: bash -l {0}

diff --git a/.github/workflows/CI-notebook-vision.yml b/.github/workflows/CI-notebook-vision.yml
@@ -58,7 +58,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade setuptools
-          pip install --upgrade "pip-tools<=6.13.0"
+          pip install --upgrade "pip-tools<=7.1.0"
 
       - name: Install dependencies
         shell: bash -l {0}

diff --git a/.github/workflows/CI-notebook.yml b/.github/workflows/CI-notebook.yml
@@ -58,7 +58,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade setuptools
-          pip install --upgrade "pip-tools<=6.13.0"
+          pip install --upgrade "pip-tools<=7.1.0"
 
       - name: Install dependencies
         shell: bash -l {0}

diff --git a/.github/workflows/CI-python.yml b/.github/workflows/CI-python.yml
@@ -45,12 +45,20 @@ jobs:
         with:
           python-version: ${{ matrix.pythonVersion }}
 
-      - name: Setup tools
+      - if: ${{ matrix.pythonVersion == '3.6' || matrix.pythonVersion == '3.7' }}
+        name: Setup tools for python lt 3.8
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade "pip<=23.1.2"
           pip install --upgrade setuptools
           pip install --upgrade "pip-tools<=6.13.0"
 
+      - if: ${{ matrix.pythonVersion == '3.8' || matrix.pythonVersion == '3.9' || matrix.pythonVersion == '3.10' }}
+        name: Setup tools for python gte 3.8
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade setuptools
+          pip install --upgrade "pip-tools<=7.1.0"
+
       - name: Pip compile
         run: |
           pip-compile requirements-dev.txt -o requirements-dev-comp.txt

diff --git a/.github/workflows/CI-rai_core_flask-pytest.yml b/.github/workflows/CI-rai_core_flask-pytest.yml
@@ -10,7 +10,7 @@ on:
       - ".github/workflows/CI-rai_core_flask-pytest.yml"
 
 jobs:
-  ci-python:
+  ci-rai-core-flask:
     strategy:
       # keep running remaining matrix jobs even if one fails
       # to avoid having to rerun all jobs several times
@@ -47,12 +47,20 @@ jobs:
         with:
           python-version: ${{ matrix.pythonVersion }}
 
-      - name: Setup tools
+      - if: ${{ matrix.pythonVersion == '3.6' || matrix.pythonVersion == '3.7' }}
+        name: Setup tools for python lt 3.8
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade "pip<=23.1.2"
           pip install --upgrade setuptools
           pip install --upgrade "pip-tools<=6.13.0"
 
+      - if: ${{ matrix.pythonVersion == '3.8' || matrix.pythonVersion == '3.9' || matrix.pythonVersion == '3.10' }}
+        name: Setup tools for python gte 3.8
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade setuptools
+          pip install --upgrade "pip-tools<=7.1.0"
+
       - name: Pip compile
         run: |
           pip-compile requirements-dev.txt -o requirements-dev-comp.txt

diff --git a/.github/workflows/CI-raiwidgets-pytest.yml b/.github/workflows/CI-raiwidgets-pytest.yml
@@ -67,7 +67,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade setuptools
-          pip install --upgrade "pip-tools<=6.13.0"
+          pip install --upgrade "pip-tools<=7.1.0"
 
       - name: Install dependencies
         shell: bash -l {0}

diff --git a/.github/workflows/CI-responsibleai-text-vision-pytest.yml b/.github/workflows/CI-responsibleai-text-vision-pytest.yml
@@ -70,7 +70,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade setuptools
-          pip install --upgrade "pip-tools<=6.13.0"
+          pip install --upgrade "pip-tools<=7.1.0"
 
       - name: Install dependencies
         shell: bash -l {0}

diff --git a/erroranalysis/erroranalysis/_internal/surrogate_error_tree.py b/erroranalysis/erroranalysis/_internal/surrogate_error_tree.py
@@ -471,12 +471,14 @@ def create_surrogate_model(analyzer,
         surrogate = LGBMClassifier(n_estimators=1,
                                    max_depth=max_depth,
                                    num_leaves=num_leaves,
-                                   min_child_samples=min_child_samples)
+                                   min_child_samples=min_child_samples,
+                                   verbosity=-1)
     else:
         surrogate = LGBMRegressor(n_estimators=1,
                                   max_depth=max_depth,
                                   num_leaves=num_leaves,
-                                  min_child_samples=min_child_samples)
+                                  min_child_samples=min_child_samples,
+                                  verbosity=-1)
     if cat_ind_reindexed:
         surrogate.fit(dataset_sub_features, diff,
                       categorical_feature=cat_ind_reindexed)