Skip to content

Commit

Permalink
moving line from #349 to correct place in release notes
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhuppmann committed Mar 21, 2020
1 parent 438279e commit 7405bf1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions RELEASE_NOTES.md
@@ -1,8 +1,6 @@
# Next release

## API changes
PR [#349](https://github.com/IAMconsortium/pyam/pull/349) changed how appending
checks that time columns are equal.

PR [#341](https://github.com/IAMconsortium/pyam/pull/341) changed
the API of `IamDataFrame.convert_unit()` from a dictionary to explicit kwargs
Expand All @@ -17,6 +15,7 @@ an IamDataFrame with `n/a` entries in columns other than `value` raises an error

## Individual Updates

- [#349](https://github.com/IAMconsortium/pyam/pull/349) Fixes an issue with checking that time columns are equal when appending IamDataFrames
- [#348](https://github.com/IAMconsortium/pyam/pull/348) Extend pages for API docs, clean up docstrings, and harmonize formatting
- [#347](https://github.com/IAMconsortium/pyam/pull/347) Enable contexts and custom UnitRegistry with unit conversion
- [#341](https://github.com/IAMconsortium/pyam/pull/341) Use `pint` and IIASA-ene-units repo for unit conversion
Expand Down
5 changes: 2 additions & 3 deletions tests/test_feature_append_rename.py
Expand Up @@ -64,8 +64,7 @@ def test_append_other_scenario(test_df):


def test_append_reconstructed_time(test_df):
# This tests that dfs with identical time cols created by different methods
# can be appended
# check appending dfs with equal time cols created by different methods
other = test_df.filter(scenario='scen_b')\
.rename({'scenario': {'scen_b': 'scen_c'}})
other.time_col = other.time_col[0:1] + other.time_col[1:]
Expand All @@ -85,7 +84,7 @@ def test_append_same_scenario(test_df):
# check that non-matching meta raise an error
pytest.raises(ValueError, test_df.append, other=other)

# check that ignoring meta conflict works as expetced
# check that ignoring meta conflict works as expected
df = test_df.append(other, ignore_meta_conflict=True)

# check that the new meta.index is updated, but not the original one
Expand Down

0 comments on commit 7405bf1

Please sign in to comment.