Adjust after merge of iiasa/ixmp#397

genno/config.py

@@ -47,6 +47,9 @@ def handles(section_name: str, iterate: bool = True, discard: bool = True):
 
     Parameters
     ----------
+    section_name: str
+        The name of the configuration section to handle. Using a name already present
+        in :data:`HANDLERS` overrides that handler.
     iterate : bool, optional
         If :obj:`True`, the handler is called once for each item (either list item, or
         (key, value) tuple) in the section. If :obj:`False`, the entire section

genno/tests/test_config.py

@@ -8,13 +8,17 @@
 from genno.config import HANDLERS, handles
 
 
+# NB ixmp is currently used in the genno test suite: ixmp.testing.run_notebook is
+#    imported by test_exceptions.py. This in turn cases ixmp to register its own
+#    handlers: 2 new, and 1 overriding the built-in one for "units:".
+THIRD_PARTY_HANDLERS = 2
+
+
 def test_handlers():
     # Expected config handlers are available
-    # NB "+ 1" is because ixmp.testing is imported by test_exceptions.py, which in turn
-    #    causes ixmp to register its own handler. This should be *commented* when using
-    #    code from https://github.com/iiasa/ixmp/pull/397; or *uncommented* otherwise/
-    #    after that PR is merged
-    assert len(HANDLERS) == 8 + (1 * HAS_PYAM)  # + 1
+    assert 8 + (1 * HAS_PYAM) + THIRD_PARTY_HANDLERS == len(HANDLERS)
+
+    # Handlers are all callable
     for key, func in HANDLERS.items():
         assert isinstance(key, str) and callable(func)
 

setup.cfg

@@ -42,6 +42,9 @@ setup_requires =
 
 
 [options.extras_require]
+# Graphviz, for Computer.describe()
+graphviz =
+    graphviz
 docs =
     IPython
     sphinx_rtd_theme
@@ -56,6 +59,7 @@ compat =
     %(pyam)s
 tests =
     %(compat)s
+    %(graphviz)s
     ixmp
     pytest
     pytest-cov