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

Refactor colormap creation #2313

Merged
merged 6 commits into from
Jan 11, 2023
Merged

Conversation

gerritholl
Copy link
Collaborator

@gerritholl gerritholl commented Dec 6, 2022

Refactor colormap creation. Move functionality to trollimage where appropriate, and in particular where it's duplicated.

Bump trollimage version to 1.20 due to the requirement of pytroll/trollimage#117.

Started to work on refactoring colormap creation.  Move functionality to
trollimage where appropriate and in particular where it's duplicated.
Still a work in progress.
Move functionality from ColormapCompositor.build_colormap to trollimage
@gerritholl gerritholl marked this pull request as ready for review December 12, 2022 17:46
@mraspaud
Copy link
Member

Since this depends on new features in trollimage, I think we should set the min version of trollimage in setup.py accordingly, right?

Fix the trollimage dependency to require at least 1.20, due to the
colormap refactoring.
@gerritholl
Copy link
Collaborator Author

Since this depends on new features in trollimage, I think we should set the min version of trollimage in setup.py accordingly, right?

Changed trollimage version to 1.20 in 24db9d3.

@codecov
Copy link

codecov bot commented Jan 11, 2023

Codecov Report

Merging #2313 (1a0392b) into main (f7e056d) will increase coverage by 0.22%.
The diff coverage is 90.00%.

@@            Coverage Diff             @@
##             main    #2313      +/-   ##
==========================================
+ Coverage   94.36%   94.59%   +0.22%     
==========================================
  Files         310      314       +4     
  Lines       46641    47484     +843     
==========================================
+ Hits        44014    44916     +902     
+ Misses       2627     2568      -59     
Flag Coverage Δ
behaviourtests 4.50% <20.00%> (-0.09%) ⬇️
unittests 95.21% <90.00%> (+0.20%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
satpy/enhancements/__init__.py 98.96% <85.71%> (-0.19%) ⬇️
satpy/composites/__init__.py 90.45% <100.00%> (+0.20%) ⬆️
satpy/composites/ahi.py 0.00% <0.00%> (-100.00%) ⬇️
satpy/readers/ahi_hsd.py 97.50% <0.00%> (-0.36%) ⬇️
satpy/utils.py 24.92% <0.00%> (-0.15%) ⬇️
satpy/readers/utils.py 91.95% <0.00%> (ø)
satpy/readers/eum_base.py 89.79% <0.00%> (ø)
satpy/readers/hrit_base.py 86.23% <0.00%> (ø)
satpy/composites/spectral.py 100.00% <0.00%> (ø)
satpy/readers/ahi_l1b_gridded_bin.py 100.00% <0.00%> (ø)
... and 15 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@coveralls
Copy link

Coverage Status

Coverage: 95.172% (+0.2%) from 94.957% when pulling 1a0392b on gerritholl:refactor-colormap into f7e056d on pytroll:main.

@gerritholl
Copy link
Collaborator Author

codecov would seem to be confused, but considering I removed tested code, it's plausible that the total code coverage goes down

@mraspaud
Copy link
Member

Just waiting on a conda-forge release before we merge this

@mraspaud mraspaud added enhancement code enhancements, features, improvements component:enhancements labels Jan 11, 2023
@mraspaud mraspaud merged commit 303fe36 into pytroll:main Jan 11, 2023
@gerritholl gerritholl deleted the refactor-colormap branch January 11, 2023 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:enhancements enhancement code enhancements, features, improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unify colormap creations
3 participants