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

Compatibility with PyProj v2.6.0 #258

Merged
merged 2 commits into from
Mar 19, 2020
Merged

Conversation

avalentino
Copy link
Contributor

@avalentino avalentino commented Mar 19, 2020

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

@coveralls
Copy link

Coverage Status

Coverage remained the same at 91.902% when pulling 7928e24 on avalentino:pyproj26-compat into ef22d21 on pytroll:master.

@avalentino
Copy link
Contributor Author

avalentino commented Mar 19, 2020

OK, the problem on OSX seems to be not related to this PR.
Also on my branch all seems to work correctly [1].

Can someone please re-trigger a new test on Travis?

[1] https://travis-ci.org/github/avalentino/pyresample/builds/664359903

Copy link
Member

@djhoese djhoese left a comment

Choose a reason for hiding this comment

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

Thanks for this. You're right that the tests are not your fault and are an upstream libtiff/libwebp issue. Otherwise I think this all works for me. I should really rewrite this code to depend on pyproj's cython exports directly. They didn't exist when I first wrote this.

@mraspaud
Copy link
Member

@djhoese do we have an issue for this ?

Copy link
Member

@mraspaud mraspaud left a comment

Choose a reason for hiding this comment

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

LGTM

@avalentino
Copy link
Contributor Author

avalentino commented Mar 19, 2020

@mraspaud , in case you are interested in, there is a debian bug for this [1].
It has been discovered after the update of pyproj in the debian archive.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954219

@mraspaud
Copy link
Member

@avalentino thanks! I was thinking about having an issue regarding the usage of cython exports directly, sorry for being unclear.

@djhoese
Copy link
Member

djhoese commented Mar 19, 2020

No I don't think there is. It was one of those things that since it isn't broken I wasn't going to worry about fixing it since it would be a lot of research and time potentially.

@mraspaud
Copy link
Member

Ok, merging this. @avalentino thank you for the quick PR!

@mraspaud mraspaud merged commit 389ef08 into pytroll:master Mar 19, 2020
@mraspaud mraspaud added the bug label Mar 19, 2020
@djhoese
Copy link
Member

djhoese commented Mar 19, 2020

So I know this is merged but I looked up what options there are from loading from the cython module directly. It looks like this could be replaced with from pyproj._proj cimport _Proj (note the cimport). However, given the small things I have customized in ll2cr with how I use Proj, this refactor should wait until we have a hard requirement on a newer Pyproj. Newer versions of Pyproj (I think) keep lat/lon degrees as degrees and it wouldn't copy arrays which is exactly what I wanted.

@avalentino avalentino deleted the pyproj26-compat branch October 24, 2020 10:02
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.

4 participants