Merge from 5.x: PR #20735

Fixes #20381
spyder-ide · Mar 29, 2023 · d613bca · d613bca
2 parents 138dafb + 2592bc0
commit d613bca
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 37 deletions.
diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh
@@ -23,8 +23,8 @@ if [ "$USE_CONDA" = "true" ]; then
     # To check our manifest and coverage
     micromamba install check-manifest -c conda-forge codecov -q -y
 
-    # Install PyZMQ 24 to avoid hangs
-    micromamba install -c conda-forge pyzmq=24
+    # To test with Jupyter-client 8
+    micromamba install jupyter_client=8.1
 else
     # Update pip and setuptools
     python -m pip install -U pip setuptools wheel build
@@ -47,8 +47,8 @@ else
         pip install pyqt5==5.12.* pyqtwebengine==5.12.*
     fi
 
-    # Install PyZMQ 24 to avoid hangs
-    pip install pyzmq==24.0.1
+    # To test with Jupyter-client 8
+    pip install jupyter-client==8.1
 fi
 
 # Install subrepos from source

diff --git a/external-deps/qtconsole/.gitrepo b/external-deps/qtconsole/.gitrepo
diff --git a/external-deps/qtconsole/docs/source/changelog.rst b/external-deps/qtconsole/docs/source/changelog.rst
diff --git a/external-deps/qtconsole/qtconsole/client.py b/external-deps/qtconsole/qtconsole/client.py
diff --git a/external-deps/qtconsole/qtconsole/frontend_widget.py b/external-deps/qtconsole/qtconsole/frontend_widget.py
diff --git a/external-deps/qtconsole/qtconsole/jupyter_widget.py b/external-deps/qtconsole/qtconsole/jupyter_widget.py
diff --git a/external-deps/qtconsole/qtconsole/manager.py b/external-deps/qtconsole/qtconsole/manager.py
diff --git a/external-deps/qtconsole/qtconsole/qtconsoleapp.py b/external-deps/qtconsole/qtconsole/qtconsoleapp.py
diff --git a/external-deps/qtconsole/qtconsole/tests/test_00_console_widget.py b/external-deps/qtconsole/qtconsole/tests/test_00_console_widget.py
diff --git a/external-deps/qtconsole/setup.py b/external-deps/qtconsole/setup.py