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.

Sign up for GitHub

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

Jump to bottom

Include meta in new IamDataFrames returned by aggregation functions #416

Merged
merged 18 commits into from Jul 27, 2020
Merged

Include meta in new IamDataFrames returned by aggregation functions #416

merged 18 commits into from Jul 27, 2020

Commits on Jul 15, 2020

  1. use ConnectionError when checking for availability of IIASA database API

    @danielhuppmann
    danielhuppmann committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    886ed00 View commit details
    Browse the repository at this point in the history

  2. add meta to test IamDataFrame instance

    @danielhuppmann
    danielhuppmann committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    09f26f5 View commit details
    Browse the repository at this point in the history

  3. fix tests for reading ssp/rcp snapshots

    @danielhuppmann
    danielhuppmann committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    604cc69 View commit details
    Browse the repository at this point in the history

  4. migrate META_COLS to conftest

    @danielhuppmann
    danielhuppmann committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    8ec9ab8 View commit details
    Browse the repository at this point in the history

  5. move merging meta dataframes to utils.py

    @danielhuppmann
    danielhuppmann committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    f940ae8 View commit details
    Browse the repository at this point in the history

  6. remove unused import

    @danielhuppmann
    danielhuppmann committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    8a9175a View commit details
    Browse the repository at this point in the history

  7. fix tests to include meta in test instance

    @danielhuppmann
    danielhuppmann committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    e7a6df4 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. add feature to pass meta to IamDataFrame init

    @danielhuppmann
    danielhuppmann committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    1c2e14d View commit details
    Browse the repository at this point in the history

  2. update IamDataFrame init docstring for how to pass meta

    @danielhuppmann
    danielhuppmann committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    3fe3ea2 View commit details
    Browse the repository at this point in the history

  3. pass meta to new IamDataFrame returned by aggregation functions

    @danielhuppmann
    danielhuppmann committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    4857a4e View commit details
    Browse the repository at this point in the history

  4. update tests to include meta columns

    @danielhuppmann
    danielhuppmann committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    a844bcf View commit details
    Browse the repository at this point in the history

  5. formatting clean-up

    @danielhuppmann
    danielhuppmann committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    9758354 View commit details
    Browse the repository at this point in the history

  6. make _make_index() work with both index and columns

    @danielhuppmann
    danielhuppmann committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    fb8297c View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2020

  1. add to release notes

    @danielhuppmann
    danielhuppmann committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    f3fb877 View commit details
    Browse the repository at this point in the history

  2. harmonize some docstrings

    @danielhuppmann
    danielhuppmann committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    80afc14 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2020

  1. extend docstrings per suggestion by @znicholls

    @danielhuppmann
    danielhuppmann committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    5bbf36e View commit details
    Browse the repository at this point in the history

  2. add explicit test for merge_meta()

    @danielhuppmann
    danielhuppmann committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    6dfe716 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. appease stickler

    @danielhuppmann
    danielhuppmann committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    bdb3461 View commit details
    Browse the repository at this point in the history