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

Inherit metadata when resampling and grouping #23

Merged
merged 15 commits into from
Dec 21, 2020
Merged

Inherit metadata when resampling and grouping #23

merged 15 commits into from
Dec 21, 2020

Commits on Dec 7, 2020

  1. Call finalize in all constructors to inherit metadata. 

    Prepare tests for upcoming pandas==1.1.1 functionality: inherit metadata when resampling and grouping.
    @Flix6x
    Flix6x committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    035d57f View commit details
    Browse the repository at this point in the history

  2. Update reference in test. 

    Add pandas test.
    @Flix6x
    Flix6x committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    c56d7cc View commit details
    Browse the repository at this point in the history

  3. Finish rebase.

    @Flix6x
    Flix6x committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    5b24bec View commit details
    Browse the repository at this point in the history

  4. Complete the ordering of BeliefSources by name.

    @Flix6x
    Flix6x committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    96163ee View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2020

  1. Fix computation order.

    @Flix6x
    Flix6x committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    939e023 View commit details
    Browse the repository at this point in the history

  2. Workaround for aggregation function when resampling.

    @Flix6x
    Flix6x committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    1007af8 View commit details
    Browse the repository at this point in the history

  3. Fix tests: 

    - Separate tests for mean resampling and aggregate resampling.
- Separate tests for temporary attributes and subclass attributes.
- Test metadata propagation for groupby of subclassed DataFrames.
    @Flix6x
    Flix6x committed Dec 9, 2020
    Configuration menu
    Copy the full SHA
    e72ef14 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2020

  1. Update pandas dependency. 

    Drop support for pandas<1.1.5.
Bump timely-beliefs version with major release.
    @Flix6x
    Flix6x committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    7437996 View commit details
    Browse the repository at this point in the history

  2. Prepare dtype test for empty frames.

    @Flix6x
    Flix6x committed Dec 10, 2020
    Configuration menu
    Copy the full SHA
    5dce22d View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. Add comment about which pandas version fixed test_groupby_retains_met… 

    …adata.
    @Flix6x
    Flix6x committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    4987ff5 View commit details
    Browse the repository at this point in the history

  2. Rename downsampling function.

    @Flix6x
    Flix6x committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    6b7907c View commit details
    Browse the repository at this point in the history

  3. Simplify calls to for_each_belief.

    @Flix6x
    Flix6x committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    5f7abf1 View commit details
    Browse the repository at this point in the history

  4. Fix plotting integer values (int64 is not JSON serializable).

    @Flix6x
    Flix6x committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    a1acd48 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2020

  1. Add reference in test docs to relevant pandas issue.

    @Flix6x
    Flix6x committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    0db3886 View commit details
    Browse the repository at this point in the history

  2. Issue 35 metadata lost on multiplication (#43) 

    This PR adds no additional logic, only a test to check whether Issue #35 is successfully resolved (plus some refactoring of test util functions). Note that this is a merge into resample-while-keeping-metadata, and that branch (with PR #23) actually contains the logic that resolves this issue (as a side effect, because I was actually addressing deeper issues there: #22 and #26).

* Refactor metadata propagation checks to util function.

* Add test for metadata propagation upon multiplication (GH 35).

Co-authored-by: F.N. Claessen <[email protected]>
    @Flix6x
    Flix6x and Flix6x authored Dec 21, 2020
    Configuration menu
    Copy the full SHA
    41a06ab View commit details
    Browse the repository at this point in the history