From b06eae1b9edaf58a3d4b5ca3be0ad0a3a12ad817 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Thu, 21 Nov 2024 09:30:48 +0100 Subject: [PATCH 1/6] Bump GAMS version in nightly workflow --- .github/workflows/nightly.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 065454992..bf3651535 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -11,7 +11,10 @@ on: - cron: "0 5 * * *" env: - GAMS_VERSION: 29.1.0 + # Version used until 2024-11-20; disabled + # GAMS_VERSION: 29.1.0 + # First version including a macOS arm64 distribution + GAMS_VERSION: 43.4.1 # See description in lint.yml depth: 100 From bde900579a5746236e2c1380ba8c9f3a4de71b01 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Thu, 21 Nov 2024 09:48:02 +0100 Subject: [PATCH 2/6] Import partial so the nightly test can use it --- message_ix/tests/test_nightly.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/message_ix/tests/test_nightly.py b/message_ix/tests/test_nightly.py index 389db7bcb..2f39f7022 100644 --- a/message_ix/tests/test_nightly.py +++ b/message_ix/tests/test_nightly.py @@ -1,5 +1,8 @@ """Slow-running tests for nightly continuous integration.""" + +from functools import partial # noqa: F401, is used through `case["test"]` below + import ixmp import pytest From 2de2b65203be7d18865bfb0468aebcf398a97ff5 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Thu, 21 Nov 2024 09:50:18 +0100 Subject: [PATCH 3/6] Run nightly workflow on GAMS file changes --- .github/workflows/nightly.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index bf3651535..6c2824e05 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -9,6 +9,11 @@ on: schedule: # 05:00 UTC = 06:00 CET = 07:00 CEST - cron: "0 5 * * *" + pull_request_target: + paths: + - '**.gms' + - '**.gpr' + - '**.gdx' env: # Version used until 2024-11-20; disabled From 08f5ab361bdda68927a7137b6a4cf3eb1229b5fb Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Thu, 21 Nov 2024 09:55:32 +0100 Subject: [PATCH 4/6] Apply ruff formatting --- message_ix/tests/test_nightly.py | 1 - 1 file changed, 1 deletion(-) diff --git a/message_ix/tests/test_nightly.py b/message_ix/tests/test_nightly.py index 2f39f7022..9aa895e67 100644 --- a/message_ix/tests/test_nightly.py +++ b/message_ix/tests/test_nightly.py @@ -1,6 +1,5 @@ """Slow-running tests for nightly continuous integration.""" - from functools import partial # noqa: F401, is used through `case["test"]` below import ixmp From 33f8f4faa516e625a2b2b0566a79fde3cb2748ac Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Thu, 21 Nov 2024 09:57:00 +0100 Subject: [PATCH 5/6] Import numpy so nightly test can use it --- message_ix/tests/test_nightly.py | 1 + 1 file changed, 1 insertion(+) diff --git a/message_ix/tests/test_nightly.py b/message_ix/tests/test_nightly.py index 9aa895e67..545916ef0 100644 --- a/message_ix/tests/test_nightly.py +++ b/message_ix/tests/test_nightly.py @@ -3,6 +3,7 @@ from functools import partial # noqa: F401, is used through `case["test"]` below import ixmp +import numpy as np # noqa: F401, same as above import pytest import message_ix From 3c16a74840fd9619e99f7ef2ccf1947be9886874 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Thu, 21 Nov 2024 10:18:40 +0100 Subject: [PATCH 6/6] Run nightly workflow on labeled PRs --- .github/workflows/nightly.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 6c2824e05..a8e63d0b5 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -14,6 +14,8 @@ on: - '**.gms' - '**.gpr' - '**.gdx' + types: + - labeled env: # Version used until 2024-11-20; disabled