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

Backports for 0.20.x #2059

Merged
merged 5 commits into from
Jun 29, 2022
Merged

Backports for 0.20.x #2059

merged 5 commits into from
Jun 29, 2022

Conversation

dopplershift
Copy link
Contributor

@dopplershift dopplershift commented Jun 28, 2022

Remove use of setuptools_scm_git_archive
@QuLogic
Copy link
Member

QuLogic commented Jun 28, 2022

Should we backport the couple other things tagged with 0.20.3?

@dopplershift
Copy link
Contributor Author

Do we want to make a 0.20.3 or a 0.20.2.post1?

Copy link
Contributor

@greglucas greglucas left a comment

Choose a reason for hiding this comment

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

I'd vote for a .post1 release here just to unbreak the pip installs. There might need to be a few other backports and conflicts to mess around with if we try to do a new minor release that I'm not sure are worthwhile here...

@QuLogic
Copy link
Member

QuLogic commented Jun 28, 2022

It's just that we have broken tests now; it might be good to backport those fixes as well...

greglucas and others added 2 commits June 28, 2022 14:11
Change to assert_allclose instead of assert_almost_equal to test
small changes as recommended by Numpy's testing docs. This is due
to small tolerance changes with PROJ 9.0.1.
These only minimally changed with a shifting of the dashes in the
gridlines, but no substantive changes.
@dopplershift dopplershift added this to the 0.20.3 milestone Jun 28, 2022
@dopplershift dopplershift changed the title Backport pull request #2057 Backports for 0.20.x Jun 28, 2022
@dopplershift
Copy link
Contributor Author

I don't understand. One fails with test_examples::test_contour_label and the other test_crs.py::test_igh_[ocean|land].

@greglucas
Copy link
Contributor

Might be due to different pins on the previous branch?
Might backport this too: 477e7f3

@dopplershift
Copy link
Contributor Author

All versions failing (at least last time) were Matplotlib 3.5.2, which is also passing on other runs. 😬 I also note now that ubuntu 3.8 failed a test after I added my debug output, and it didn't fail last time. Something non-deterministic is going on it seems...

@dopplershift
Copy link
Contributor Author

Oh swell, re-running finally fixed one of them.

@dopplershift
Copy link
Contributor Author

I figured it out: PROJ 8 vs. 9 apparently triggers a few minor image changes. There's an ambiguity in solving where you can either get either PROJ 9 and owslib 0.25 or PROJ 8 and owslib 0.26.

I don't think I can express just how much I hate software right now. (╯°□°)╯︵ ┻━┻

Depending on the values input to Nightshade, the floating point
precision could put the range for arccos outside of [-1, 1], which
in turn numpy returns as nan's, yielding bad geometries further
downstream. This patch clips the arccos calculations to [-1, 1] to
guarantee we aren't out of the valid floating point bounds.
@greglucas
Copy link
Contributor

You are far braver than I to venture into the backporting world ;) I would have taken the easy way out and pushed a .post1 😂

@dopplershift
Copy link
Contributor Author

Honestly, the backports have been easy. Figuring out why CI is failing is...so annoying.

I share @QuLogic's unease with cutting a release from failing tests...

lib/cartopy/tests/mpl/test_crs.py Outdated Show resolved Hide resolved
lib/cartopy/tests/mpl/test_crs.py Outdated Show resolved Hide resolved
Apparently the images change between PROJ 9.0.0 and 9.0.1
@dopplershift
Copy link
Contributor Author

So apparently it's actually a change produced by PROJ 9.0.1 vs. 9.0.0. On Python 3.7, we can only install PROJ 9.0.0 because the only versions of pyproj that have been recompiled for PROJ 9.0.1 don't support Python 3.7. 😱

Therefore for this branch (and I think it should stay here) I included the PROJ version in the check for an appropriate tolerance.

@QuLogic
Copy link
Member

QuLogic commented Jun 29, 2022

Strange that didn't come up in #2051.

@dopplershift
Copy link
Contributor Author

@QuLogic Well, they're the tests I fixed in #2058, but I assumed it was due to matplotlib. The tests were failing in #2056, we just didn't worry about fixing them there.

@dopplershift
Copy link
Contributor Author

🎉 @greglucas @QuLogic

Not sure why it finally passed, but it did. I've been unable to reproduce the series of failures locally in a VM.

Regardless, if someone can merge we can cut 0.20.3!

@greglucas greglucas merged commit 3fd85aa into SciTools:v0.20.x Jun 29, 2022
@dopplershift dopplershift deleted the backport-2057 branch June 29, 2022 02:18
@greglucas
Copy link
Contributor

Lets hope it stays that way once merged too :)

@dopplershift, go ahead and make the release. Thanks for doing all that work with CI and backporting!

@dopplershift
Copy link
Contributor Author

Note to self: backporting like this makes the autogenerated release notes basically useless.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants