Commit 0e9b8ea

dopplershiftstory645

authored and

committed

resolved conflict in pyplot, added elements to backend dict

1 parent e7d1218 commit 0e9b8eaCopy full SHA for 0e9b8ea

File tree

+34

-0

lines changed

+34

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2341,8 +2341,14 @@ def getname_val(identifier):`
`2341`	`2341`	`# requested, ignore rcParams['backend'] and force selection of a backend that`
`2342`	`2342`	`# is compatible with the current running interactive framework.`
`2343`	`2343`	`if (rcParams["backend_fallback"]`
	`2344`	`+<<<<<<< HEAD`
`2344`	`2345`	`and dict.__getitem__(rcParams, "backend") in _interactive_bk`
`2345`	`2346`	`and _get_running_interactive_framework()):`
	`2347`	`+=======`
	`2348`	`+ and dict.__getitem__(rcParams, "backend") in (`
	`2349`	`+ set(_interactive_bk) - {'WebAgg', 'nbAgg'})`
	`2350`	`+ and cbook._get_running_interactive_framework()):`
	`2351`	`+>>>>>>> 126de7f92... Merge pull request #15512 from tacaswell/fix_webagg_fallback`
`2346`	`2352`	`dict.__setitem__(rcParams, "backend", rcsetup._auto_backend_sentinel)`
`2347`	`2353`	`# Set up the backend.`
`2348`	`2354`	`switch_backend(rcParams["backend"])`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,28 @@`
	`1`	`+import subprocess`
	`2`	`+import os`
	`3`	`+import sys`
	`4`	`+import pytest`
	`5`	`+`
	`6`	`+`
	`7`	`+@pytest.mark.parametrize("backend", ["webagg", "nbagg"])`
	`8`	`+def test_webagg_fallback(backend):`
	`9`	`+ if backend == "nbagg":`
	`10`	`+ pytest.importorskip("IPython")`
	`11`	`+ env = {}`
	`12`	`+ if os.name == "nt":`
	`13`	`+ env = dict(os.environ)`
	`14`	`+ else:`
	`15`	`+ env = {"DISPLAY": ""}`
	`16`	`+`
	`17`	`+ env["MPLBACKEND"] = backend`
	`18`	`+`
	`19`	`+ test_code = (`
	`20`	`+ "import os;"`
	`21`	`+ + f"assert os.environ['MPLBACKEND'] == '{backend}';"`
	`22`	`+ + "import matplotlib.pyplot as plt; "`
	`23`	`+ + "print(plt.get_backend());"`
	`24`	`+ f"assert '{backend}' == plt.get_backend().lower();"`
	`25`	`+ )`
	`26`	`+ ret = subprocess.call([sys.executable, "-c", test_code], env=env)`
	`27`	`+`
	`28`	`+ assert ret == 0`

Comments

(0)