Merge pull request #854 from iiasa/ci/numpy-2

Adjust CI for Numpy 2.0, Graphviz
iiasa · Jun 17, 2024 · fa21aa2 · fa21aa2
2 parents 1125579 + c9df55e
commit fa21aa2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -66,6 +66,10 @@ jobs:
         (cd ixmp; pip install .[tests])
         (cd message_ix; pip install .[tests])
 
+        # TEMPORARY Work around unionai-oss/pandera#1685;
+        # see https://github.com/khaeru/genno/issues/140
+        pip install "numpy < 2"
+
     - name: Run test suite using pytest
       env:
         MESSAGE_IX_CI_USER: ${{ secrets.ENE_DATA_USER }}

diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -61,8 +61,8 @@ jobs:
         cache-dependency-path: "**/pyproject.toml"
 
     - uses: ts-graphviz/setup-graphviz@v2
-      with:
-        macos-skip-brew-update: true
+      # TEMPORARY Work around ts-graphviz/setup-graphviz#630
+      if: ${{ ! startswith(matrix.os, 'macos-') }}
 
     - name: Cache GAMS installer and R packages
       uses: actions/cache@v4
@@ -86,6 +86,10 @@ jobs:
         pip install --upgrade "ixmp @ git+https://github.com/iiasa/ixmp.git@main"
         pip install .[tests]
 
+        # TEMPORARY Work around unionai-oss/pandera#1685;
+        # see https://github.com/khaeru/genno/issues/140
+        pip install "numpy < 2"
+
     - name: Run test suite using pytest
       env:
         # For test_cli.test_dl; see code in message_ix.cli.dl
@@ -134,8 +138,8 @@ jobs:
       shell: bash
 
     - uses: ts-graphviz/setup-graphviz@v2
-      with:
-        macos-skip-brew-update: true
+      # TEMPORARY Work around ts-graphviz/setup-graphviz#630
+      if: ${{ ! startswith(matrix.os, 'macos-') }}
 
     - uses: r-lib/actions/setup-r@v2
       id: setup-r
@@ -166,6 +170,10 @@ jobs:
         pip install --upgrade "ixmp @ git+https://github.com/iiasa/ixmp.git@main"
         pip install .[tests]
 
+        # TEMPORARY Work around unionai-oss/pandera#1685;
+        # see https://github.com/khaeru/genno/issues/140
+        pip install "numpy < 2"
+
     - name: Install R dependencies and tutorial requirements
       run: |
         install.packages("remotes")