Skip to content
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

Switch conda CIs from PyQt5 to PySide6 #664

Merged
merged 3 commits into from
Dec 3, 2024
Merged

Switch conda CIs from PyQt5 to PySide6 #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f23b4b
Switch conda CIs from PyQt5 to PySide6
tkoyama010 Dec 3, 2024
0015327
Update test_plotting.py
tkoyama010 Dec 3, 2024
279a9e4
Merge branch 'main' into maint/update-ci
tkoyama010 Dec 3, 2024
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: 3 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
name: "Setup python"
- run: |
python -m pip install --upgrade pip wheel
pip install -r requirements_test.txt
pip install -r requirements_test.txt "vtk<9.4" --only-binary vtk
name: "Install dependencies with pip"
- run: pip install "PyQt6-Qt6!=6.6.0,!=6.7.0" "PyQt6!=6.6.0"
name: "Install Qt binding"
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-13", "macos-latest", "windows-latest"]
qt: ["PyQt5"]
qt: ["PySide6"]
python-version: ["3.12"]
defaults:
run:
Expand All @@ -177,10 +177,7 @@ jobs:
environment-file: "environment.yml"
environment-name: "pyvistaqt-env"
create-args: >-
python=${{ matrix.python-version }}
- shell: bash -el {0}
run: pip install ${{ matrix.qt }}
name: "Install Qt binding"
python=${{ matrix.python-version }} ${{ matrix.qt }}
- shell: bash -el {0}
run: |
pip install -e .
Expand Down
4 changes: 3 additions & 1 deletion tests/test_plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import pyvista
import vtk
from qtpy.QtWidgets import QAction, QFrame, QMenuBar, QToolBar, QVBoxLayout
from qtpy import QtCore
from qtpy import QtCore, API_NAME
from qtpy.QtCore import Qt, QPoint, QPointF, QMimeData, QUrl
from qtpy.QtGui import QDragEnterEvent, QDropEvent
from qtpy.QtWidgets import (QTreeWidget, QStackedWidget, QCheckBox,
Expand Down Expand Up @@ -982,6 +982,8 @@ def test_sphinx_gallery_scraping(qtbot, monkeypatch, plotting, tmpdir, n_win):
if Version('0.38.0') <= PV_VERSION <= Version('0.38.6'):
pytest.xfail('Scraping fails on PyVista 0.38.0 to 0.38.6')
monkeypatch.setattr(pyvista, 'BUILDING_GALLERY', True)
if n_win == 2 and API_NAME == "PySide6" and sys.platform == "linux":
pytest.skip("Problems with PySide6 on Linux")

plotters = [
BackgroundPlotter(off_screen=False, editor=False, show=True)
Expand Down
Loading