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

Backport PRs for 0.20.1 #1904

Merged
merged 8 commits into from
Oct 8, 2021
Merged

Backport PRs for 0.20.1 #1904

merged 8 commits into from
Oct 8, 2021

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Oct 8, 2021

Rationale

At the very least, we should release with #1899 for fixing tests with latest Matplotlib. Maybe just waiting for one more thing on the milestone.

Implications

Bug fixes.

QuLogic and others added 7 commits October 5, 2021 23:52
Due to a change [1] after beta1, this image has altered somewhat.

[1] matplotlib/matplotlib#19619
The test tolerance is too high, and random other changes have crept in
so that some show numbers that are completely different from the
reference image.

* 726ebac changed the `Mercator`
  projection in `test_set_xyticks` to use the default globe, which
  changed the text of the ticks from degree-ish to metres.
* Ticks are quite clearly requested at 30° increments in
  `test_set_yticks_cylindrical`, so they definitely should not be at
  ±31/75°.
* Also, fix some small inconsistencies in the tests.
added missing shapefile group to download script
Due to a change [1] after beta1, this image has altered somewhat.

[1] matplotlib/matplotlib#19619
instead of hard-coding PlateCarree.
@QuLogic QuLogic added this to the 0.20.1 milestone Oct 8, 2021
@greglucas
Copy link
Contributor

Is there anything not included here? Could we just branch off of the current master for v0.20.x

@QuLogic
Copy link
Member Author

QuLogic commented Oct 8, 2021

Lots of refactoring in master

@@ -26,11 +26,11 @@

import fnmatch
import os
import shutil

Choose a reason for hiding this comment

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

E402 module level import not at top of file

import subprocess
import warnings
from collections import defaultdict
from distutils.spawn import find_executable
from distutils.sysconfig import get_config_var
from sysconfig import get_config_var

Choose a reason for hiding this comment

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

E402 module level import not at top of file

@QuLogic
Copy link
Member Author

QuLogic commented Oct 8, 2021

I don't seem to be able to restart AppVeyor, but it seems unrelated. And the stickler CI bits can be ignored.

@greglucas greglucas merged commit 76882b3 into SciTools:v0.20.x Oct 8, 2021
@greglucas
Copy link
Contributor

Agreed that they are unrelated. Feel free to tag the v0.20.1 release whenever now. I think you've got all of the MPL 3.5 issues worked out, but I haven't built with the older freetype from master so I haven't done a full end-to-end test myself yet.

@QuLogic QuLogic deleted the backport-0.20 branch October 8, 2021 20:55
@QuLogic
Copy link
Member Author

QuLogic commented Oct 8, 2021

I haven't built with the older freetype from master so I haven't done a full end-to-end test myself yet.

You can just pip install matplotlib==3.5.0rc1 to get FreeType-bundled Matplotlib.

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

Successfully merging this pull request may close these issues.

3 participants