diff --git a/.github/workflows/pytest-dependency.yml b/.github/workflows/pytest-dependency.yml index 505fa4cc5..398aaf39f 100644 --- a/.github/workflows/pytest-dependency.yml +++ b/.github/workflows/pytest-dependency.yml @@ -25,7 +25,7 @@ jobs: - name: Install specific out-dated version of dependencies # Update the package requirements when changing minimum dependency versions # Please also add a section "Dependency changes" to the release notes - run: pip install pandas==1.1.1 numpy==1.19.0 matplotlib==3.2.0 iam-units==2020.4.21 xlrd==2.0 + run: pip install pandas==1.1.1 numpy==1.19.0 matplotlib==3.5.0 iam-units==2020.4.21 xlrd==2.0 - name: Install other dependencies and package run: pip install -e .[tests,deploy,optional_plotting,optional_io_formats,tutorials] diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1ee4e88a4..a6d3d6385 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,8 @@ # Next release +- [#590](https://github.com/IAMconsortium/pyam/pull/590) Update expected figures of plotting tests to use matplotlib 3.5 +- [#586](https://github.com/IAMconsortium/pyam/pull/586) Improve error reporting for non-numeric data in any value column + # Release v1.2.0 ## Highlights @@ -16,7 +19,6 @@ was added as a dependency. ## Individual updates -- [#586](https://github.com/IAMconsortium/pyam/pull/586) Improve error reporting for non-numeric data in any value column - [#585](https://github.com/IAMconsortium/pyam/pull/585) Include revisions to the ORE manuscript source code following acceptance/publication - [#583](https://github.com/IAMconsortium/pyam/pull/583) Add profiler module for performance benchmarking - [#579](https://github.com/IAMconsortium/pyam/pull/579) Increase performance of IamDataFrame initialization diff --git a/install.bat b/install.bat index 780d9e823..1bdf18b19 100644 --- a/install.bat +++ b/install.bat @@ -1,7 +1,7 @@ python setup.py install -py.test tests +pytest tests pause exit diff --git a/pyam/plotting.py b/pyam/plotting.py index bf6e215a4..0afa92be2 100644 --- a/pyam/plotting.py +++ b/pyam/plotting.py @@ -437,7 +437,7 @@ def stack( def as_series(index, name): _idx = [i[0] for i in index] - return pd.Series([0] * len(index), index=_idx, name=name) + return pd.Series([0] * len(index), index=_idx, name=name, dtype="int") # determine all time-indices where a timeseries crosses 0 and add to data _rows = pd.concat( diff --git a/tests/README.md b/tests/README.md index 18d8301d0..b9dce4a0b 100644 --- a/tests/README.md +++ b/tests/README.md @@ -16,11 +16,11 @@ to be the same version. ## Creating Baseline Images ``` -py.test --mpl-generate-path=expected_figs test_plotting.py +pytest --mpl-generate-path=expected_figs test_plotting.py ``` ## Running tests ``` -py.test --mpl +pytest --mpl ``` diff --git a/tests/expected_figs/test_stackplot_negative.png b/tests/expected_figs/test_stackplot_negative.png index 669a9c00f..7229adb94 100644 Binary files a/tests/expected_figs/test_stackplot_negative.png and b/tests/expected_figs/test_stackplot_negative.png differ diff --git a/tests/expected_figs/test_stackplot_negative_emissions_kwargs_custom_total.png b/tests/expected_figs/test_stackplot_negative_emissions_kwargs_custom_total.png index 994489dde..c7a083714 100644 Binary files a/tests/expected_figs/test_stackplot_negative_emissions_kwargs_custom_total.png and b/tests/expected_figs/test_stackplot_negative_emissions_kwargs_custom_total.png differ diff --git a/tests/expected_figs/test_stackplot_negative_emissions_kwargs_def_total.png b/tests/expected_figs/test_stackplot_negative_emissions_kwargs_def_total.png index 14ee0f99d..bf0dde912 100644 Binary files a/tests/expected_figs/test_stackplot_negative_emissions_kwargs_def_total.png and b/tests/expected_figs/test_stackplot_negative_emissions_kwargs_def_total.png differ diff --git a/tests/expected_figs/test_stackplot_negative_emissions_with_total.png b/tests/expected_figs/test_stackplot_negative_emissions_with_total.png index f8d70fbe4..c9995fff1 100644 Binary files a/tests/expected_figs/test_stackplot_negative_emissions_with_total.png and b/tests/expected_figs/test_stackplot_negative_emissions_with_total.png differ