Skip to content

Conversation

@jenshnielsen
Copy link
Member

this turned out to be more painful than usual because both branches modified the test images for mathtext 31. I have regenerated these here.

jenshnielsen and others added 11 commits January 19, 2016 08:58
Fixes link checker issue in documentation
DOC: Fix issue with Sphinx 1.3.4

Discarded changes to .travis.yml from matplotlib#5872
Remove reference to changelog from frontpage
mathtext: Fix bugs in conversion of apostrophes to primes
…tion

DOC: add function name to deprecation warning
Fix reading/writing from urllib.request objects

This backport needed to exclude nbagg optimizations.
Merge pull request matplotlib#5910 from mdboom/image-read-from-url
Backport Merge pull request matplotlib#5620 from tacaswell/fix_quiverkey
Copy link
Member

Choose a reason for hiding this comment

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

Just checking, was this brace formatting used in v1.5.x?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. This is a merge of 1.5.x to 2.x

Copy link
Member Author

Choose a reason for hiding this comment

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

It's part of #5915

Copy link
Member

Choose a reason for hiding this comment

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

Right, so the point is that '{}' can't be used in v1.5.x branch. Same thing with my comment about the backport I just merged into 1.5.x.

@WeatherGod
Copy link
Member

I'll put together a PR that fixes the formatting stuff in v1.5.x.

@jenshnielsen
Copy link
Member Author

@WeatherGod Thanks, sorry for missing that

@WeatherGod
Copy link
Member

The fix for them is in #5935.

WeatherGod added a commit that referenced this pull request Jan 28, 2016
@WeatherGod WeatherGod merged commit 9ecd876 into matplotlib:v2.x Jan 28, 2016
@jenshnielsen jenshnielsen deleted the merge15xto2xconflict branch January 28, 2016 16:37
@QuLogic QuLogic added this to the 2.0 (style change major release) milestone Jan 28, 2016
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.

6 participants