Rewrite matrix and update numpy compatibility

openml · PGijsbers · Jul 5, 2024 · Jul 2, 2024 · Jul 2, 2024 · Jul 3, 2024
commit 5d1da88c4de3d2c1b23ab7df461f4db8d7b5d937
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,61 +25,43 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.8"]
-        # TODO(eddiebergman): We should consider testing against newer version I guess...
-        # We probably consider just having a `"1"` version to always test against latest
-        scikit-learn: ["0.23.1", "0.24"]
+        python-version: ["3.9"]
+        scikit-learn: ["1.0", "1.1", "1.2", "1.3", "1.4", "1.5"]
         os: [ubuntu-latest]
         sklearn-only: ["true"]
-        exclude:  # no scikit-learn 0.23 release for Python 3.9
-          - python-version: "3.9"
-            scikit-learn: "0.23.1"
         include:
-          - os: ubuntu-latest
-            python-version: "3.9"
-            scikit-learn: "1.5"
-            sklearn-only: "true"
-          - os: ubuntu-latest
-            python-version: "3.9"
-            scikit-learn: "1.4"
-            sklearn-only: "true"
-          - os: ubuntu-latest
-            python-version: "3.9"
-            scikit-learn: "1.3"
-            sklearn-only: "true"
-          - os: ubuntu-latest
-            python-version: "3.9"
-            scikit-learn: "1.1"
-            sklearn-only: "true"
-          - os: ubuntu-latest
-            python-version: "3.9"
-            scikit-learn: "1.0"
+          # no scikit-learn 0.23 release for Python 3.9
+          - python-version: "3.8"
+            scikit-learn: "0.23.1"
             sklearn-only: "true"
+          # scikit-learn 0.24 relies on scipy defaults, so we need to fix the version
+          # c.f. https://github.com/openml/openml-python/pull/1267
           - os: ubuntu-latest
             python-version: "3.9"
             scikit-learn: "0.24"
             scipy: "1.10.0"
             sklearn-only: "true"
+          # Do a Windows and Ubuntu test for _all_ openml functionality
+          # I am not sure why these are on 3.8 and older scikit-learn
+          - os: windows-latest
+            python-version: "3.8"
+            scikit-learn: 0.24.*
+            scipy: "1.10.0"
+            sklearn-only: 'false'
           # Include a code cov version
           - code-cov: true
             os: ubuntu-latest
             python-version: "3.8"
             scikit-learn: 0.23.1
             sklearn-only: 'false'
-          # Include a windows test, for some reason on a later version of scikit-learn
-          - os: windows-latest
-            python-version: "3.8"
-            scikit-learn: 0.24.*
-            scipy: "1.10.0"  # not sure why the explicit scipy version?
-            sklearn-only: 'false'
       fail-fast:  false
 
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 2
     - name: Setup Python ${{ matrix.python-version }}
-      if: matrix.os != 'windows-latest'  # windows-latest only uses preinstalled Python (3.7.9)
+      if: matrix.os != 'windows-latest'  # windows-latest only uses preinstalled Python (3.9.13)
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
@@ -92,9 +74,13 @@ jobs:
         pip install scikit-learn==${{ matrix.scikit-learn }}
     - name: Install numpy for Python 3.8
       # Python 3.8 & scikit-learn<0.24 requires numpy<=1.23.5
-      if: ${{ matrix.python-version == '3.8' && contains(fromJSON('["0.23.1", "0.22.2", "0.21.2"]'), matrix.scikit-learn) }}
+      if: ${{ matrix.python-version == '3.8' && matrix.scikit-learn == '0.23.1' }}
       run: |
         pip install numpy==1.23.5
+    - name: Install NumPy 1.x for scikit-learn < 1.4
+      if: ${{ contains(fromJSON('["1.0", "1.1", "1.2", "1.3"]'), matrix.scikit-learn) }}
+      run: |
+        pip install numpy<=2.0
     - name: Install scipy ${{ matrix.scipy }}
       if: ${{ matrix.scipy }}
       run: |