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.

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

Add AR6 category colors to PYAM_COLORS #650

Merged
merged 8 commits into from
Apr 6, 2022
Merged

Conversation

jkikstra
Copy link
Collaborator

@jkikstra jkikstra commented Apr 5, 2022

Description of PR

Adds the AR6 Category and IMP colours to pyam.

@gidden
Copy link
Member

gidden commented Apr 5, 2022

Thanks so much, @jkikstra! Can you also update the plot used to test against (and confirm it looks correct)? Instructions to do so should be in the test folder and can be executed on the single file/test of interest.

@jkikstra
Copy link
Collaborator Author

jkikstra commented Apr 5, 2022

Have updated the test figures.
As expected, only https://github.com/IAMconsortium/pyam/blob/56fcc56f6f38fdd9f089074379babbfb33c9a476/tests/expected_figs/test_line_PYAM_COLORS.png changed.

Tests locally are failing, but that seems to be due to pint and/or pandas_datareader, so should not really part of this PR.

@danielhuppmann
Copy link
Member

danielhuppmann commented Apr 6, 2022

Thanks @jarmo! I pinned pint as a quickfix, this should resolve the failing unit tests in this PR.

Could you please do the following:

  • Revert the latest commit and then commit only the one changed figure to this branch
  • Add a comment in each line explaining the meaning of the abbreviations and a reference to the description or source in the AR6 WG3 report, so that users have a chance to know what "C2" or "IMP-Neg" are...
  • Add a line to the release notes

Then good to go, and I think this is a nice feature addition that warrants a new release (which I will take of).

@codecov
Copy link

codecov bot commented Apr 6, 2022

Codecov Report

Merging #650 (b82fe83) into main (fff690e) will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff          @@
##            main    #650   +/-   ##
=====================================
  Coverage   94.5%   94.5%           
=====================================
  Files         57      57           
  Lines       5662    5662           
=====================================
  Hits        5356    5356           
  Misses       306     306           
Impacted Files Coverage Δ
pyam/plotting.py 92.9% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fff690e...b82fe83. Read the comment docs.

@jkikstra
Copy link
Collaborator Author

jkikstra commented Apr 6, 2022

Hi Daniel and Matt, thanks for the guidance.

I did that now.

Tried to also update the python notebook that is part of the docs, ipcc_colors.ipynb, but my IIASA desktop seems unhappy due to some dll issue in my venv, so would probably be more efficient if I leave that quick update to you.
image

@danielhuppmann danielhuppmann marked this pull request as ready for review April 6, 2022 13:31
Copy link
Member

@danielhuppmann danielhuppmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @jkikstra for adding the colors and docs!

The IPCC-colors tutorial notebook is run automatically as part of building the docs, so this will show the added AR6 colors. No need to change anything explicitly.

@danielhuppmann danielhuppmann merged commit 3ad1a9e into main Apr 6, 2022
@danielhuppmann danielhuppmann deleted the add-ar6-colours branch April 6, 2022 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants