Skip to content

Commit

Permalink
Prepare v3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
khaeru committed Aug 28, 2020
1 parent 25c6b50 commit 7f878d0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
6 changes: 4 additions & 2 deletions RELEASE_NOTES.rst
Original file line number Diff line number Diff line change
@@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion rixmp/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]",
role = c("aut", "cre")),
Expand Down
8 changes: 4 additions & 4 deletions tutorial/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/iiasa/ixmp/blob/master/tutorial/transport/py_transport.ipynb>`__,
or in `R <https://github.com/iiasa/ixmp/blob/master/tutorial/transport/R_transport.ipynb>`__.
in `Python <https://github.com/iiasa/ixmp/blob/v3.1.0/tutorial/transport/py_transport.ipynb>`__,
or in `R <https://github.com/iiasa/ixmp/blob/v3.1.0/tutorial/transport/R_transport.ipynb>`__.

This tutorial walks through the following steps:

Expand All @@ -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 <https://github.com/iiasa/ixmp/blob/master/tutorial/transport/py_transport_scenario.ipynb>`__,
or in `R <https://github.com/iiasa/ixmp/blob/master/tutorial/transport/R_transport_scenario.ipynb>`__.
in `Python <https://github.com/iiasa/ixmp/blob/v3.1.0/tutorial/transport/py_transport_scenario.ipynb>`__,
or in `R <https://github.com/iiasa/ixmp/blob/v3.1.0/tutorial/transport/R_transport_scenario.ipynb>`__.

This tutorial creates an alternate or ‘counterfactual’ scenario of the transport problem; solves it; and compares the results to the original or reference scenario.

0 comments on commit 7f878d0

Please sign in to comment.