From f5b92b7a8cfb4dfead77d70bbb5c3d613d93875c Mon Sep 17 00:00:00 2001 From: Jitse Niesen Date: Tue, 2 Jan 2024 19:25:15 +0000 Subject: [PATCH] git subrepo pull (merge) --remote=https://github.com/spyder-ide/spyder-kernels.git --branch=master --update --force external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "66576a716" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "master" commit: "66576a716" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "110b9eb" --- external-deps/spyder-kernels/.gitrepo | 6 +++--- .../spyder-kernels/spyder_kernels/console/kernel.py | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index c6045f0122b..156bcbd6d64 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 = a24faa7ae3083f4247709481627aa97bf2a6efc0 - parent = 3a083a611f2aa96cf3d7975d5af8a228948abc9a + commit = 66576a716f1dc0282ff3dc26ba5ce7c43ede852c + parent = 5fca910e11f69b1dc83f8d249c3a28b1b99ca3d6 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 0585077a75c..56902ee10f2 100644 --- a/external-deps/spyder-kernels/spyder_kernels/console/kernel.py +++ b/external-deps/spyder-kernels/spyder_kernels/console/kernel.py @@ -557,6 +557,8 @@ def set_matplotlib_conf(self, conf): resolution_n = 'pylab/inline/resolution' width_n = 'pylab/inline/width' height_n = 'pylab/inline/height' + fontsize_n = 'pylab/inline/fontsize' + bottom_n = 'pylab/inline/bottom' bbox_inches_n = 'pylab/inline/bbox_inches' inline_backend = 'inline' @@ -581,6 +583,15 @@ def set_matplotlib_conf(self, conf): (conf[width_n], conf[height_n]) ) + if fontsize_n in conf: + self._set_mpl_inline_rc_config('font.size', conf[fontsize_n]) + + if bottom_n in conf: + self._set_mpl_inline_rc_config( + 'figure.subplot.bottom', + conf[bottom_n] + ) + if bbox_inches_n in conf: self.set_mpl_inline_bbox_inches(conf[bbox_inches_n])