Skip to content

Commit

Permalink
Update PyQt requirement to 5.15
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed Oct 18, 2021
1 parent 3cdcfc1 commit 9fc7b1f
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 17 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/test-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ on:
- '**.sh'

pull_request:
branches:
- master
- 5.*
- 4.x
branches-ignore:
- '**'
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
strategy:
fail-fast: false
matrix:
INSTALL_TYPE: ['conda', 'pip']
INSTALL_TYPE: ['pip']
PYTHON_VERSION: ['3.7']
TEST_TYPE: ['fast', 'slow']

Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
shell: bash
run: |
sudo apt-get update --fix-missing
sudo apt-get install libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libegl1-mesa libxkbcommon-x11-0 xterm --fix-missing
sudo apt-get install -qq pyqt5-dev-tools libxcb-xinerama0 xterm --fix-missing
- name: Cache conda
uses: actions/cache@v2
env:
Expand Down Expand Up @@ -108,6 +108,10 @@ jobs:
run: |
conda info
conda list
#- name: Setup tmate session
# if: env.RUN_BUILD == 'true'
# uses: mxschmitt/action-tmate@v3
# timeout-minutes: 30
- name: Run manifest checks
if: env.RUN_BUILD == 'true'
shell: bash -l {0}
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ on:
- '**.sh'

pull_request:
branches:
- master
- 5.*
- 4.x
branches-ignore:
- '**'
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ on:
- '**.sh'

pull_request:
branches:
- master
- 5.*
- 4.x
branches-ignore:
- '**'
paths:
- '.github/scripts/*.sh'
- '.github/workflows/*.yml'
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ def run(self):
'pylint>=2.5.0',
'python-lsp-black>=1.0.0',
'pyls-spyder>=0.4.0',
'pyqt5<5.13',
'pyqtwebengine<5.13',
'pyqt5<5.16',
'pyqtwebengine<5.16',
'python-lsp-server[all]>=1.2.2,<1.3.0',
'pyxdg>=0.26;platform_system=="Linux"',
'pyzmq>=17',
Expand Down
9 changes: 8 additions & 1 deletion spyder/widgets/dock.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,14 @@ def install_tab_event_filter(self, value):
QTabBar holding tabified dockwidgets.
"""
dock_tabbar = None
tabbars = self.main.findChildren(QTabBar)

# This is necessary to catch an error when closing the app
# in macOS with PyQt 5.15
try:
tabbars = self.main.findChildren(QTabBar)
except RuntimeError:
tabbars = []

for tabbar in tabbars:
for tab in range(tabbar.count()):
title = tabbar.tabText(tab)
Expand Down

0 comments on commit 9fc7b1f

Please sign in to comment.