Merge branch 'iiasa:main' into main

ywpratama · Jun 11, 2023 · f40a0d6 · f40a0d6
2 parents e9fdf24 + 6dee23a
commit f40a0d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml
@@ -62,13 +62,15 @@ jobs:
 
     - name: Configure conda channels, update, create environment, and install message-ix
       run: |
+        conda install -n base conda-libmamba-solver
+        conda config --set solver libmamba
         conda config --prepend channels conda-forge
         conda config --set channel_priority strict
         conda update -n base -c defaults conda
 
         # Also install pytest and packages required for testing. pip/PyPI
         # supports this via message_ix[testing], but conda does not.
-        conda create --quiet --name testenv message-ix=3.6.0 ${{ matrix.extra-deps }} pytest asyncssh sphinx
+        conda create --quiet --name testenv message-ix ${{ matrix.extra-deps }} pytest asyncssh sphinx
         conda list --name testenv
 
     - name: Check CLI commands and run test

diff --git a/message_ix/tests/test_tutorials.py b/message_ix/tests/test_tutorials.py
@@ -121,7 +121,7 @@ def nb_path(request, tutorial_path):
 
 def default_args():
     """Default arguments for :func:`.run_notebook."""
-    if GHA and sys.platform == "darwin":
+    if GHA and sys.platform in ("darwin", "win32"):
         # Use a longer timeout
         return dict(timeout=30)
     else: