diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index ecebdfeac..3949a3c03 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -1,9 +1,11 @@ -Next release -============ +v3.1.0 (2020-08-28) +=================== All changes ----------- +ixmp v3.1.0 coincides with message_ix v3.1.0. + - :pull:`345`: Fix a bug in :meth:`.read_excel` when parameter data is spread across multiple sheets. - :pull:`363`: Expand documentation and revise installation instructions. - :pull:`362`: Raise Python exceptions from :class:`.JDBCBackend`. diff --git a/rixmp/DESCRIPTION b/rixmp/DESCRIPTION index 0eb630f0a..8467e67ca 100644 --- a/rixmp/DESCRIPTION +++ b/rixmp/DESCRIPTION @@ -1,7 +1,7 @@ Package: rixmp Type: Package Title: R Interface to the IX Modeling Platform -Version: 3.0.0.9000 +Version: 3.1.0 Authors@R: c( person("Adriano", "Vinca", email = "vinca@iiasa.ac.at", role = c("aut", "cre")), diff --git a/tutorial/README.rst b/tutorial/README.rst index 8dd9b7956..76ca977dc 100644 --- a/tutorial/README.rst +++ b/tutorial/README.rst @@ -13,8 +13,8 @@ This problem finds a least cost shipping schedule that meets demand requirements The tutorials are provided as Jupyter notebooks for both Python and R, and are identical as far as possible. - Tutorial 1: - in `Python `__, - or in `R `__. + in `Python `__, + or in `R `__. This tutorial walks through the following steps: @@ -25,7 +25,7 @@ The tutorials are provided as Jupyter notebooks for both Python and R, and are i 5. Display the solution (variables and equation). - Tutorial 2: - in `Python `__, - or in `R `__. + in `Python `__, + or in `R `__. This tutorial creates an alternate or ‘counterfactual’ scenario of the transport problem; solves it; and compares the results to the original or reference scenario.