Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MESSAGEix manuscript reference update #107 #140

Merged
merged 6 commits into from
Dec 20, 2018

Conversation

danielhuppmann
Copy link
Member

This PR updates the references in the documentation, notice, etc. to the published version of the MESSAGEix manuscript and to the latest version of the MESSAGEix South Africa manuscript.

The changes are the equivalent updates to iiasa/ixmp#107

@danielhuppmann danielhuppmann added the docs Documentation label Dec 15, 2018
@danielhuppmann danielhuppmann requested review from khaeru and removed request for gidden December 20, 2018 12:10
@danielhuppmann
Copy link
Member Author

@gidden left for an extended Christmas vacation, let's not bother him with that

@danielhuppmann
Copy link
Member Author

same formatting issue as identified by @khaeru in iiasa/ixmp#107

Copy link
Member

@khaeru khaeru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also good to go, please merge.

(We noted per #143 that the Circle CI test failure is a CI configuration problem that will affect PRs from any fork of the main iiasa/message_ix repo; so the failure does not block this merge.)

`message_ix` API Documentation
------------------------------

.. include:: api/message_ix.rst
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also made these changes in #138, but I can rebase that other PR after this one is merged.

@@ -43,6 +43,8 @@ There are three methods to run the |MESSAGEix| model:
The scenario name and other arguments can be passed as command line parameters,
e.g. :literal:`gams MESSAGE_run.gms --in="<data-file>" --out="<output-file>"`.

.. _`tutorials`: tutorials.html

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also touched in #138, but a rebase will handle.

@danielhuppmann
Copy link
Member Author

merging as approved by @khaeru

@danielhuppmann danielhuppmann merged commit b11e6b8 into iiasa:master Dec 20, 2018
@danielhuppmann danielhuppmann deleted the manuscript branch January 8, 2019 10:07
@khaeru khaeru added this to the 1.2.0 milestone Feb 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants