From f03453d508d59ff1705e68266d79a06f3097e116 Mon Sep 17 00:00:00 2001 From: IgorTatarnikov Date: Wed, 29 Nov 2023 13:50:43 +0000 Subject: [PATCH 1/2] Windows CI now runs on python 3.11, fetch pyside2 from conda-forge --- .github/workflows/test_and_deploy.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 4956edd6..6736b85f 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -29,13 +29,17 @@ jobs: - os: macos-latest python-version: "3.11" - os: windows-latest - python-version: "3.10" + python-version: "3.11" steps: - name: Install hdf5 libs for Mac if: runner.os == 'macOS' run: brew install hdf5 + - name: Install pyside2 for Windows + if: runner.os == 'Windows' + run: conda install -c conda-forge pyside2 + # Helps set up VTK with a headless display - uses: pyvista/setup-headless-display-action@v2 From 942d603c066ab5a7f5f0d6faa92b4daac4c06523 Mon Sep 17 00:00:00 2001 From: IgorTatarnikov Date: Thu, 30 Nov 2023 15:22:33 +0000 Subject: [PATCH 2/2] Changed pyside2 to pyqt5 in dev dependencies --- .github/workflows/test_and_deploy.yml | 4 ---- pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 6736b85f..73fca2f5 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -36,10 +36,6 @@ jobs: if: runner.os == 'macOS' run: brew install hdf5 - - name: Install pyside2 for Windows - if: runner.os == 'Windows' - run: conda install -c conda-forge pyside2 - # Helps set up VTK with a headless display - uses: pyvista/setup-headless-display-action@v2 diff --git a/pyproject.toml b/pyproject.toml index 0b1fb10f..1b48a607 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ dev = [ "pre-commit", "ruff", "setuptools_scm", - "pyside2", + "pyqt5", "imio", ] nb = ["jupyter", "k3d"]