Skip to content

Commit 79e8809

Browse files
authored
Merge pull request #953 from iiasa/enh/report-tutorial-2025-06
Update westeros_report.ipynb for 2025-06 workshop
2 parents 33edac8 + e0156a9 commit 79e8809

File tree

6 files changed

+613
-237
lines changed

6 files changed

+613
-237
lines changed

.github/workflows/pytest.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ env:
2626
label: "safe to test" # Label that must be applied to run on PRs from forks
2727
python-version: "3.13" # For non-matrixed jobs
2828
# Install:
29+
# - dask: to work around https://github.com/khaeru/genno/issues/171
2930
# - ixmp: from its `main` branch.
3031
# - all other dependencies from PyPI.
3132
#
3233
# To test against other code, such as other branches for open PRs, temporarily
3334
# add lines as appropriate. These lines SHOULD NOT be merged to `main`.
3435
upstream-versions: |
36+
"dask < 2025.4.0" \
3537
"ixmp @ git+https://github.com/iiasa/ixmp.git@main" \
3638
3739
jobs:

RELEASE_NOTES.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ All changes
4848
- Document the :ref:`minimum version of Java <install-java>` required for :class:`ixmp.JDBCBackend <ixmp.backend.jdbc.JDBCBackend>` (:pull:`962`).
4949
- Improve type hinting (:pull:`963`).
5050
- Fix capitalization in auxiliary_settings.gms to enable GDX output file compression on MacOS and Linux. (:pull:`965`)
51+
All changes
52+
-----------
53+
54+
- Improve the :file:`westeros_report.ipynb` tutorial :doc:`tutorial <tutorials>`
55+
for the 2025-06 MESSAGEix Training Workshop (:pull:`953`).
5156

5257
.. _v3.11.1:
5358

tutorial/westeros/genno.svg

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 54 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)