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

Fix AreaDefinition usage to work with newer versions of pyresample #554

Merged
merged 2 commits into from Jan 22, 2019

Conversation

djhoese
Copy link
Member

@djhoese djhoese commented Dec 16, 2018

AreaDefinitions argument names have changed. A lot of my usages of AreaDefinition specified x_size and y_size but these have been changed to width and height in pytroll/pyresample#138 to match the areas.yaml format. This PR fixes all uses of those arguments by name.

This PR should probably only be merged after that pyresample PR is merged and released to be sure I fixed everything.

  • Tests added
  • Tests passed
  • Passes git diff origin/master -- "*py" | flake8 --diff

AreaDefinitions argument names have changed.
@djhoese djhoese added the bug label Dec 16, 2018
@djhoese djhoese self-assigned this Dec 16, 2018
@coveralls
Copy link

coveralls commented Dec 16, 2018

Coverage Status

Coverage increased (+0.01%) to 77.445% when pulling 2f96ca3 on djhoese:bugfix-new-resample into 417b29f on pytroll:master.

@codecov
Copy link

codecov bot commented Dec 16, 2018

Codecov Report

Merging #554 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #554      +/-   ##
==========================================
+ Coverage   77.43%   77.44%   +0.01%     
==========================================
  Files         136      136              
  Lines       19143    19153      +10     
==========================================
+ Hits        14823    14833      +10     
  Misses       4320     4320
Impacted Files Coverage Δ
satpy/tests/writer_tests/test_mitiff.py 95.55% <ø> (ø) ⬆️
satpy/readers/hrit_jma.py 98.43% <ø> (ø) ⬆️
satpy/tests/writer_tests/test_scmi.py 97.08% <ø> (ø) ⬆️
satpy/tests/test_resample.py 98.89% <ø> (ø) ⬆️
satpy/tests/test_multiscene.py 94.33% <ø> (ø) ⬆️
satpy/readers/geocat.py 91.72% <ø> (ø) ⬆️
satpy/tests/reader_tests/test_utils.py 75.89% <ø> (ø) ⬆️
satpy/tests/test_scene.py 99.32% <100%> (ø) ⬆️
satpy/scene.py 84.13% <0%> (+0.06%) ⬆️
satpy/readers/__init__.py 94.46% <0%> (+0.07%) ⬆️
... and 2 more

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 417b29f...2f96ca3. Read the comment docs.

@djhoese
Copy link
Member Author

djhoese commented Jan 22, 2019

I tested this with the current pyresample master in a separate branch and all tests pass. That means that current tests pass with both the old version of pyresample and the soon-to-be-released version of pyresample.

@djhoese djhoese merged commit 630cc37 into pytroll:master Jan 22, 2019
@djhoese djhoese deleted the bugfix-new-resample branch January 22, 2019 17:44
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.

None yet

2 participants