diff --git a/binder/environment.yml b/binder/environment.yml index 934ab7ff8c3..7596ce9ed6b 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -45,12 +45,12 @@ dependencies: - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 - qtawesome >=1.3.1,<1.4.0 -- qtconsole >=5.5.1,<5.6.0 +- qtconsole >=5.6.0,<5.7.0 - qtpy >=2.4.0 - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6,<7.4.0 -- spyder-kernels >=3.0.0b9,<3.0.0b10 +- spyder-kernels >=3.0.0,<3.1.0 - superqt >=0.6.2,<1.0.0 - textdistance >=4.2.0 - three-merge >=0.1.1 diff --git a/external-deps/qtconsole/.gitrepo b/external-deps/qtconsole/.gitrepo index 7611d9f36ab..b1be2c7cd0e 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 = 7d5b907c2bc965c7e64f8e0858ac07728b63db27 - parent = e390544ba5bdea94ca5d1bc13e3fc0ab506fc49f + commit = a72387f01dea2076346ecb38857de5266414dbe6 + parent = 8d3b773f38158025f7d65a503c2dd55cf6c15b46 method = merge - cmdver = 0.4.9 + cmdver = 0.4.3 diff --git a/external-deps/qtconsole/RELEASE.md b/external-deps/qtconsole/RELEASE.md index 2812391e444..0d0bb843144 100644 --- a/external-deps/qtconsole/RELEASE.md +++ b/external-deps/qtconsole/RELEASE.md @@ -16,7 +16,7 @@ To release a new version of qtconsole you need to follow these steps: * activate pyenv-with-latest-setuptools && python setup.py bdist_wheel -* twine check dist/* +* twine check --strict dist/* * twine upload dist/* @@ -26,6 +26,6 @@ To release a new version of qtconsole you need to follow these steps: * git add and git commit with `Back to work` -* git push upstream master +* git push upstream main * git push upstream --tags diff --git a/external-deps/qtconsole/docs/source/changelog.rst b/external-deps/qtconsole/docs/source/changelog.rst index ee5f175f597..5510b3dbed9 100644 --- a/external-deps/qtconsole/docs/source/changelog.rst +++ b/external-deps/qtconsole/docs/source/changelog.rst @@ -3,6 +3,29 @@ Changes in Jupyter Qt console ============================= +.. _5.6: + +5.6 +~~~ + +5.6.0 +----- + +`5.6.0 on GitHub `__ + +Additions ++++++++++ + +* Use selected syntax highlighting style for tracebacks and improve ANSI color + codes support. + +Changes ++++++++ + +* Remove syntax highlighting support for Python 2. +* Fix handling of carriage return. +* Fix showing bold face characters in output when using ANSI codes. + .. _5.5: 5.5 diff --git a/external-deps/qtconsole/qtconsole/_version.py b/external-deps/qtconsole/qtconsole/_version.py index 188a30f26a4..0ef76defe80 100644 --- a/external-deps/qtconsole/qtconsole/_version.py +++ b/external-deps/qtconsole/qtconsole/_version.py @@ -1,2 +1,2 @@ -version_info = (5, 6, 0, 'dev0') +version_info = (5, 7, 0, 'dev0') __version__ = '.'.join(map(str, version_info)) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index e281d81704d..4c2cd3a6142 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 = 80a08c8d1609f535346ff17661995cc4c24b00bd - parent = b8590e9e59d609ee26493db0f46409e2e1216956 + commit = 1d7201ce887c3d5b167ff2c2944b9c37d193c1c5 + parent = c482cdbd430efd76e4f9d772bd06520e06734db0 method = merge - cmdver = 0.4.9 + cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/CHANGELOG.md b/external-deps/spyder-kernels/CHANGELOG.md index 458b9b45989..e5912824577 100644 --- a/external-deps/spyder-kernels/CHANGELOG.md +++ b/external-deps/spyder-kernels/CHANGELOG.md @@ -1,5 +1,29 @@ # History of changes +## Version 3.0.0 (2024-08-29) + +### New features + +* Speed up debugger execution. +* Notify Spyder when Matplotlib backend changes. +* Use control channel for comms instead of a special one. +* Update variable explorer from the kernel. +* Simplify kernel configuration from Spyder. +* Add a `comm_handler` decorator. +* Transform `runfile`, `debugfile` and `runcell` commands to IPython magics. +* Add comm handlers to interrupt executions and enter the debugger after that. +* Publish Pdb stack frames to Spyder. +* Drop support for Python 2 and support Python 3.8+ + +### Pull Requests Merged + +* [PR 500](https://github.com/spyder-ide/spyder-kernels/pull/500) - PR: Restore `TMPDIR` env var if it was available on the Spyder side, by [@ccordoba12](https://github.com/ccordoba12) +* [PR 498](https://github.com/spyder-ide/spyder-kernels/pull/498) - PR: Remove `TMPDIR` env var after initialization, by [@ccordoba12](https://github.com/ccordoba12) + +In this release 2 pull requests were closed. + +---- + ## Version 3.0.0b9 (2024-08-21) ### Pull Requests Merged diff --git a/external-deps/spyder-kernels/RELEASE.md b/external-deps/spyder-kernels/RELEASE.md index aa70aa14390..c2aab89faa6 100644 --- a/external-deps/spyder-kernels/RELEASE.md +++ b/external-deps/spyder-kernels/RELEASE.md @@ -2,9 +2,9 @@ To release a new version of spyder-kernels on PyPI: * Close the respective milestone on Github -* git checkout 2.x +* git checkout 3.x -* git fetch upstream && get merge upstream/2.x +* git fetch upstream && get merge upstream/3.x * git clean -xfdi @@ -18,7 +18,7 @@ To release a new version of spyder-kernels on PyPI: * python setup.py bdist_wheel -* twine check dist/* +* twine check --strict dist/* * twine upload dist/* @@ -30,10 +30,10 @@ To release a new version of spyder-kernels on PyPI: * git checkout master -* git merge 2.x +* git merge 3.x * git push upstream master -* git push upstream 2.x +* git push upstream 3.x * git push upstream --tags diff --git a/external-deps/spyder-kernels/spyder_kernels/_version.py b/external-deps/spyder-kernels/spyder_kernels/_version.py index 788cf5f4779..1d3a5157c94 100644 --- a/external-deps/spyder-kernels/spyder_kernels/_version.py +++ b/external-deps/spyder-kernels/spyder_kernels/_version.py @@ -8,5 +8,5 @@ """Version File.""" -VERSION_INFO = (3, 0, 0, 'dev0') +VERSION_INFO = (4, 0, 0, 'dev0') __version__ = '.'.join(map(str, VERSION_INFO)) diff --git a/requirements/main.yml b/requirements/main.yml index 307b011da5a..4020f8e1d9b 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -42,12 +42,12 @@ dependencies: - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 - qtawesome >=1.3.1,<1.4.0 - - qtconsole >=5.5.1,<5.6.0 + - qtconsole >=5.6.0,<5.7.0 - qtpy >=2.4.0 - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6,<7.4.0 - - spyder-kernels >=3.0.0b9,<3.0.0b10 + - spyder-kernels >=3.0.0,<3.1.0 - superqt >=0.6.2,<1.0.0 - textdistance >=4.2.0 - three-merge >=0.1.1 diff --git a/setup.py b/setup.py index 1961665d9d2..f82b3b8f4a5 100644 --- a/setup.py +++ b/setup.py @@ -242,12 +242,12 @@ def run(self): 'qdarkstyle>=3.2.0,<3.3.0', 'qstylizer>=0.2.2', 'qtawesome>=1.3.1,<1.4.0', - 'qtconsole>=5.5.1,<5.6.0', + 'qtconsole>=5.6.0,<5.7.0', 'qtpy>=2.4.0', 'rtree>=0.9.7', 'setuptools>=49.6.0', 'sphinx>=0.6.6,<7.4.0', - 'spyder-kernels>=3.0.0b9,<3.0.0b10', + 'spyder-kernels>=3.0.0,<3.1.0', 'superqt>=0.6.2,<1.0.0', 'textdistance>=4.2.0', 'three-merge>=0.1.1', @@ -262,7 +262,7 @@ def run(self): if req.split(">")[0] not in reqs_to_loosen] install_requires.append('python-lsp-server[all]>=1.12.0,<1.14.0') install_requires.append('qtconsole>=5.5.1,<5.7.0') - install_requires.append('spyder-kernels>=3.0.0b9,<3.1.0') + install_requires.append('spyder-kernels>=3.0.0,<3.2.0') extras_require = { 'test:platform_system == "Windows"': ['pywin32'], diff --git a/spyder/dependencies.py b/spyder/dependencies.py index 0f4c146cbe8..bc36d27eb33 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -68,12 +68,12 @@ QDARKSTYLE_REQVER = '>=3.2.0,<3.3.0' QSTYLIZER_REQVER = '>=0.2.2' QTAWESOME_REQVER = '>=1.3.1,<1.4.0' -QTCONSOLE_REQVER = '>=5.5.1,<5.6.0' +QTCONSOLE_REQVER = '>=5.6.0,<5.7.0' QTPY_REQVER = '>=2.4.0' RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' SPHINX_REQVER = '>=0.6.6,<7.4.0' -SPYDER_KERNELS_REQVER = '>=3.0.0b9,<3.0.0b10' +SPYDER_KERNELS_REQVER = '>=3.0.0,<3.1.0' SUPERQT_REQVER = '>=0.6.2,<1.0.0' TEXTDISTANCE_REQVER = '>=4.2.0' THREE_MERGE_REQVER = '>=0.1.1' diff --git a/spyder/plugins/ipythonconsole/__init__.py b/spyder/plugins/ipythonconsole/__init__.py index 684f828688c..60d63447d0c 100644 --- a/spyder/plugins/ipythonconsole/__init__.py +++ b/spyder/plugins/ipythonconsole/__init__.py @@ -20,10 +20,10 @@ # Required version of Spyder-kernels SPYDER_KERNELS_MIN_VERSION = ( - '3.0.0b9' if not running_under_pytest() else '3.0.0.dev0' + '3.0.0' if not running_under_pytest() else '3.1.0.dev0' ) SPYDER_KERNELS_MAX_VERSION = ( - '3.0.0b10' if not running_under_pytest() else '4.0.0' + '3.1.0' if not running_under_pytest() else '4.0.0' ) SPYDER_KERNELS_VERSION = ( f'>={SPYDER_KERNELS_MIN_VERSION},<{SPYDER_KERNELS_MAX_VERSION}'