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

Transfer and re-org code from message_ix.reporting #11

Merged
merged 91 commits into from
Jan 17, 2021

Conversation

khaeru
Copy link
Owner

@khaeru khaeru commented Jan 11, 2021

Closes #6.

  • Replace message_ix test fixtures & message_ix.testing code with generated data.
  • Log messages but proceed if pyam is not installed.
  • Rewrite collapse_message_cols into a more general function.
  • Expand tests to cover added code.
  • Update whatsnew.rst.

khaeru and others added 30 commits January 11, 2021 21:38
* add stub class for dask-based reporting

* draft reporting documentation

* disable py27 builds on Travis and Appveyor

* Add initial tests

* Update to sync with ixmp changes

* Report to pyam/IAMC format

* Write pyam objects to file

* Use ixmp.Reporter.full_key

* Install pyam & ixmp reporting branch for CI

* Use setuptools.find_packages()

* Appease Stickler

* Install ixmp reporting branch for Appveyor CI

* Give verbose output for one test failure

* Include region results in test_report_as_pyam (h/t @danielhuppmann)

* Overload message_ix.Reporter to add common products

* Use ixmp.Reporter.add_product()

* Silence linter

* Add test_reporter_from_{dantzig,westeros} based on #196

* Pass rename_dims through configure()

* Expand documentation

* Add pytest to doc/requirements.txt

* Appease Stickler/flake8

* Install ixmp reporting2 branch on RTD

* Use iiasa:feature/reporting2 on Travis, Appveyor, RTD

* Use ixmp.testing.assert_qty_equal in test_reporter (#207)

* message tests now pass with updated ixmp.testing

* stickler

* add another westeros generation portion which adds emissions

* stickler

* collapse now takes a df and is not applied row-wise

* changes needed with updated ixmp branch

* stickler

* Notice that reporting only supports Python 3.

* Point to ixmp 'master' rather than 'reporting2'

* Initial draft of first standard message reporting (#211)

- initial draft of first standard message reporting
- Lint
- Collapse make_westeros_full as an option to make_westeros
- Appease Stickler
- Revert and silence Stickler
- Tidy names, docs; lint
- Avoid repeatedly adding pyam keys
- Combine collapse methods
- Add and use a 'concat' operation for pyam.IamDataFrame

* Yet more attempts to appease Stickler

* Complete documentation
* testing if tests fail

* rm empty file

* try installing pyam from source

* hotfix for reporting test failures

* update appveyor to also use bleeding edge

* try again to install bleeding edge pyam

* try to download quietly

* try again

* try again

* try again

* remove help

* try with updated version of pytest

* better comments in ci

* Handle missing keys in Reporter.from_scenario

* Also use add(..., strict=True) for REPORTS in Reporter.from_scenario
- rm hist params
- other functions implemented, hanging observed
- reporting now passes without land use
- readd landuse
- remove old assert graph len
- finish adding new products
- Add check for scenario with solution
- Now handles both pyam and ixmp Quantity
- Add westeros_report tutorial
- Add to tests and RELEASE_NOTES.md
- Add reporting tutorial to tutorials README
- Install tutorial deps on Travis & AppVeyor
- example changes: Modified the units and typo errors
- update installation tutorials: Notice to the user to be aware in which version he or she is currently in, in order to download the most updated tutorials.
- update README.rst in tutorials folder: Edited a note box according to Paul's suggestion
* Add consistent structure/order and per-requisites to tutorials

* Minor change in wording for flexibility requirements

* Add description on defining values of a new parameter (emission bound)

* Edit README, RELEASE_NOTES, and ordered lists
- Change reporting.__init__ to add new mappings
- Rename 'n' dimension to 'nl' for addon quantities in reporting.__init__
- Remove extra dimension name changes.
- Update test_reporting and test_tutorial.
- Update release notes
- Simplify add-on broadcast.
- Expand doc of automatic reporting for add-on techs.

Co-authored-by: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Avoids accidental reference to the set of years.
khaeru added a commit that referenced this pull request Jan 12, 2021
@khaeru khaeru merged commit 4e311c4 into master Jan 17, 2021
@khaeru khaeru deleted the message-ix-filtered branch January 17, 2021 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Transfer and refactor code from message_ix.reporting
7 participants