diff --git a/binder/environment.yml b/binder/environment.yml index d942fa422ab..61903049553 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -9,7 +9,7 @@ dependencies: # Please *DO NOT* make changes directly just to here - make changes # to requirements/main.yml, and copy it here. - aiohttp >=3.9.3 -- asyncssh >=2.0.0 +- asyncssh >=2.0.0,<3.0.0 - atomicwrites >=1.2.0 - chardet >=2.0.0 - cloudpickle >=0.5.0 @@ -48,7 +48,7 @@ dependencies: - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 -- spyder-kernels >=3.0.0b5,<3.0.0b6 +- spyder-kernels >=3.0.0b6,<3.0.0b7 - 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 7a79cc8de71..6f7b4baf1f3 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 = 4ecb144341da8ed59a6aca1d74a8a29b01623191 - parent = bba8dbe36d1bc64fa3f045f5ceb1f7874d7d4963 + commit = 09c370aab411c954f869649279481636f666098b + parent = 24853bc4073c12c2ecdd78022bf8a796fbfb8925 method = merge cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/CHANGELOG.md b/external-deps/spyder-kernels/CHANGELOG.md index fa6747c1345..851f7c2a8e4 100644 --- a/external-deps/spyder-kernels/CHANGELOG.md +++ b/external-deps/spyder-kernels/CHANGELOG.md @@ -1,5 +1,22 @@ # History of changes +## Version 3.0.0b6 (2024-05-15) + +### Issues Closed + +* [Issue 457](https://github.com/spyder-ide/spyder-kernels/issues/457) - Detecting the interactive backend started to fail on Mac in master ([PR 486](https://github.com/spyder-ide/spyder-kernels/pull/486) by [@ccordoba12](https://github.com/ccordoba12)) + +In this release 1 issue was closed. + +### Pull Requests Merged + +* [PR 486](https://github.com/spyder-ide/spyder-kernels/pull/486) - PR: Run `test_get_interactive_backend` again on Mac, by [@ccordoba12](https://github.com/ccordoba12) ([457](https://github.com/spyder-ide/spyder-kernels/issues/457)) +* [PR 485](https://github.com/spyder-ide/spyder-kernels/pull/485) - PR: Fix Matplotlib interactive backend detection, by [@ccordoba12](https://github.com/ccordoba12) + +In this release 2 pull requests were closed. + +---- + ## Version 3.0.0b5 (2024-04-23) ### Pull Requests Merged diff --git a/external-deps/spyder-kernels/spyder_kernels/console/tests/test_console_kernel.py b/external-deps/spyder-kernels/spyder_kernels/console/tests/test_console_kernel.py index a9564febed3..6cb817415ac 100644 --- a/external-deps/spyder-kernels/spyder_kernels/console/tests/test_console_kernel.py +++ b/external-deps/spyder-kernels/spyder_kernels/console/tests/test_console_kernel.py @@ -1143,14 +1143,16 @@ def test_locals_globals_in_pdb(kernel): reason="Doesn't work with pip packages") @pytest.mark.skipif( sys.version_info[:2] < (3, 9), - reason="Too flaky in Python 3.7/8 and doesn't work in older versions") -@pytest.mark.skipif(sys.platform == 'darwin', reason="Fails on Mac") + reason="Too flaky in Python 3.8 and doesn't work in older versions") def test_get_interactive_backend(backend): """ Test that we correctly get the interactive backend set in the kernel. """ - cmd = "from spyder_kernels.console import start; start.main()" + # This test passes locally but fails on CIs. Don't know why. + if sys.platform == "darwin" and backend == "qt" and os.environ.get('CI'): + return + cmd = "from spyder_kernels.console import start; start.main()" with setup_kernel(cmd) as client: # Set backend if backend is not None: diff --git a/requirements/main.yml b/requirements/main.yml index 7d530b854c7..6496d1a3348 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -7,7 +7,7 @@ channels: - conda-forge dependencies: - aiohttp >=3.9.3 - - asyncssh >=2.0.0 + - asyncssh >=2.0.0,<3.0.0 - atomicwrites >=1.2.0 - chardet >=2.0.0 - cloudpickle >=0.5.0 @@ -44,7 +44,7 @@ dependencies: - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 - - spyder-kernels >=3.0.0b5,<3.0.0b6 + - spyder-kernels >=3.0.0b6,<3.0.0b7 - 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 4840a245288..009a2bcbecd 100644 --- a/setup.py +++ b/setup.py @@ -205,7 +205,7 @@ def run(self): install_requires = [ 'aiohttp>=3.9.3', 'applaunchservices>=0.3.0;platform_system=="Darwin"', - 'asyncssh>=2.0.0', + 'asyncssh>=2.0.0,<3.0.0', 'atomicwrites>=1.2.0', 'chardet>=2.0.0', 'cloudpickle>=0.5.0', @@ -245,7 +245,7 @@ def run(self): 'rtree>=0.9.7', 'setuptools>=49.6.0', 'sphinx>=0.6.6', - 'spyder-kernels>=3.0.0b5,<3.0.0b6', + 'spyder-kernels>=3.0.0b6,<3.0.0b7', 'superqt>=0.6.1,<1.0.0', 'textdistance>=4.2.0', 'three-merge>=0.1.1', @@ -260,7 +260,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>=3.0.0b5,<3.1.0') + install_requires.append('spyder-kernels>=3.0.0b6,<3.1.0') extras_require = { 'test:platform_system == "Windows"': ['pywin32'], diff --git a/spyder/dependencies.py b/spyder/dependencies.py index 1d96c0c287c..4dcb258c6a4 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -36,7 +36,7 @@ # Hard dependencies AIOHTTP_REQVER = '>=3.9.3' APPLAUNCHSERVICES_REQVER = '>=0.3.0' -ASYNCSSH_REQVER = '>=2.0.0' +ASYNCSSH_REQVER = '>=2.0.0,<3.0.0' ATOMICWRITES_REQVER = '>=1.2.0' CHARDET_REQVER = '>=2.0.0' CLOUDPICKLE_REQVER = '>=0.5.0' @@ -72,7 +72,7 @@ RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' SPHINX_REQVER = '>=0.6.6' -SPYDER_KERNELS_REQVER = '>=3.0.0b5,<3.0.0b6' +SPYDER_KERNELS_REQVER = '>=3.0.0b6,<3.0.0b7' 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 c6aba3200e3..fbbca448dbc 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.0b5' if not running_under_pytest() else '3.0.0.dev0' + '3.0.0b6' if not running_under_pytest() else '3.0.0.dev0' ) SPYDER_KERNELS_MAX_VERSION = ( - '3.0.0b6' if not running_under_pytest() else '4.0.0' + '3.0.0b7' if not running_under_pytest() else '4.0.0' ) SPYDER_KERNELS_VERSION = ( f'>={SPYDER_KERNELS_MIN_VERSION},<{SPYDER_KERNELS_MAX_VERSION}'