Merge pull request #517 from iiasa/gha-node-20

Address GitHub Actions warnings re: node.js 16

.github/workflows/publish.yaml

@@ -2,14 +2,16 @@ name: Build package / publish
 
 on:
   push:
-    branches: [ main ]
     tags: [ "v*" ]
   release:
     types: [ published ]
   # Check that package can be built even on PRs
   pull_request:
     branches: [ main ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   publish:

.github/workflows/pytest.yaml

@@ -51,14 +51,12 @@ jobs:
     # name: ${{ matrix.os }}-py${{ matrix.python-version }}-pandas${{ matrix.pandas-version }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: ${{ env.depth }}
+        fetch-tags: true
 
-    - name: Fetch tags (for setuptools-scm)
-      run: git fetch --tags --depth=${{ env.depth }}
-
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         cache: pip
@@ -135,8 +133,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
 

.pre-commit-config.yaml

@@ -10,19 +10,17 @@ repos:
     language: python
     entry: bash -c ". ${PRE_COMMIT_MYPY_VENV:-/dev/null}/bin/activate 2>/dev/null; mypy $0 $@"
     additional_dependencies:
-    - mypy
+    - mypy >= 1.8.0
     - genno
     - GitPython
     - nbclient
     - pytest
     - sphinx
     - xarray
     args: ["."]
-- repo: https://github.com/psf/black
-  rev: 23.7.0
-  hooks:
-  - id: black
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.0.287
+  rev: v0.1.14
   hooks:
   - id: ruff
+  - id: ruff-format
+    args: [ --check ]

ixmp/tests/test_model.py

@@ -155,8 +155,6 @@ def test_error_message(self, test_data_path, test_mp):
 For details, see the terminal output above, plus:
 Listing   : {}
 Log file  : {}
-Input data: {}""".format(
-                *paths
-            ),
+Input data: {}""".format(*paths),
         ):
             s.solve(model_file=test_data_path / "_abort.gms", use_temp_dir=False)