From 98433953e049c134175319196ec4d26580002a18 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sun, 2 May 2021 18:56:21 -0500 Subject: [PATCH 1/2] Update dependencies --- binder/environment.yml | 2 +- requirements/conda.txt | 2 +- setup.py | 4 ++-- spyder/dependencies.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/binder/environment.yml b/binder/environment.yml index d44d2734fda..58fc904129d 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -37,7 +37,7 @@ dependencies: - qdarkstyle =3.0.2 - qstylizer >=0.1.10 - qtawesome >=1.0.2 -- qtconsole >=5.0.3 +- qtconsole >=5.1.0 - qtpy >=1.5.0 - rtree >=0.8.3 - setuptools >=39.0.0 diff --git a/requirements/conda.txt b/requirements/conda.txt index 9482cb93085..8a13971fb3b 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -33,7 +33,7 @@ pyzmq >=17 qdarkstyle =3.0.2 qstylizer >=0.1.10 qtawesome >=1.0.2 -qtconsole >=5.0.3 +qtconsole >=5.1.0 qtpy >=1.5.0 rtree >=0.8.3 setuptools >=39.0.0 diff --git a/setup.py b/setup.py index f6d559af274..65b2a3cd4c4 100644 --- a/setup.py +++ b/setup.py @@ -232,11 +232,11 @@ def run(self): 'qdarkstyle==3.0.2', 'qstylizer>=0.1.10', 'qtawesome>=1.0.2', - 'qtconsole>=5.0.3', + 'qtconsole>=5.1.0', 'qtpy>=1.5.0', 'setuptools>=39.0.0', 'sphinx>=0.6.6', - 'spyder-kernels>=2.0.1,<2.1.0', + 'spyder-kernels>=2.0.2,<2.1.0', 'textdistance>=4.2.0', 'three-merge>=0.1.1', 'watchdog>=0.10.3,<2.0.0' diff --git a/spyder/dependencies.py b/spyder/dependencies.py index df1dac57b7c..52da14093e3 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -60,12 +60,12 @@ QDARKSTYLE_REQVER = '=3.0.2' QSTYLIZER_REQVER = '>=0.1.10' QTAWESOME_REQVER = '>=1.0.2' -QTCONSOLE_REQVER = '>=5.0.3' +QTCONSOLE_REQVER = '>=5.1.0' QTPY_REQVER = '>=1.5.0' RTREE_REQVER = '>=0.8.3' SETUPTOOLS_REQVER = '>=39.0.0' SPHINX_REQVER = '>=0.6.6' -SPYDER_KERNELS_REQVER = '>=2.0.1;<2.1.0' +SPYDER_KERNELS_REQVER = '>=2.0.2;<2.1.0' TEXTDISTANCE_REQVER = '>=4.2.0' THREE_MERGE_REQVER = '>=0.1.1' # None for pynsist install for now From b861e69a889540a986c639574c15d89fecda51c4 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Sun, 2 May 2021 18:56:39 -0500 Subject: [PATCH 2/2] git subrepo pull external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "0a43f16a5" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "2.x" commit: "0a43f16a5" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" --- external-deps/spyder-kernels/.gitrepo | 4 ++-- external-deps/spyder-kernels/CHANGELOG.md | 14 ++++++++++++++ .../spyder_kernels/console/kernel.py | 11 ++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 83dd836638a..d9c0a8bbd93 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 = 2.x - commit = f15f5ee85c0e926bcba23aad70b64d13e4c4b3f5 - parent = 3e8408ee42bd5bbeca61b8c1414f3301ff946455 + commit = 0a43f16a52aa96a5a2a989a8fc12a59ea4a8e1dd + parent = 98433953e049c134175319196ec4d26580002a18 method = merge cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/CHANGELOG.md b/external-deps/spyder-kernels/CHANGELOG.md index 42d0fc1520d..48721ecae22 100644 --- a/external-deps/spyder-kernels/CHANGELOG.md +++ b/external-deps/spyder-kernels/CHANGELOG.md @@ -1,5 +1,19 @@ # History of changes +## Version 2.0.2 (2021-05-02) + +### Pull Requests Merged + +* [PR 289](https://github.com/spyder-ide/spyder-kernels/pull/289) - PR: Fix setting tight layout in inline figures, by [@ccordoba12](https://github.com/ccordoba12) +* [PR 287](https://github.com/spyder-ide/spyder-kernels/pull/287) - PR: Close comm on shutdown, by [@impact27](https://github.com/impact27) +* [PR 282](https://github.com/spyder-ide/spyder-kernels/pull/282) - PR: Fix numpy.complex deprecation warning in tests, by [@ArchangeGabriel](https://github.com/ArchangeGabriel) + +In this release 3 pull requests were closed. + + +---- + + ## Version 2.0.1 (2021-04-02) * This release also contains all fixes present in version 1.10.3 diff --git a/external-deps/spyder-kernels/spyder_kernels/console/kernel.py b/external-deps/spyder-kernels/spyder_kernels/console/kernel.py index 9eac4d1e3f6..fb91c06f71e 100644 --- a/external-deps/spyder-kernels/spyder_kernels/console/kernel.py +++ b/external-deps/spyder-kernels/spyder_kernels/console/kernel.py @@ -20,6 +20,7 @@ import ipykernel from ipykernel.ipkernel import IPythonKernel from ipykernel.zmqshell import ZMQInteractiveShell +from traitlets.config.loader import LazyConfigValue # Local imports from spyder_kernels.py3compat import TEXT_TYPES, to_text_string @@ -456,7 +457,7 @@ def set_mpl_inline_bbox_inches(self, bbox_inches): """ Set inline print figure bbox inches. - The change is done by updating the ´rint_figure_kwargs' config dict. + The change is done by updating the 'print_figure_kwargs' config dict. """ from IPython.core.getipython import get_ipython config = get_ipython().kernel.config @@ -468,6 +469,14 @@ def set_mpl_inline_bbox_inches(self, bbox_inches): bbox_inches_dict = { 'bbox_inches': 'tight' if bbox_inches else None} print_figure_kwargs.update(bbox_inches_dict) + + # This seems to be necessary for newer versions of Traitlets because + # print_figure_kwargs doesn't return a dict. + if isinstance(print_figure_kwargs, LazyConfigValue): + figure_kwargs_dict = print_figure_kwargs.to_dict().get('update') + if figure_kwargs_dict: + print_figure_kwargs = figure_kwargs_dict + self._set_config_option( 'InlineBackend.print_figure_kwargs', print_figure_kwargs)