From 2b01e2e36ba519ac2ad48a08a6ed7dda4c157146 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Sun, 19 May 2024 20:07:42 -0700 Subject: [PATCH] git subrepo pull --branch=mpl390 --remote=https://github.com/mrclary/spyder-kernels.git --update external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "b1edc67a3" upstream: origin: "https://github.com/mrclary/spyder-kernels.git" branch: "mpl390" commit: "b1edc67a3" git-subrepo: version: "0.4.6" origin: "???" commit: "???" --- external-deps/spyder-kernels/.gitrepo | 10 +++++----- .../spyder-kernels/spyder_kernels/console/kernel.py | 2 +- .../spyder-kernels/spyder_kernels/utils/mpl.py | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 6f7b4baf1f3..6c2878ab482 100644 --- a/external-deps/spyder-kernels/.gitrepo +++ b/external-deps/spyder-kernels/.gitrepo @@ -4,9 +4,9 @@ ; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme ; [subrepo] - remote = https://github.com/spyder-ide/spyder-kernels.git - branch = master - commit = 09c370aab411c954f869649279481636f666098b - parent = 24853bc4073c12c2ecdd78022bf8a796fbfb8925 + remote = https://github.com/mrclary/spyder-kernels.git + branch = mpl390 + commit = b1edc67a3599ff7fd51ac2661a0082f8dba99d3b + parent = eeb9c783438ff9cb82cfc61b60a79181349a9bc5 method = merge - cmdver = 0.4.3 + cmdver = 0.4.6 diff --git a/external-deps/spyder-kernels/spyder_kernels/console/kernel.py b/external-deps/spyder-kernels/spyder_kernels/console/kernel.py index 2d3d5eaae86..15a407aa843 100644 --- a/external-deps/spyder-kernels/spyder_kernels/console/kernel.py +++ b/external-deps/spyder-kernels/spyder_kernels/console/kernel.py @@ -498,7 +498,7 @@ def get_matplotlib_backend(self): """Get current matplotlib backend.""" try: import matplotlib - return MPL_BACKENDS_TO_SPYDER[matplotlib.get_backend()] + return MPL_BACKENDS_TO_SPYDER[matplotlib.get_backend().lower()] except Exception: return None diff --git a/external-deps/spyder-kernels/spyder_kernels/utils/mpl.py b/external-deps/spyder-kernels/spyder_kernels/utils/mpl.py index 00f47bac03c..557254a1ae5 100644 --- a/external-deps/spyder-kernels/spyder_kernels/utils/mpl.py +++ b/external-deps/spyder-kernels/spyder_kernels/utils/mpl.py @@ -21,10 +21,10 @@ # Mapping of matlotlib backends options to Spyder MPL_BACKENDS_TO_SPYDER = { inline_backend: "inline", - 'Qt5Agg': 'qt', - 'QtAgg': 'qt', # For Matplotlib 3.5+ - 'TkAgg': 'tk', - 'MacOSX': 'osx', + 'qt5agg': 'qt', + 'qtagg': 'qt', # For Matplotlib 3.5+ + 'tkagg': 'tk', + 'macosx': 'osx', }