From 5edb9a1d3fc84a92fafa27f4ebed5064ccc23cf4 Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:31:02 -0500 Subject: [PATCH 1/3] Update core dependencies --- binder/environment.yml | 4 ++-- requirements/main.yml | 4 ++-- setup.py | 6 +++--- spyder/dependencies.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/binder/environment.yml b/binder/environment.yml index f7808455364..1ec4b5d3a64 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -36,13 +36,13 @@ dependencies: - pyzmq >=24.0.0 - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 -- qtawesome >=1.2.1 +- qtawesome >=1.2.1,<1.3.0 - qtconsole >=5.5.1,<5.6.0 - qtpy >=2.1.0 - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 -- spyder-kernels >=2.5.0,<2.6.0 +- spyder-kernels >=2.5.1,<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 6db5e8f4851..96d80b57e53 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -33,13 +33,13 @@ dependencies: - pyzmq >=24.0.0 - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 - - qtawesome >=1.2.1 + - qtawesome >=1.2.1,<1.3.0 - qtconsole >=5.5.1,<5.6.0 - qtpy >=2.1.0 - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 - - spyder-kernels >=2.5.0,<2.6.0 + - spyder-kernels >=2.5.1,<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 41c39ca17e7..7af75bfb9a1 100644 --- a/setup.py +++ b/setup.py @@ -237,13 +237,13 @@ def run(self): 'pyzmq>=24.0.0', 'qdarkstyle>=3.2.0,<3.3.0', 'qstylizer>=0.2.2', - 'qtawesome>=1.2.1', + 'qtawesome>=1.2.1,<1.3.0', 'qtconsole>=5.5.1,<5.6.0', 'qtpy>=2.1.0', 'rtree>=0.9.7', 'setuptools>=49.6.0', 'sphinx>=0.6.6', - 'spyder-kernels>=2.5.0,<2.6.0', + 'spyder-kernels>=2.5.1,<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.10.0,<1.12.0') install_requires.append('qtconsole>=5.5.1,<5.7.0') - install_requires.append('spyder-kernels>=2.5.0,<2.7.0') + install_requires.append('spyder-kernels>=2.5.1,<2.7.0') extras_require = { 'test:platform_system == "Windows"': ['pywin32'], diff --git a/spyder/dependencies.py b/spyder/dependencies.py index b3c647a4b9c..e1d12f7460d 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -65,13 +65,13 @@ PYZMQ_REQVER = '>=24.0.0' QDARKSTYLE_REQVER = '>=3.2.0,<3.3.0' QSTYLIZER_REQVER = '>=0.2.2' -QTAWESOME_REQVER = '>=1.2.1' +QTAWESOME_REQVER = '>=1.2.1,<1.3.0' QTCONSOLE_REQVER = '>=5.5.1,<5.6.0' QTPY_REQVER = '>=2.1.0' RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' SPHINX_REQVER = '>=0.6.6' -SPYDER_KERNELS_REQVER = '>=2.5.0,<2.6.0' +SPYDER_KERNELS_REQVER = '>=2.5.1,<2.6.0' TEXTDISTANCE_REQVER = '>=4.2.0' THREE_MERGE_REQVER = '>=0.1.1' # None for pynsist install for now From 34676f45e8828e2bd1a01c4e326dadf5ca8605f4 Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:39:28 -0500 Subject: [PATCH 2/3] CI: Remove ipykernel version restriction --- .github/scripts/install.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh index ce845335834..fbc18b2b2c9 100755 --- a/.github/scripts/install.sh +++ b/.github/scripts/install.sh @@ -26,9 +26,6 @@ if [ "$USE_CONDA" = "true" ]; then # Remove pylsp before installing its subrepo below micromamba remove --force python-lsp-server python-lsp-server-base -y - # Test event loop fixes - micromamba install ipykernel=6.29.3 -q -y - else # Update pip and setuptools python -m pip install -U pip setuptools wheel build @@ -45,9 +42,6 @@ else # To check our manifest pip install -q check-manifest - # Test event loop fixes - pip install ipykernel==6.29.3 - if [ "$OS" = "linux" ]; then # This allows the test suite to run more reliably on Linux pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y From c58ac96e000688a739ba130b6cf2f9e667e9d66d Mon Sep 17 00:00:00 2001 From: dalthviz <16781833+dalthviz@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:39:55 -0500 Subject: [PATCH 3/3] git subrepo pull external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "3b3765cea" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "2.x" commit: "3b3765cea" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" --- external-deps/spyder-kernels/.gitrepo | 4 ++-- external-deps/spyder-kernels/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 4904cfc55f6..7242b76b593 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 = e6888db832d3ff4e99278c002a46bdc3c4207ec3 - parent = 1880ff003b51bbd409b20c2b7ea81074862ab101 + commit = 3b3765cea8ffdb039f9c33119f9688ebb17c0281 + parent = 34676f45e8828e2bd1a01c4e326dadf5ca8605f4 method = merge cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/CHANGELOG.md b/external-deps/spyder-kernels/CHANGELOG.md index 8d9c4a02db0..0bb2216b6b6 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.1 (2024-02-28) + +### Pull Requests Merged + +* [PR 479](https://github.com/spyder-ide/spyder-kernels/pull/479) - PR: Fix hangs with Maplotlib interactive backends, by [@ccordoba12](https://github.com/ccordoba12) + +In this release 1 pull request was closed. + + +---- + + ## Version 2.5.0 (2023-11-06) ### New features