diff --git a/binder/environment.yml b/binder/environment.yml index 310a9310501..77125c43e58 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -46,7 +46,7 @@ dependencies: - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 -- spyder-kernels >=3.0.0b3,<3.0.0b4 +- spyder-kernels >=3.0.0b4,<3.0.0b5 - superqt >=0.6.1,<1.0.0 - textdistance >=4.2.0 - three-merge >=0.1.1 diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 156bcbd6d64..a9d8a35c668 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 = 66576a716f1dc0282ff3dc26ba5ce7c43ede852c - parent = 5fca910e11f69b1dc83f8d249c3a28b1b99ca3d6 + commit = d0b6a86831cf2ed8349b8b19d749530019492fb6 + parent = 3a5a0fbaabd3273d111e288f5ecf51c72bbc5e93 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 ee8df8f0fe4..d22d1ea36fb 100644 --- a/external-deps/spyder-kernels/CHANGELOG.md +++ b/external-deps/spyder-kernels/CHANGELOG.md @@ -1,5 +1,17 @@ # History of changes +## Version 3.0.0b4 (2024-02-08) + +### Pull Requests Merged + +* [PR 477](https://github.com/spyder-ide/spyder-kernels/pull/477) - PR: Handle new Inline backend options `fontsize` and `bottom`, by [@jitseniesen](https://github.com/jitseniesen) + +In this release 1 pull request was closed. + + +---- + + ## Version 3.0.0b3 (2023-12-18) ### Pull Requests Merged diff --git a/requirements/main.yml b/requirements/main.yml index 36a6bbfb498..f9cc96169ba 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -42,7 +42,7 @@ dependencies: - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 - - spyder-kernels >=3.0.0b3,<3.0.0b4 + - spyder-kernels >=3.0.0b4,<3.0.0b5 - superqt >=0.6.1,<1.0.0 - textdistance >=4.2.0 - three-merge >=0.1.1 diff --git a/setup.py b/setup.py index 034b7d8464a..9d6a10cb0b1 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>=3.0.0b3,<3.0.0b4', + 'spyder-kernels>=3.0.0b4,<3.0.0b5', 'superqt>=0.6.1,<1.0.0', 'textdistance>=4.2.0', 'three-merge>=0.1.1', @@ -257,7 +257,7 @@ def run(self): if req.split(">")[0] not in reqs_to_loosen] install_requires.append('python-lsp-server[all]>=1.10.0,<1.12.0') install_requires.append('qtconsole>=5.5.1,<5.7.0') - install_requires.append('spyder-kernels>=3.0.0b3,<3.1.0') + install_requires.append('spyder-kernels>=3.0.0b4,<3.1.0') extras_require = { 'test:platform_system == "Windows"': ['pywin32'], diff --git a/spyder/dependencies.py b/spyder/dependencies.py index 881daf3537e..494a8351bb7 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -70,7 +70,7 @@ RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' SPHINX_REQVER = '>=0.6.6' -SPYDER_KERNELS_REQVER = '>=3.0.0b3,<3.0.0b4' +SPYDER_KERNELS_REQVER = '>=3.0.0b4,<3.0.0b5' SUPERQT_REQVER = '>=0.6.1,<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 6d13a9d5e30..1238f14068f 100644 --- a/spyder/plugins/ipythonconsole/__init__.py +++ b/spyder/plugins/ipythonconsole/__init__.py @@ -20,24 +20,30 @@ # Required version of Spyder-kernels SPYDER_KERNELS_MIN_VERSION = ( - '3.0.0b3' if not running_under_pytest() else '3.0.0.dev0') + '3.0.0b4' if not running_under_pytest() else '3.0.0.dev0' +) SPYDER_KERNELS_MAX_VERSION = ( - '3.0.0b4' if not running_under_pytest() else '4.0.0') + '3.0.0b5' if not running_under_pytest() else '4.0.0' +) SPYDER_KERNELS_VERSION = ( - f'>={SPYDER_KERNELS_MIN_VERSION},<{SPYDER_KERNELS_MAX_VERSION}') + f'>={SPYDER_KERNELS_MIN_VERSION},<{SPYDER_KERNELS_MAX_VERSION}' +) if is_stable_version(SPYDER_KERNELS_MIN_VERSION): SPYDER_KERNELS_CONDA = ( - f'conda install spyder{_d}kernels={SPYDER_KERNELS_MIN_VERSION[:-2]}') + f'conda install spyder{_d}kernels={SPYDER_KERNELS_MIN_VERSION[:-2]}' + ) SPYDER_KERNELS_PIP = ( - f'pip install spyder{_d}kernels=={SPYDER_KERNELS_MIN_VERSION[:-1]}*') + f'pip install spyder{_d}kernels=={SPYDER_KERNELS_MIN_VERSION[:-1]}*' + ) else: SPYDER_KERNELS_CONDA = ( f'conda install {_d}c conda{_d}forge/label/spyder_kernels_rc {_d}c ' f'conda{_d}forge spyder{_d}kernels={SPYDER_KERNELS_MIN_VERSION}' ) SPYDER_KERNELS_PIP = ( - f'pip install spyder{_d}kernels=={SPYDER_KERNELS_MIN_VERSION}') + f'pip install spyder{_d}kernels=={SPYDER_KERNELS_MIN_VERSION}' + ) class SpyderKernelError(RuntimeError):