Commit5bdac1d

authored

Merge pull request#26431 from ksunden/pyparsing_pin

MNT: Unpin pyparsing, xfail error message tests for pyparsing 3.1.0

2 parentsc387fb1 +7d070b8 commit5bdac1dCopy full SHA for 5bdac1d

File tree

+20

-2

lines changed

+20

-2

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,18 @@`
`9`	`9`	`fromtypingimportAny`
`10`	`10`
`11`	`11`	`importnumpyasnp`
	`12`	`+frompackaging.versionimportparseasparse_version`
	`13`	`+importpyparsing`
`12`	`14`	`importpytest`
`13`	`15`
	`16`	`+`
`14`	`17`	`importmatplotlibasmpl`
`15`	`18`	`frommatplotlib.testing.decoratorsimportcheck_figures_equal,image_comparison`
`16`	`19`	`importmatplotlib.pyplotasplt`
`17`	`20`	`frommatplotlibimportmathtext,_mathtext`
`18`	`21`
	`22`	`+pyparsing_version=parse_version(pyparsing.__version__)`
	`23`	`+`
`19`	`24`
`20`	`25`	`# If test is removed, use None as placeholder`
`21`	`26`	`math_tests= [`
`@@ -279,6 +284,9 @@ def test_fontinfo():`
`279`	`284`	`asserttable['version']== (1,0)`
`280`	`285`
`281`	`286`
	`287`	`+# See gh-26152 for more context on this xfail`
	`288`	`+@pytest.mark.xfail(pyparsing_version.release== (3,1,0),`
	`289`	`+reason="Error messages are incorrect for this version")`
`282`	`290`	`@pytest.mark.parametrize(`
`283`	`291`	`'math, msg',`
`284`	`292`	`[`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`importnumpyasnp`
`6`	`6`	`fromnumpy.testingimportassert_almost_equal`
	`7`	`+frompackaging.versionimportparseasparse_version`
	`8`	`+importpyparsing`
`7`	`9`	`importpytest`
`8`	`10`
`9`	`11`	`importmatplotlibasmpl`
`@@ -16,6 +18,8 @@`
`16`	`18`	`frommatplotlib.testing._markersimportneeds_usetex`
`17`	`19`	`frommatplotlib.textimportText,Annotation`
`18`	`20`
	`21`	`+pyparsing_version=parse_version(pyparsing.__version__)`
	`22`	`+`
`19`	`23`
`20`	`24`	`@image_comparison(['font_styles'])`
`21`	`25`	`deftest_font_styles():`
`@@ -818,6 +822,9 @@ def test_unsupported_script(recwarn):`
`818`	`822`	`(r"Matplotlib currently does not support Bengali natively.",)])`
`819`	`823`
`820`	`824`
	`825`	`+# See gh-26152 for more information on this xfail`
	`826`	`+@pytest.mark.xfail(pyparsing_version.release== (3,1,0),`
	`827`	`+reason="Error messages are incorrect with pyparsing 3.1.0")`
`821`	`828`	`deftest_parse_math():`
`822`	`829`	`fig,ax=plt.subplots()`
`823`	`830`	`ax.text(0,0,r"$ \wrong{math} $",parse_math=False)`
`@@ -828,6 +835,9 @@ def test_parse_math():`
`828`	`835`	`fig.canvas.draw()`
`829`	`836`
`830`	`837`
	`838`	`+# See gh-26152 for more information on this xfail`
	`839`	`+@pytest.mark.xfail(pyparsing_version.release== (3,1,0),`
	`840`	`+reason="Error messages are incorrect with pyparsing 3.1.0")`
`831`	`841`	`deftest_parse_math_rcparams():`
`832`	`842`	`# Default is True`
`833`	`843`	`fig,ax=plt.subplots()`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ def make_release_tree(self, base_dir, files):`
`335`	`335`	`"numpy>=1.21",`
`336`	`336`	`"packaging>=20.0",`
`337`	`337`	`"pillow>=6.2.0",`
`338`		`-"pyparsing>=2.3.1,<3.1",`
	`338`	`+"pyparsing>=2.3.1",`
`339`	`339`	`"python-dateutil>=2.7",`
`340`	`340`	`]+ (`
`341`	`341`	`# Installing from a git checkout that is not producing a wheel.`

Comments

(0)