From 506c261f9de40861725f7fe022cc0e05ece244ab Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Tue, 11 Jun 2024 16:08:05 -0500 Subject: [PATCH 1/2] Update core dependencies --- binder/environment.yml | 2 +- requirements/main.yml | 2 +- setup.py | 4 ++-- spyder/dependencies.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/binder/environment.yml b/binder/environment.yml index d761b4d3bf4..e4a4bcc4833 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -42,7 +42,7 @@ dependencies: - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 -- spyder-kernels >=2.5.1,<2.6.0 +- spyder-kernels >=2.5.2,<2.6.0 - textdistance >=4.2.0 - three-merge >=0.1.1 - watchdog >=0.10.3 diff --git a/requirements/main.yml b/requirements/main.yml index 5bceaf35355..92bd4974a24 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -39,7 +39,7 @@ dependencies: - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 - - spyder-kernels >=2.5.1,<2.6.0 + - spyder-kernels >=2.5.2,<2.6.0 - textdistance >=4.2.0 - three-merge >=0.1.1 - watchdog >=0.10.3 diff --git a/setup.py b/setup.py index e5f40df5f92..51f7b5f5d98 100644 --- a/setup.py +++ b/setup.py @@ -243,7 +243,7 @@ def run(self): 'rtree>=0.9.7', 'setuptools>=49.6.0', 'sphinx>=0.6.6', - 'spyder-kernels>=2.5.1,<2.6.0', + 'spyder-kernels>=2.5.2,<2.6.0', 'textdistance>=4.2.0', 'three-merge>=0.1.1', 'watchdog>=0.10.3' @@ -256,7 +256,7 @@ def run(self): if req.split(">")[0] not in reqs_to_loosen] install_requires.append('python-lsp-server[all]>=1.11.0,<1.13.0') install_requires.append('qtconsole>=5.5.1,<5.7.0') - install_requires.append('spyder-kernels>=2.5.1,<2.7.0') + install_requires.append('spyder-kernels>=2.5.2,<2.7.0') extras_require = { 'test:platform_system == "Windows"': ['pywin32'], diff --git a/spyder/dependencies.py b/spyder/dependencies.py index 82ef268d44d..d4fb192413d 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -71,7 +71,7 @@ RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' SPHINX_REQVER = '>=0.6.6' -SPYDER_KERNELS_REQVER = '>=2.5.1,<2.6.0' +SPYDER_KERNELS_REQVER = '>=2.5.2,<2.6.0' TEXTDISTANCE_REQVER = '>=4.2.0' THREE_MERGE_REQVER = '>=0.1.1' # None for pynsist install for now From 1210adb92b715a8d1cfdb987cba529610e8068c8 Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Tue, 11 Jun 2024 16:08:17 -0500 Subject: [PATCH 2/2] git subrepo pull external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "649a61987" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "2.x" commit: "649a61987" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" --- external-deps/spyder-kernels/.gitrepo | 6 +++--- external-deps/spyder-kernels/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 3395a3f3379..106d7cec784 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 = 3ca2930b50820e7bba78da41510baf0c3b7b29ad - parent = edd5881efe18b2585be5ed6c03df88367415a1a1 + commit = 649a619879a872b954f1dff69ebe18876b1fecad + parent = 506c261f9de40861725f7fe022cc0e05ece244ab method = merge - cmdver = 0.4.6 + cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/CHANGELOG.md b/external-deps/spyder-kernels/CHANGELOG.md index 0bb2216b6b6..08cb192823a 100644 --- a/external-deps/spyder-kernels/CHANGELOG.md +++ b/external-deps/spyder-kernels/CHANGELOG.md @@ -1,5 +1,17 @@ # History of changes +## Version 2.5.2 (2024-06-11) + +### Pull Requests Merged + +* [PR 489](https://github.com/spyder-ide/spyder-kernels/pull/489) - PR: Fix detecting Matplotlib backend for its 3.9.0 version, by [@mrclary](https://github.com/mrclary) + +In this release 1 pull request was closed. + + +---- + + ## Version 2.5.1 (2024-02-28) ### Pull Requests Merged