Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pytest-legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
poetry add matplotlib-inline@0.1.7 --lock
poetry add numpy@1.26.2 --lock
poetry add pandas@2.1.2 --lock
poetry add pint@0.13 --lock
poetry add pint@0.16 --lock
poetry add xlrd@2.0.1 --lock --group optional_io_formats
poetry add xlsxwriter@3.0.3 --lock

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
- '3.11'
- '3.12'
- '3.13'
- '3.14'

fail-fast: false

Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
#------------------------
- name: Install library
run: |
poetry self add "poetry-dynamic-versioning[plugin]" &&
poetry self add "poetry-dynamic-versioning[plugin]" &&
poetry install --no-interaction --with calamine,dev,optional_io_formats,optional_plotting,tutorials,wbdata

# run tests without Matplotlib & CodeCode tests on earlier Python versions
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2017-2025 IIASA and the pyam developer team
Copyright 2017-2026 IIASA and the pyam developer team

The **pyam** package is licensed under the Apache License, Version 2.0 (the "License");
you may not use the package except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pyam: analysis & visualization <br /> of integrated-assessment and macro-energy scenarios
=========================================================================================

Copyright 2017-2025 IIASA and the pyam developer team
Copyright 2017-2026 IIASA and the pyam developer team
Licensed under the Apache License, Version 2.0;
see [LICENSE](LICENSE) and [NOTICE](NOTICE.md) for details.

Expand All @@ -12,7 +12,7 @@ see [LICENSE](LICENSE) and [NOTICE](NOTICE.md) for details.

<!-- replace python version by dynamic reference to pypi once Python versions are configured there -->
[![Code style: ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
[![python](https://img.shields.io/badge/python-≥3.10,<3.14-blue?logo=python&logoColor=white)](https://github.com/IAMconsortium/pyam)
[![python](https://img.shields.io/badge/python-≥3.10,<3.15-blue?logo=python&logoColor=white)](https://github.com/IAMconsortium/pyam)
[![pytest](https://img.shields.io/github/actions/workflow/status/iamconsortium/pyam/pytest.yml?logo=GitHub&label=pytest)](https://github.com/IAMconsortium/pyam/actions/workflows/pytest.yml)
[![ReadTheDocs](https://readthedocs.org/projects/pyam-iamc/badge/?version=latest)](https://pyam-iamc.readthedocs.io/en/latest/?badge=latest)
[![codecov](https://codecov.io/gh/IAMconsortium/pyam/branch/main/graph/badge.svg)](https://codecov.io/gh/IAMconsortium/pyam)
Expand Down Expand Up @@ -57,7 +57,7 @@ a timeseries format for *yearly data* developed and used by the
| ... | ... | ... | ... | ... | ... | ... | ... |

*An illustration of the IAMC template using a scenario
from the [CD-LINKS](https://www.cd-links.org) project*
from the [CD-LINKS](https://www.cd-links.org) project*
*via the The [IAMC 1.5°C Scenario Explorer](https://data.ece.iiasa.ac.at/iamc-1.5c-explorer)*

#### Subannual time resolution
Expand Down
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Next Release

- [#961](https://github.com/IAMconsortium/pyam/pull/961) Support Python 3.14 and bump dependencies
- [#946](https://github.com/IAMconsortium/pyam/pull/946) Handle plot-styling by meta indicators with `np.nan`
- [#944](https://github.com/IAMconsortium/pyam/pull/944) Refactor to a `format_n()` function for nice log messages
- [#943](https://github.com/IAMconsortium/pyam/pull/943) Improved handling for division by zero
Expand Down
4,353 changes: 2,227 additions & 2,126 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyam/plotting.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def assign_style_props(df, color=None, marker=None, linestyle=None, cmap=None):
values = list(d.values())
# find if any colors in our properties corresponds with special colors
# we know about
overlap_idx = np.in1d(values, list(PYAM_COLORS.keys()))
overlap_idx = np.isin(values, list(PYAM_COLORS.keys()))
if overlap_idx.any(): # some exist in our special set
keys = np.array(list(d.keys()))[overlap_idx]
values = np.array(values)[overlap_idx]
Expand Down
2 changes: 1 addition & 1 deletion pyam/timeseries.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def cross_threshold(

# it year (as int) is returned, add one because int() rounds down
if return_type is int:
return [y + 1 for y in map(int, years)]
return [int(y[0]) + 1 for y in years]
return years


Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ authors = [
]
license = "Apache-2.0"
readme = "README.md"
requires-python = ">=3.10, <3.14"
requires-python = ">=3.10, <3.15"
repository = "https://github.com/IAMconsortium/pyam"
classifiers = [
"Development Status :: 5 - Production/Stable",
Expand All @@ -44,8 +44,8 @@ dependencies = [
"matplotlib>=3.6.0",
"numpy>=1.26.0",
"openpyxl>=3.1.2",
"pandas>=2.1.2",
"Pint>=0.13",
"pandas>=2.1.2, <3.0.0",
"Pint>=0.16",
"PyYAML>=6.0.1",
"scipy>=1.10.0",
"seaborn>=0.11",
Expand Down
Loading