Skip to content

Commit

Permalink
Merge pull request #21834 from ccordoba12/issue-21299
Browse files Browse the repository at this point in the history
PR: Fix hangs when using Matplotlib interactive backends (IPython console)
  • Loading branch information
ccordoba12 authored Feb 27, 2024
2 parents 1880ff0 + 5fb6f38 commit 4b8941d
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 16 deletions.
6 changes: 6 additions & 0 deletions .github/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/.gitrepo

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/requirements/posix.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/requirements/windows.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/setup.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion requirements/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion spyder/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 4b8941d

Please sign in to comment.