Use include to handle uncertainties testing

By using `include` directive, we can add a special case to the matrix of possibilities. In this case we add to the matrix the case where pandas>=2.1.0 and pint>=0.23rc0, which are both necessary for the UFloat array changes to work. Signed-off-by: Michael Tiemann <[email protected]>
hgrecco · Sep 19, 2023 · a5758e7 · a5758e7
1 parent 108cb71
commit a5758e7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/ci-pint-master.yml b/.github/workflows/ci-pint-master.yml
@@ -10,7 +10,10 @@ jobs:
         numpy: ["numpy>=1.20.3,<2.0.0"]
         pandas: ["pandas==2.0.2", ]
         pint: ["pint>=0.21.1"]
-        uncertainties: [ "pint==0.23rc0 pandas==2.1.0 uncertainties==3.1.7", ]
+        include:
+          - pandas: "pandas==2.1.0"
+            pint: "pint>=0.23rc0"
+            uncertainties: "uncertainties==3.1.7"
 
     runs-on: ubuntu-latest
 
@@ -59,7 +62,7 @@ jobs:
 
       - name: Install uncertainties
         if: ${{ matrix.uncertainties != null }}
-        run: pip install ${{matrix.uncertainties}}
+        run: pip install "${{matrix.uncertainties}}"
 
       - name: Run Tests
         run: |

diff --git a/.github/workflows/ci-pint-pre.yml b/.github/workflows/ci-pint-pre.yml
@@ -10,7 +10,10 @@ jobs:
         numpy: ["numpy>=1.20.3,<2.0.0"]
         pandas: ["pandas==2.0.2", ]
         pint: ["pint>=0.21.1"]
-        uncertainties: [ "pint==0.23rc0 pandas==2.1.0 uncertainties==3.1.7", ]
+        include:
+          - pandas: "pandas==2.1.0"
+            pint: "pint>=0.23rc0"
+            uncertainties: "uncertainties==3.1.7"
 
     runs-on: ubuntu-latest
 
@@ -59,7 +62,7 @@ jobs:
 
       - name: Install uncertainties
         if: ${{ matrix.uncertainties != null }}
-        run: pip install ${{matrix.uncertainties}}
+        run: pip install "${{matrix.uncertainties}}"
 
       - name: Run Tests
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,9 +8,12 @@ jobs:
       matrix:
         python-version: [3.9, "3.10", "3.11"]
         numpy: ["numpy>=1.20.3,<2.0.0"]
-        pandas: ["pandas==2.0.2", "pandas==2.1.0" ]
-        pint: ["pint>=0.21.1", "pint==0.22"]
-        uncertainties: [ "pint==0.23rc0 pandas==2.1.0 uncertainties==3.1.7", ]
+        pandas: ["pandas==2.0.2", "pandas>=2.1.0" ]
+        pint: ["pint>=0.21.1,<0.22", "pint==0.22", "pint>=0.23rc0"]
+        include:
+          - pandas: "pandas>=2.1.0"
+            pint: "pint>=0.23rc0"
+            uncertainties: "uncertainties==3.1.7"
 
     runs-on: ubuntu-latest
 
@@ -60,7 +63,7 @@ jobs:
 
       - name: Install uncertainties
         if: ${{ matrix.uncertainties != null }}
-        run: pip install ${{matrix.uncertainties}}
+        run: pip install "${{matrix.uncertainties}}"
 
       - name: Run Tests
         run: |