Skip to content

Fix regexp for dvipng version detection#14164

Merged
jklymak merged 1 commit intomatplotlib:masterfrom
timhoffm:fix-dvipng-version-regexp
May 12, 2019
Merged

Fix regexp for dvipng version detection#14164
jklymak merged 1 commit intomatplotlib:masterfrom
timhoffm:fix-dvipng-version-regexp

Conversation

@timhoffm
Copy link
Copy Markdown
Member

@timhoffm timhoffm commented May 7, 2019

PR Summary

dvipng --verision outputs in some recent version

This is dvipng 1.15 Copyright 2002-2015 Jan-Ake Larsson
dvipng 1.15
kpathsea version 6.2.3
Compiled with Freetype 2.8.1
Using libft 2.8.1
Copyright (C) 2002-2015 Jan-Ake Larsson.
There is NO warranty.  You may redistribute this software
under the terms of the GNU Lesser General Public License
version 3, see the COPYING file in the dvipng distribution
or <http://www.gnu.org/licenses/>.

This was not captured by the regexp. It probably assumed dvipng version 1.15 or similar. The changed regexp still accepts all the previous strings plus one with only a single space between dvipng and the version number.

This bug made @needs_usetex skip tests, claiming a missing TeX installation. Noticed from #14156.

@anntzer
Copy link
Copy Markdown
Contributor

anntzer commented May 7, 2019

Indeed, locally I have

This is dvipng (dvipng (TeX Live)) 1.15 Copyright 2002-2015 Jan-Ake Larsson
dvipng (dvipng (TeX Live)) 1.15
kpathsea version 6.3.0
Compiled with Freetype 2.9.0
Using libft 2.9.0
Copyright (C) 2002-2015 Jan-Ake Larsson.
There is NO warranty.  You may redistribute this software
under the terms of the GNU Lesser General Public License
version 3, see the COPYING file in the dvipng distribution
or <http://www.gnu.org/licenses/>.

but your fix looks good.

@timhoffm timhoffm force-pushed the fix-dvipng-version-regexp branch from c1db023 to 4859562 Compare May 7, 2019 22:26
@jklymak jklymak merged commit 778f4da into matplotlib:master May 12, 2019
@timhoffm timhoffm deleted the fix-dvipng-version-regexp branch May 12, 2019 08:43
@QuLogic QuLogic added this to the v3.2.0 milestone May 13, 2019
@tacaswell
Copy link
Copy Markdown
Member

tacaswell commented May 18, 2019

This should probably be backported to 3.1.1 (found this while doing the 3.1.x -> master merge after tagging 3.1.0 :/)

@meeseeksdev backport to v3.1.x

@tacaswell tacaswell modified the milestones: v3.2.0, v3.1.1 May 18, 2019
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request May 18, 2019
@jklymak
Backport PR matplotlib#14164: Fix regexp for dvipng version detection
d555baa
@meeseeksmachine meeseeksmachine mentioned this pull request May 18, 2019
Merged
timhoffm added a commit that referenced this pull request May 18, 2019
@timhoffm
Merge pull request #14238 from meeseeksmachine/auto-backport-of-pr-14…
3b26ee6 
…164-on-v3.1.x

Backport PR #14164 on branch v3.1.x (Fix regexp for dvipng version detection)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anntzer anntzer anntzer approved these changes

@jklymak jklymak jklymak approved these changes

Assignees

No one assigned

Labels

topic: testing

Projects

None yet

Milestone

v3.1.1

Development

Successfully merging this pull request may close these issues.

5 participants

@timhoffm @anntzer @tacaswell @jklymak @QuLogic