From cbed437b5fe80b1c9e5120365bf015ced3aab498 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Wed, 22 May 2024 17:26:46 -0500 Subject: [PATCH] git subrepo pull (merge) external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "43d8cfa64e" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "master" commit: "43d8cfa64e" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" --- external-deps/spyder-kernels/.gitrepo | 4 ++-- .../spyder-kernels/spyder_kernels/console/kernel.py | 2 +- .../spyder-kernels/spyder_kernels/utils/mpl.py | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 6f7b4baf1f3..c0eed39d896 100644 --- a/external-deps/spyder-kernels/.gitrepo +++ b/external-deps/spyder-kernels/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/spyder-ide/spyder-kernels.git branch = master - commit = 09c370aab411c954f869649279481636f666098b - parent = 24853bc4073c12c2ecdd78022bf8a796fbfb8925 + commit = 43d8cfa64e4f76cc354e14c42f10ffe9f4d8e1df + parent = fa02a678524c5764db3fae2fc727b3ed64693ef3 method = merge cmdver = 0.4.3 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..8ac557f7886 100644 --- a/external-deps/spyder-kernels/spyder_kernels/utils/mpl.py +++ b/external-deps/spyder-kernels/spyder_kernels/utils/mpl.py @@ -20,11 +20,12 @@ # 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', + 'inline': 'inline', # For Matplotlib >=3.9 + inline_backend: "inline", # For Matplotlib <3.9 + 'qt5agg': 'qt', + 'qtagg': 'qt', # For Matplotlib 3.5+ + 'tkagg': 'tk', + 'macosx': 'osx', }