From b1979d4cc479067301a4566c72921ce50907106b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 07:34:33 +0000 Subject: [PATCH 01/11] Build(deps): Bump imageio from 2.36.0 to 2.36.1 Bumps [imageio](https://github.com/imageio/imageio) from 2.36.0 to 2.36.1. - [Release notes](https://github.com/imageio/imageio/releases) - [Changelog](https://github.com/imageio/imageio/blob/master/CHANGELOG.md) - [Commits](https://github.com/imageio/imageio/compare/v2.36.0...v2.36.1) --- updated-dependencies: - dependency-name: imageio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements_docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_docs.txt b/requirements_docs.txt index dbeb739f..f71e7881 100644 --- a/requirements_docs.txt +++ b/requirements_docs.txt @@ -1,6 +1,6 @@ cmocean==4.0.3 colorcet==3.1.0 -imageio==2.36.0 +imageio==2.36.1 imageio-ffmpeg==0.5.1 lxml==5.3.0 matplotlib==3.9.2 From 128b83656298a84c0c0c134a83a248324ab06dfe Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 10:09:52 -0500 Subject: [PATCH 02/11] FIX: Pin VTK --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42ad3ab1..6986638b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,7 @@ jobs: name: "Install PySide6" if: matrix.qt == 'PySide6' - run: | - pip install -e . + pip install -e . "vtk<9.4" --only-binary vtk python -c "import pyvista; print(pyvista.Report())" name: "Install pyvistaqt" - run: python pyvistaqt/rwi.py From de540ca4cc3c4ba05e6cc9e25ca0d07b966fc424 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 10:10:19 -0500 Subject: [PATCH 03/11] FIX: Move --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6986638b..fa70ecf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: - run: | python -m pip install --upgrade pip wheel pip install --upgrade -r requirements_test.txt - pip install --upgrade --progress-bar off https://github.com/pyvista/pyvista/zipball/main https://github.com/spyder-ide/qtpy/zipball/master + pip install --upgrade --progress-bar off https://github.com/pyvista/pyvista/zipball/main https://github.com/spyder-ide/qtpy/zipball/master "vtk<9.4" --only-binary vtk name: "Install dependencies with pip" - run: pip install ${{ matrix.qt }} name: "Install Qt binding" @@ -50,7 +50,7 @@ jobs: name: "Install PySide6" if: matrix.qt == 'PySide6' - run: | - pip install -e . "vtk<9.4" --only-binary vtk + pip install -e . python -c "import pyvista; print(pyvista.Report())" name: "Install pyvistaqt" - run: python pyvistaqt/rwi.py From 7e6b356d0bd4d593953f2b0b21c2fe51ddb67030 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 10:10:46 -0500 Subject: [PATCH 04/11] FIX: Both --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa70ecf6..de58b4a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: - run: | python -m pip install --upgrade pip wheel pip install --upgrade -r requirements_test.txt - pip install --upgrade --progress-bar off https://github.com/pyvista/pyvista/zipball/main https://github.com/spyder-ide/qtpy/zipball/master "vtk<9.4" --only-binary vtk + pip install --upgrade --progress-bar off https://github.com/pyvista/pyvista/zipball/main https://github.com/spyder-ide/qtpy/zipball/master name: "Install dependencies with pip" - run: pip install ${{ matrix.qt }} name: "Install Qt binding" @@ -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" From e9b81ac4968b33e3d9da02b437f0acd5d0b9b12b Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 12:21:39 -0500 Subject: [PATCH 05/11] FIX: More --- .github/workflows/ci.yml | 7 ++----- environment.yml | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de58b4a5..1acb8bbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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 . diff --git a/environment.yml b/environment.yml index 0e46fb72..04f1c81e 100644 --- a/environment.yml +++ b/environment.yml @@ -14,8 +14,8 @@ dependencies: - scooby>=0.5.1 - toml - pip + - vtk + - pyvista - pip: - - vtk - - pyvista>=0.32.0 - pytest-memprof - sphinx-gallery From fd7da682a4e7e664bd5a0aa4077de0e4b843e956 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 14:17:13 -0500 Subject: [PATCH 06/11] FIX: Fine --- tests/test_plotting.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_plotting.py b/tests/test_plotting.py index 3614d796..3e00a383 100644 --- a/tests/test_plotting.py +++ b/tests/test_plotting.py @@ -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, @@ -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) From d9d204bf50727b61419402cf24cf260b690a659a Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 16:39:58 -0500 Subject: [PATCH 07/11] FIX: pip --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 04f1c81e..80130908 100644 --- a/environment.yml +++ b/environment.yml @@ -14,8 +14,8 @@ dependencies: - scooby>=0.5.1 - toml - pip - - vtk - pyvista - pip: + - vtk - pytest-memprof - sphinx-gallery From 73af6acd1dd442efa37007047c18a0cc435da28e Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 2 Dec 2024 18:44:46 -0500 Subject: [PATCH 08/11] FIX: Restore --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 80130908..0e46fb72 100644 --- a/environment.yml +++ b/environment.yml @@ -14,8 +14,8 @@ dependencies: - scooby>=0.5.1 - toml - pip - - pyvista - pip: - vtk + - pyvista>=0.32.0 - pytest-memprof - sphinx-gallery From 3fb003bcc54189cf810f2de6830bc1f6c8bf5ee9 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Tue, 3 Dec 2024 12:55:25 +0900 Subject: [PATCH 09/11] Update ci.yml --- .github/workflows/ci.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1acb8bbd..aa4f3d35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: pytest -v tests/test_qt.py name: "Import without Qt" if: matrix.qt == 'None' - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} if: success() @@ -128,7 +128,7 @@ jobs: name: "Setup python" - run: | python -m pip install --upgrade pip wheel - pip install -r requirements_test.txt "vtk<9.4" --only-binary vtk + pip install -r requirements_test.txt name: "Install dependencies with pip" - run: pip install "PyQt6-Qt6!=6.6.0,!=6.7.0" "PyQt6!=6.6.0" name: "Install Qt binding" @@ -144,7 +144,7 @@ jobs: name: "Install pyvistaqt" - run: pytest -v --cov pyvistaqt --cov-report html name: "Run Tests" - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} if: success() @@ -157,7 +157,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-13", "macos-latest", "windows-latest"] - qt: ["PySide6"] + qt: ["PyQt5"] python-version: ["3.12"] defaults: run: @@ -177,7 +177,10 @@ jobs: environment-file: "environment.yml" environment-name: "pyvistaqt-env" create-args: >- - python=${{ matrix.python-version }} ${{ matrix.qt }} + python=${{ matrix.python-version }} + - shell: bash -el {0} + run: pip install ${{ matrix.qt }} + name: "Install Qt binding" - shell: bash -el {0} run: | pip install -e . @@ -186,7 +189,7 @@ jobs: - shell: bash -el {0} run: pytest -v --cov pyvistaqt --cov-report html name: "Run Tests" - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@v5 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} if: success() From 0afd2e7abfd92475928722265454ac4f44c8d8a1 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Tue, 3 Dec 2024 12:56:03 +0900 Subject: [PATCH 10/11] Update ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa4f3d35..42ad3ab1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: pytest -v tests/test_qt.py name: "Import without Qt" if: matrix.qt == 'None' - - uses: codecov/codecov-action@v5 + - uses: codecov/codecov-action@v4 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} if: success() @@ -144,7 +144,7 @@ jobs: name: "Install pyvistaqt" - run: pytest -v --cov pyvistaqt --cov-report html name: "Run Tests" - - uses: codecov/codecov-action@v5 + - uses: codecov/codecov-action@v4 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} if: success() @@ -189,7 +189,7 @@ jobs: - shell: bash -el {0} run: pytest -v --cov pyvistaqt --cov-report html name: "Run Tests" - - uses: codecov/codecov-action@v5 + - uses: codecov/codecov-action@v4 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} if: success() From 65dee89e6f9f1d50bad774de4ed770cbfcd4b805 Mon Sep 17 00:00:00 2001 From: Tetsuo Koyama Date: Tue, 3 Dec 2024 12:56:44 +0900 Subject: [PATCH 11/11] Update test_plotting.py --- tests/test_plotting.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test_plotting.py b/tests/test_plotting.py index 3e00a383..3614d796 100644 --- a/tests/test_plotting.py +++ b/tests/test_plotting.py @@ -12,7 +12,7 @@ import pyvista import vtk from qtpy.QtWidgets import QAction, QFrame, QMenuBar, QToolBar, QVBoxLayout -from qtpy import QtCore, API_NAME +from qtpy import QtCore from qtpy.QtCore import Qt, QPoint, QPointF, QMimeData, QUrl from qtpy.QtGui import QDragEnterEvent, QDropEvent from qtpy.QtWidgets import (QTreeWidget, QStackedWidget, QCheckBox, @@ -982,8 +982,6 @@ 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)