/matplotlib

better freetype version checking #6803

Merged
merged 2 commits into from Jul 20, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  v2.0.0
4 participants
@prinsherbert @WeatherGod @mdboom @QuLogic
@prinsherbert

prinsherbert commented Jul 20, 2016

No description provided.

Herbert Kruitbosch better freetype version checking

All checks have passed

3 successful checks
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage remained the same at 70.367%
Details
009ea6d

mdboom added the needs_review label Jul 20, 2016

prinsherbert referenced this pull request Jul 20, 2016

Closed

check freetype version also specifies what is wrong #6403

@prinsherbert

prinsherbert commented Jul 20, 2016

continuation of #6403, to fix the commit message log - as an alternative git rebase.

@mdboom mdboom and 2 others commented on an outdated diff Jul 20, 2016

View full outdated diff
lib/matplotlib/__init__.py
@@ -1570,7 +1570,15 @@ def _init_tests():
warnings.warn(
"matplotlib is not built with the correct FreeType version to run "
"tests. Set local_freetype=True in setup.cfg and rebuild. "
- "Expect many image comparison failures below.")
+ "Expect many image comparison failures below. "
+ "Expected freetype version {0}. "
+ "Found freetype version {1}."
@mdboom

mdboom Jul 20, 2016

Owner

Space after period.

@prinsherbert

prinsherbert Jul 20, 2016

This was also not the case in the original, so I don't see the problem.

@WeatherGod

WeatherGod Jul 20, 2016

Member

What was not the case in the original? The original had spaces between sentences. This one is missing a space between two sentences.

@WeatherGod

WeatherGod Jul 20, 2016

Member

And, don't worry. We won't ask you to rebase/squash for this. It was only to clean out a messy revision history. Fixing one little thing doesn't need a rebase/squash in my opinion.
Herbert Kruitbosch space between sentences

Some checks were not successful

1 errored and 2 successful checks
continuous-integration/appveyor/pr — AppVeyor build cancelled
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage remained the same at 70.367%
Details
2806128
@WeatherGod
Member

WeatherGod commented Jul 20, 2016

All the appveyor jobs are still queued. I am going to go ahead and just merge this.

@WeatherGod WeatherGod merged commit 96003f9 into matplotlib:master Jul 20, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 70.367%
Details

mdboom removed the needs_review label Jul 20, 2016

@WeatherGod WeatherGod added a commit that referenced this pull request Jul 20, 2016

@WeatherGod WeatherGod Merge pull request #6803 from prinsherbert/freetype-version-check 
better freetype version checking
 ca5324c
@WeatherGod
Member

WeatherGod commented Jul 20, 2016

backported to v2.x as ca5324c
@WeatherGod
Member

WeatherGod commented Jul 20, 2016

@prinsherbert, thank you for bearing with us through the review process.
@prinsherbert

prinsherbert commented Jul 20, 2016

Thank you for merging!

QuLogic added this to the 2.0 (style change major release) milestone Jul 20, 2016

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