From c4cb19df17eb17af893915b8463162901464a06c Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Tue, 27 Feb 2024 13:05:32 -0500 Subject: [PATCH 1/3] git subrepo pull (merge) external-deps/spyder-kernels subrepo: subdir: "external-deps/spyder-kernels" merged: "e6888db83" upstream: origin: "https://github.com/spyder-ide/spyder-kernels.git" branch: "2.x" commit: "e6888db83" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" --- .../spyder-kernels/.github/workflows/linux-pip-tests.yml | 6 ++++-- .../spyder-kernels/.github/workflows/linux-tests.yml | 2 +- .../spyder-kernels/.github/workflows/macos-tests.yml | 2 +- external-deps/spyder-kernels/.gitrepo | 4 ++-- external-deps/spyder-kernels/requirements/posix.txt | 4 ++-- external-deps/spyder-kernels/requirements/windows.txt | 4 ++-- external-deps/spyder-kernels/setup.py | 4 ++-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/external-deps/spyder-kernels/.github/workflows/linux-pip-tests.yml b/external-deps/spyder-kernels/.github/workflows/linux-pip-tests.yml index 8f2beab22fb..6b79e05b615 100644 --- a/external-deps/spyder-kernels/.github/workflows/linux-pip-tests.yml +++ b/external-deps/spyder-kernels/.github/workflows/linux-pip-tests.yml @@ -46,8 +46,10 @@ jobs: shell: bash -l {0} run: | pip install -e .[test] - # Zict 2.1.0 is not compatible with Python 3 - pip install zict==2.0.0 + # Zict >2.0.0 is not compatible with Python 3 + if [ "$PYTHON_VERSION" = "2.7" ]; then + pip install zict==2.0.0 + fi - name: Show environment information shell: bash -l {0} run: | diff --git a/external-deps/spyder-kernels/.github/workflows/linux-tests.yml b/external-deps/spyder-kernels/.github/workflows/linux-tests.yml index d3792737788..ff6f449a7f0 100644 --- a/external-deps/spyder-kernels/.github/workflows/linux-tests.yml +++ b/external-deps/spyder-kernels/.github/workflows/linux-tests.yml @@ -47,7 +47,7 @@ jobs: - name: Install package dependencies shell: bash -l {0} run: | - if [ "$PYTHON_VERSION" != "2.7" ]; then mamba install --file requirements/posix.txt -y -q; else mamba install --file requirements/python-27.txt -y -q; fi + mamba install --file requirements/posix.txt -y -q - name: Install test dependencies shell: bash -l {0} run: mamba install --file requirements/tests.txt -y -q diff --git a/external-deps/spyder-kernels/.github/workflows/macos-tests.yml b/external-deps/spyder-kernels/.github/workflows/macos-tests.yml index 5fecd3393fb..819f9a1e611 100644 --- a/external-deps/spyder-kernels/.github/workflows/macos-tests.yml +++ b/external-deps/spyder-kernels/.github/workflows/macos-tests.yml @@ -43,7 +43,7 @@ jobs: - name: Install package dependencies shell: bash -l {0} run: | - if [ "$PYTHON_VERSION" != "2.7" ]; then mamba install --file requirements/posix.txt -y -q; else mamba install --file requirements/python-27.txt -y -q; fi + mamba install --file requirements/posix.txt -y -q - name: Install test dependencies shell: bash -l {0} run: mamba install --file requirements/tests.txt -y -q diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo index 6b2ecce4277..4904cfc55f6 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 = 204b78347561f6f08c4f97b8415fcb7f76685e70 - parent = ae9fb9556841244c293a878ef39e842ba9c52c9b + commit = e6888db832d3ff4e99278c002a46bdc3c4207ec3 + parent = 1880ff003b51bbd409b20c2b7ea81074862ab101 method = merge cmdver = 0.4.3 diff --git a/external-deps/spyder-kernels/requirements/posix.txt b/external-deps/spyder-kernels/requirements/posix.txt index be22b77214b..fc3b9f66612 100644 --- a/external-deps/spyder-kernels/requirements/posix.txt +++ b/external-deps/spyder-kernels/requirements/posix.txt @@ -1,6 +1,6 @@ cloudpickle -ipykernel>=6.23.2,<7 +ipykernel>=6.29.3,<7 ipython>=8.12.2,<9 jupyter_client>=7.4.9,<9 -pyzmq>=22.1.0 +pyzmq>=24.0.0 wurlitzer>=1.0.3 diff --git a/external-deps/spyder-kernels/requirements/windows.txt b/external-deps/spyder-kernels/requirements/windows.txt index ec6e8483f81..9d6370b6139 100644 --- a/external-deps/spyder-kernels/requirements/windows.txt +++ b/external-deps/spyder-kernels/requirements/windows.txt @@ -1,5 +1,5 @@ cloudpickle -ipykernel>=6.23.2,<7 +ipykernel>=6.29.3,<7 ipython>=8.12.2,<9 jupyter_client>=7.4.9,<9 -pyzmq>=22.1.0 +pyzmq>=24.0.0 diff --git a/external-deps/spyder-kernels/setup.py b/external-deps/spyder-kernels/setup.py index 3a417cdeaa3..e2873c98e4f 100644 --- a/external-deps/spyder-kernels/setup.py +++ b/external-deps/spyder-kernels/setup.py @@ -41,7 +41,7 @@ def get_version(module='spyder_kernels'): 'cloudpickle', 'ipykernel>=4.5,<5; python_version<"3"', 'ipykernel>=6.16.1,<6.17; python_version<"3.8"', - 'ipykernel>=6.23.2,<7; python_version>="3.8"', + 'ipykernel>=6.29.3,<7; python_version>="3.8"', 'ipython<6; python_version<"3"', 'ipython>=7.31.1,<8; python_version<"3.8"', 'ipython>=8.12.2,<8.13; python_version=="3.8"', @@ -49,7 +49,7 @@ def get_version(module='spyder_kernels'): 'jupyter-client>=5.3.4,<6; python_version<"3"', 'jupyter-client>=7.4.9,<9; python_version>="3"', 'pyzmq>=17,<20; python_version<"3"', - 'pyzmq>=22.1.0; python_version>="3"', + 'pyzmq>=24.0.0; python_version>="3"', 'wurlitzer>=1.0.3;platform_system!="Windows"', ] From aae0c3a803a9611b85a56613e8bba09788d4c667 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Tue, 27 Feb 2024 13:09:04 -0500 Subject: [PATCH 2/3] CI: Use latest version of IPykernel to test event loop fixes --- .github/scripts/install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh index fbc18b2b2c9..ce845335834 100755 --- a/.github/scripts/install.sh +++ b/.github/scripts/install.sh @@ -26,6 +26,9 @@ 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 @@ -42,6 +45,9 @@ 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 5fb6f38521174f546f2353556c88f77920a9dfbd Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Tue, 27 Feb 2024 13:11:39 -0500 Subject: [PATCH 3/3] Increase minimal required version of PyZMQ to 24.0.0 This matches the version required by IPykernel, which is a direct dependency of Spyder-kernels. --- 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 b2c4b045b96..f7808455364 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -33,7 +33,7 @@ dependencies: - python-lsp-black >=2.0.0,<3.0.0 - python-lsp-server >=1.10.0,<1.11.0 - pyxdg >=0.26 -- pyzmq >=22.1.0 +- pyzmq >=24.0.0 - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 - qtawesome >=1.2.1 diff --git a/requirements/main.yml b/requirements/main.yml index 8056cb75105..6db5e8f4851 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -30,7 +30,7 @@ dependencies: - pyqtwebengine >=5.10,<5.16 - python-lsp-black >=2.0.0,<3.0.0 - python-lsp-server >=1.10.0,<1.11.0 - - pyzmq >=22.1.0 + - pyzmq >=24.0.0 - qdarkstyle >=3.2.0,<3.3.0 - qstylizer >=0.2.2 - qtawesome >=1.2.1 diff --git a/setup.py b/setup.py index 3558d7c9729..41c39ca17e7 100644 --- a/setup.py +++ b/setup.py @@ -234,7 +234,7 @@ def run(self): 'pyqtwebengine>=5.10,<5.16', 'python-lsp-server[all]>=1.10.0,<1.11.0', 'pyxdg>=0.26;platform_system=="Linux"', - 'pyzmq>=22.1.0', + 'pyzmq>=24.0.0', 'qdarkstyle>=3.2.0,<3.3.0', 'qstylizer>=0.2.2', 'qtawesome>=1.2.1', diff --git a/spyder/dependencies.py b/spyder/dependencies.py index c2387579033..b3c647a4b9c 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -62,7 +62,7 @@ PYLSP_BLACK_REQVER = '>=2.0.0,<3.0.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYXDG_REQVER = '>=0.26' -PYZMQ_REQVER = '>=22.1.0' +PYZMQ_REQVER = '>=24.0.0' QDARKSTYLE_REQVER = '>=3.2.0,<3.3.0' QSTYLIZER_REQVER = '>=0.2.2' QTAWESOME_REQVER = '>=1.2.1'