From ee0287ac19f24cb3298a23837f46256b023a81fd Mon Sep 17 00:00:00 2001 From: Paul Natsuo Kishimoto Date: Fri, 28 Aug 2020 12:10:14 +0200 Subject: [PATCH] Prepare v3.1.0 --- README.md | 2 +- RELEASE_NOTES.rst | 6 ++++-- rmessageix/DESCRIPTION | 3 +-- tutorial/README.rst | 30 +++++++++++++++--------------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index b9ce3d823..c4d9dd982 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![PyPI version](https://img.shields.io/pypi/v/message_ix.svg)](https://pypi.python.org/pypi/message_ix/) [![Anaconda version](https://img.shields.io/conda/vn/conda-forge/message-ix)](https://anaconda.org/conda-forge/message-ix) -[![Documentation build](https://readthedocs.com/projects/iiasa-energy-program-message-ix/badge/?version=master)](https://docs.messageix.org/en/master/) +[![Documentation build](https://readthedocs.com/projects/iiasa-energy-program-message-ix/badge/?version=v3.1.0)](https://docs.messageix.org/en/stable/) [![Build status](https://github.com/iiasa/message_ix/workflows/pytest/badge.svg)](https://github.com/iiasa/message_ix/actions?query=workflow:pytest) [![Test coverage](https://codecov.io/gh/iiasa/message_ix/branch/master/graph/badge.svg)](https://codecov.io/gh/iiasa/message_ix) diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 5df8bdccc..ddc9ddf75 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -1,5 +1,7 @@ -Next release -============ +v3.1.0 (2020-08-28) +=================== + +:mod:`message_ix` v3.1.0 coincides with :mod:`ixmp` v3.1.0. All changes ----------- diff --git a/rmessageix/DESCRIPTION b/rmessageix/DESCRIPTION index 7408fef24..a9e11c032 100644 --- a/rmessageix/DESCRIPTION +++ b/rmessageix/DESCRIPTION @@ -1,8 +1,7 @@ Package: rmessageix Type: Package Title: MESSAGEix Modeling Framework -Version: 3.0.1-9000 -Date: 2020-08-05 +Version: 3.1.0 Authors@R: c( person("Alessio", "Mastrucci", email = "mastrucc@iiasa.ac.at", role = c("aut", "cre")), diff --git a/tutorial/README.rst b/tutorial/README.rst index 212642ef1..32a9cf9df 100644 --- a/tutorial/README.rst +++ b/tutorial/README.rst @@ -107,14 +107,14 @@ uses it to illustrate a range of framework features. module to ‘report’ results, e.g. do post-processing, plotting, and other calculations (`westeros_report.ipynb`_). -.. _westeros_baseline.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/westeros/westeros_baseline.ipynb -.. _westeros_emissions_bounds.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/westeros/westeros_emissions_bounds.ipynb -.. _westeros_emissions_taxes.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/westeros/westeros_emissions_taxes.ipynb -.. _westeros_firm_capacity.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/westeros/westeros_firm_capacity.ipynb -.. _westeros_flexible_generation.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/westeros/westeros_flexible_generation.ipynb -.. _westeros_seasonality.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/westeros/westeros_seasonality.ipynb -.. _westeros_fossil_resource.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/westeros/westeros_fossil_resource.ipynb -.. _westeros_report.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/westeros/westeros_report.ipynb +.. _westeros_baseline.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/westeros/westeros_baseline.ipynb +.. _westeros_emissions_bounds.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/westeros/westeros_emissions_bounds.ipynb +.. _westeros_emissions_taxes.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/westeros/westeros_emissions_taxes.ipynb +.. _westeros_firm_capacity.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/westeros/westeros_firm_capacity.ipynb +.. _westeros_flexible_generation.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/westeros/westeros_flexible_generation.ipynb +.. _westeros_seasonality.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/westeros/westeros_seasonality.ipynb +.. _westeros_fossil_resource.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/westeros/westeros_fossil_resource.ipynb +.. _westeros_report.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/westeros/westeros_report.ipynb .. _austria-tutorials: @@ -135,10 +135,10 @@ sector model, with several fossil and renewable power plant types. completed code for the exercises (`austria_multiple_policies-answers.ipynb`_). -.. _austria.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/Austrian_energy_system/austria.ipynb -.. _R_austria.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/Austrian_energy_system/R_austria.ipynb -.. _austria_load_scenario.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/Austrian_energy_system/austria_load_scenario.ipynb -.. _R_austria_load_scenario.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/Austrian_energy_system/R_austria_load_scenario_R.ipynb -.. _austria_single_policy.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/Austrian_energy_system/austria_single_policy.ipynb -.. _austria_multiple_policies.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/Austrian_energy_system/austria_multiple_policies.ipynb -.. _austria_multiple_policies-answers.ipynb: https://github.com/iiasa/message_ix/blob/v3.0.0/tutorial/Austrian_energy_system/austria_multiple_policies-answers.ipynb +.. _austria.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/Austrian_energy_system/austria.ipynb +.. _R_austria.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/Austrian_energy_system/R_austria.ipynb +.. _austria_load_scenario.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/Austrian_energy_system/austria_load_scenario.ipynb +.. _R_austria_load_scenario.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/Austrian_energy_system/R_austria_load_scenario_R.ipynb +.. _austria_single_policy.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/Austrian_energy_system/austria_single_policy.ipynb +.. _austria_multiple_policies.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/Austrian_energy_system/austria_multiple_policies.ipynb +.. _austria_multiple_policies-answers.ipynb: https://github.com/iiasa/message_ix/blob/v3.1.0/tutorial/Austrian_energy_system/austria_multiple_policies-answers.ipynb