Commitdf1e039

authored

Merge pull request#28925 from tacaswell/tst/pytest_tkinter

TST: handle change in pytest.importorskip behavior

2 parentsd442ca8 +c5e3387 commitdf1e039Copy full SHA for df1e039

File tree

-2

lines changed

lib
- matplotlib/tests
  - test_rcparams.py
- mpl_toolkits/mplot3d/tests
  - test_axes3d.py

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`fromunittestimportmock`
`6`	`6`
`7`	`7`	`fromcyclerimportcycler,Cycler`
	`8`	`+frompackaging.versionimportparseasparse_version`
`8`	`9`	`importpytest`
`9`	`10`
`10`	`11`	`importmatplotlibasmpl`
`@@ -539,7 +540,12 @@ def test_backend_fallback_headless(tmp_path):`
`539`	`540`	`sys.platform=="linux"andnot_c_internal_utils.xdisplay_is_valid(),`
`540`	`541`	`reason="headless")`
`541`	`542`	`deftest_backend_fallback_headful(tmp_path):`
`542`		`-pytest.importorskip("tkinter")`
	`543`	`+ifparse_version(pytest.__version__)>=parse_version('8.2.0'):`
	`544`	`+pytest_kwargs=dict(exc_type=ImportError)`
	`545`	`+else:`
	`546`	`+pytest_kwargs= {}`
	`547`	`+`
	`548`	`+pytest.importorskip("tkinter",**pytest_kwargs)`
`543`	`549`	`env= {**os.environ,"MPLBACKEND":"","MPLCONFIGDIR":str(tmp_path)}`
`544`	`550`	`backend=subprocess_run_for_testing(`
`545`	`551`	`[sys.executable,"-c",`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`importfunctools`
`2`	`2`	`importitertools`
`3`	`3`	`importplatform`
	`4`	`+importsys`
`4`	`5`
`5`	`6`	`importpytest`
`6`	`7`
`@@ -115,7 +116,7 @@ def test_axes3d_repr():`
`115`	`116`
`116`	`117`
`117`	`118`	`@mpl3d_image_comparison(['axes3d_primary_views.png'],style='mpl20',`
`118`		`-tol=0.05ifplatform.machine()=="arm64"else0)`
	`119`	`+tol=0.05ifsys.platform=="darwin"else0)`
`119`	`120`	`deftest_axes3d_primary_views():`
`120`	`121`	`# (elev, azim, roll)`
`121`	`122`	`views= [(90,-90,0),# XY`

Comments

(0)