Skip to content

Fix usage of deprecated/removed qApp in test_resize_qt and make sure we run this test in CI #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix usage of deprecated/removed qApp in test_resize_qt and make sure we run this test in CI #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ jobs:
coverage: codecov
runs-on: |
linux: ubuntu-latest
display: true
# Linux PyQt 5.15 and 6.x installations require apt-getting xcb and EGL deps
# and headless X11 display
apt:
- '^libxcb.*-dev'
- libxkbcommon-x11-dev
- libegl1-mesa
envs: |
# Code style
- linux: codestyle
Expand All @@ -21,7 +28,7 @@ jobs:
- linux: py39-test-mpl34
- linux: py39-test-mpl35
- linux: py310-test-mpl36
- linux: py310-test-mpl37
- linux: py310-test-mpl37-qt
- linux: py311-test-mpldev

# MacOS X and Windows builds - alternative Matplotlib versions
Expand Down
4 changes: 2 additions & 2 deletions mpl_scatter_density/tests/test_scatter_density_artist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def test_resize_qt():

pytest.importorskip('PyQt5')

from PyQt5.QtWidgets import QMainWindow
from PyQt5.QtWidgets import QMainWindow, QApplication

from matplotlib.figure import Figure
from matplotlib.backends.backend_qt5 import FigureManagerQT
Expand All @@ -265,7 +265,7 @@ def test_resize_qt():

canvas.draw = Mock(side_effect=canvas.draw)

from matplotlib.backends.backend_qt5 import qApp
qApp = QApplication.instance()

window = QMainWindow()
window.setCentralWidget(canvas)
Expand Down
7 changes: 6 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
[tox]
envlist =
py{36,37,38,39,310,311}-test{,-image}{-mpl30,-mpl31,-mpl32,-mpl33,-mpl34,-mpl35,-mpl36,-mpl37,-mpl38,-mpldev}
py{36,37,38,39,310,311}-test{,-image}{-mpl30,-mpl31,-mpl32,-mpl33,-mpl34,-mpl35,-mpl36,-mpl37,-mpl38,-mpldev}{,-qt}
codestyle
requires =
setuptools >= 30.3.0
pip >= 19.3.1
isolated_build = true

[testenv]
passenv =
DISPLAY
setenv =
image: MPLFLAGS = --mpl
!image: MPLFLAGS =
Expand All @@ -31,8 +33,11 @@ deps =
mpl36: numpy<2

mpl37: matplotlib==3.7.*
mpl38: matplotlib==3.8.*
mpldev: matplotlib>=0.0.dev0

qt: PyQt5

extras =
test

Expand Down