From d01261e67ce0b7f134f80b5b69569754b8405110 Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:35:08 -0500 Subject: [PATCH 1/2] Update core dependencies --- binder/environment.yml | 2 +- requirements/main.yml | 2 +- setup.py | 2 +- spyder/dependencies.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/binder/environment.yml b/binder/environment.yml index e484bf0b707..74e8d22111c 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -45,7 +45,7 @@ dependencies: - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 - qtawesome >=1.3.1,<1.4.0 -- qtconsole >=5.6.0,<5.7.0 +- qtconsole >=5.6.1,<5.7.0 - qtpy >=2.4.0 - rtree >=0.9.7 - setuptools >=49.6.0 diff --git a/requirements/main.yml b/requirements/main.yml index 4466f3d8a03..7371c0ecdbe 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -42,7 +42,7 @@ dependencies: - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 - qtawesome >=1.3.1,<1.4.0 - - qtconsole >=5.6.0,<5.7.0 + - qtconsole >=5.6.1,<5.7.0 - qtpy >=2.4.0 - rtree >=0.9.7 - setuptools >=49.6.0 diff --git a/setup.py b/setup.py index 9f39803f8a0..181ddd359e2 100644 --- a/setup.py +++ b/setup.py @@ -242,7 +242,7 @@ def run(self): 'qdarkstyle>=3.2.0,<3.3.0', 'qstylizer>=0.2.2', 'qtawesome>=1.3.1,<1.4.0', - 'qtconsole>=5.6.0,<5.7.0', + 'qtconsole>=5.6.1,<5.7.0', 'qtpy>=2.4.0', 'rtree>=0.9.7', 'setuptools>=49.6.0', diff --git a/spyder/dependencies.py b/spyder/dependencies.py index b3e7d371504..67eea346d2b 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -68,7 +68,7 @@ QDARKSTYLE_REQVER = '>=3.2.0,<3.3.0' QSTYLIZER_REQVER = '>=0.2.2' QTAWESOME_REQVER = '>=1.3.1,<1.4.0' -QTCONSOLE_REQVER = '>=5.6.0,<5.7.0' +QTCONSOLE_REQVER = '>=5.6.1,<5.7.0' QTPY_REQVER = '>=2.4.0' RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' From ba54891f34236e15dadfcc29953f0784801136f0 Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:37:32 -0500 Subject: [PATCH 2/2] git subrepo pull (merge) external-deps/qtconsole subrepo: subdir: "external-deps/qtconsole" merged: "b2f121fde" upstream: origin: "https://github.com/jupyter/qtconsole.git" branch: "main" commit: "d527a84b8" git-subrepo: version: "0.4.3" origin: "???" commit: "???" --- external-deps/qtconsole/.gitrepo | 2 +- external-deps/qtconsole/docs/source/changelog.rst | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/external-deps/qtconsole/.gitrepo b/external-deps/qtconsole/.gitrepo index 39d5d433ab3..f3dd9ce72a6 100644 --- a/external-deps/qtconsole/.gitrepo +++ b/external-deps/qtconsole/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/jupyter/qtconsole.git branch = main - commit = 7915694709460f95d92d48daf3c57eb7a3f2bce4 + commit = d527a84b8e7ada16dba847508dafccd1eda542ff parent = 3274e793422497da39940e8ac4dad3ef793acafe method = merge cmdver = 0.4.3 diff --git a/external-deps/qtconsole/docs/source/changelog.rst b/external-deps/qtconsole/docs/source/changelog.rst index 5510b3dbed9..1b398a41d25 100644 --- a/external-deps/qtconsole/docs/source/changelog.rst +++ b/external-deps/qtconsole/docs/source/changelog.rst @@ -8,6 +8,13 @@ Changes in Jupyter Qt console 5.6 ~~~ +5.6.1 +----- + +`5.6.1 on GitHub `__ + +* Handle ANSI escape sequences that move the cursor. + 5.6.0 -----