Commit1127632

authored

Merge pull request#21501 from anntzer/p3b

Refix for pyparsing compat.

2 parents5d2e97e +ec497ae commit1127632Copy full SHA for 1127632

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`frompyparsingimport (`
`16`	`16`	`Combine,Empty,FollowedBy,Forward,Group,Literal,oneOf,OneOrMore,`
`17`	`17`	`Optional,ParseBaseException,ParseFatalException,ParserElement,`
`18`		`-ParseResults,QuotedString,Regex,StringEnd,Suppress,ZeroOrMore)`
	`18`	`+ParseResults,QuotedString,Regex,StringEnd,Suppress,White,ZeroOrMore)`
`19`	`19`
`20`	`20`	`importmatplotlibasmpl`
`21`	`21`	`from .import_api,cbook`
`@@ -2060,6 +2060,7 @@ def __init__(self):`
`2060`	`2060`	`p.accent<<=Group(`
`2061`	`2061`	`Suppress(p.bslash)`
`2062`	`2062`	`+oneOf([self._accent_map,self._wide_accents])`
	`2063`	`++Suppress(Optional(White()))`
`2063`	`2064`	`-p.placeable`
`2064`	`2065`	`)`
`2065`	`2066`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ ipython`
`13`	`13`	`ipywidgets`
`14`	`14`	`numpydoc>=0.8`
`15`	`15`	`packaging>=20`
`16`		`-pyparsing<3.0.0`
`17`	`16`	`mpl-sphinx-theme`
`18`	`17`	`sphinxcontrib-svg2pdfconverter>=1.1.0`
`19`	`18`	`sphinx-gallery>=0.10`

Lines changed: 0 additions & 1 deletion

Comments

(0)