Adjust for genno 1.6, pyam 1.0

.gitignore

@@ -48,6 +48,7 @@ tests/data/nightly
 .benchmarks
 .coverage*
 .mypy_cache
+prof/
 .pytest_cache
 coverage.xml
 htmlcov

RELEASE_NOTES.rst

@@ -1,8 +1,11 @@
-.. Next release
-.. ============
+Next release
+============
+
+All changes
+-----------
+
+- Adjust the Westeros reporting tutorial to pyam 1.0 deprecations (:pull:`492`).
 
-.. All changes
-.. -----------
 
 .. _v3.3.0:
 

message_ix/reporting/computations.py

@@ -36,7 +36,7 @@ def plot_cumulative(x, y, labels):
     d0_labels = set(x.coords[d0].values) | set(y.coords[d0].values)
     assert (
         len(d0_labels) == 1
-    ), "non-unique values {repr(d0_labels)} for dimension {repr(d0)}"
+    ), f"non-unique values {repr(d0_labels)} for dimension {repr(d0)}"
 
     axes_properties = dict(
         title=f"{d0_labels.pop()} {labels[0].title()}",

message_ix/tests/test_reporting.py

@@ -54,10 +54,10 @@ def test_reporter_from_scenario(message_test_mp):
     assert len(rep.graph["all"]) == 123
 
     # Quantities have short dimension names
-    assert "demand:n-c-l-y-h" in rep.graph
+    assert "demand:n-c-l-y-h" in rep
 
     # Aggregates are available
-    assert "demand:n-l-h" in rep.graph
+    assert "demand:n-l-h" in rep
 
     # Quantities contain expected data
     dims = dict(coords=["chicago new-york topeka".split()], dims=["n"])

tutorial/westeros/westeros_report.ipynb

@@ -760,7 +760,7 @@
     "        scenario='baseline',\n",
     "        region='Westeros'\n",
     "    )\n",
-    "    .line_plot()\n",
+    "    .plot()\n",
     ")"
    ]
   },