Skip to content

Commit

Permalink
Release candidate 1.3 (#610)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhuppmann committed Jan 25, 2022
1 parent c62ee8c commit 424a223
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 21 deletions.
2 changes: 1 addition & 1 deletion NOTICE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2017-2021 IIASA and the pyam developer team
Copyright 2017-2022 IIASA and the pyam developer team

The **pyam** package is licensed under
the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ doi: [10.21105/joss.01095](https://doi.org/10.21105/joss.01095).
License
-------

Copyright 2017-2021 IIASA and the pyam developer team
Copyright 2017-2022 IIASA and the pyam developer team

The **pyam** package is licensed
under the Apache License, Version 2.0 (the "License");
Expand Down
10 changes: 9 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# Next release
# Release v1.2.0

## Highlights

- Implement a `compute` module for derived timeseries indicators.
- Add a `diff()` method similar to the corresponding `pandas.DataFrame.diff()`
- Improve error reporting on IamDataFrame initialization

## Individual updates

- [#608](https://github.com/IAMconsortium/pyam/pull/608) The method `assert_iamframe_equals()` passes if an all-nan-col is present
- [#604](https://github.com/IAMconsortium/pyam/pull/604) Add an annualized-growth-rate method
Expand Down
7 changes: 0 additions & 7 deletions pyam/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,13 +418,6 @@ def dimensions(self):
"""Return the list of `data` columns (index names & data coordinates)"""
return list(self._data.index.names)

@property
def _LONG_IDX(self):
"""DEPRECATED - please use `IamDataFrame.dimensions`"""
# TODO: deprecated, remove for release >= 1.2
deprecation_warning("Use the attribute `dimensions` instead.", "This attribute")
return self.dimensions

def copy(self):
"""Make a deepcopy of this object
Expand Down
11 changes: 1 addition & 10 deletions pyam/units.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,8 @@ def extract_species(expr):
return SPECIES_ALIAS.get(species, species), units


def convert_gwp(context, qty, to):
def convert_gwp(metric, qty, to):
"""Helper for :meth:`convert_unit` to perform GWP conversions."""
# Remove a leading 'gwp_' to produce the metric name
if context is not None and context.startswith("gwp_"):
context = context[len("gwp_") :]
deprecation_warning(
f"Use context='{context}' instead",
type='Prefixing a context with "gwp_"',
stacklevel=5,
)
metric = context

# Extract the species from *qty* and *to*, allowing supported aliases
species_from, units_from = extract_species(qty[1])
Expand Down
1 change: 0 additions & 1 deletion tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ def test_unit_mapping(test_pd_df):
def test_dimensions(test_df):
"""Assert that the dimensions attribute works as expected"""
assert test_df.dimensions == IAMC_IDX + [test_df.time_col]
assert test_df._LONG_IDX == IAMC_IDX + [test_df.time_col]


def test_get_data_column(test_df):
Expand Down

0 comments on commit 424a223

Please sign in to comment.