From 0b1b03bd07c0b0272c1642813c1d26349ab2ce49 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Mon, 6 Nov 2023 13:12:54 +0100 Subject: [PATCH 1/2] Specify docs extra for ixmp.testing --- ci/rtd-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/rtd-requirements.txt b/ci/rtd-requirements.txt index c95d06bc9..c83fd43fb 100644 --- a/ci/rtd-requirements.txt +++ b/ci/rtd-requirements.txt @@ -1 +1 @@ -git+https://github.com/iiasa/ixmp.git@main#egg=ixmp +git+https://github.com/iiasa/ixmp.git@main#egg=ixmp[docs] From 8cc2c58b7cd4129d02e9fa548786aca9cfb60d57 Mon Sep 17 00:00:00 2001 From: Fridolin Glatter Date: Mon, 6 Nov 2023 15:19:25 +0100 Subject: [PATCH 2/2] Update references to genno code --- doc/macro.rst | 2 +- doc/reporting.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/macro.rst b/doc/macro.rst index 90ba18b83..cf08892f2 100644 --- a/doc/macro.rst +++ b/doc/macro.rst @@ -235,7 +235,7 @@ Code documentation :exclude-members: MACRO_ITEMS The functions :func:`add_model_data` and :func:`calibrate` are used by :meth:`.Scenario.add_macro`. - Others are internal; :func:`prepare_computer` assembles the following functions into a :class:`.genno.Computer` that then executes the necessary calculations to prepare the model data. + Others are internal; :func:`prepare_computer` assembles the following functions into a :class:`genno.Computer` that then executes the necessary calculations to prepare the model data. .. autosummary:: Structures diff --git a/doc/reporting.rst b/doc/reporting.rst index 19d2e35d8..d0d45776b 100644 --- a/doc/reporting.rst +++ b/doc/reporting.rst @@ -284,7 +284,7 @@ Operators ~genno.computations.add ~genno.computations.aggregate ~genno.computations.apply_units - ~genno.compat.pyam.computations.as_pyam + ~genno.compat.pyam.operator.as_pyam ~genno.computations.broadcast_map ~genno.computations.combine ~genno.computations.concat