From eaf209060733a5fde99bddd91cc5913f293f24f0 Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sat, 5 Aug 2023 16:20:36 -0400 Subject: [PATCH 1/2] build: unpin pyside6 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d2ad7e45..a0adfa03 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,7 @@ dev = [ docs = ["mkdocs-macros-plugin", "mkdocs-material", "mkdocstrings[python]"] quantity = ["pint"] pyside2 = ["pyside2"] -pyside6 = ["pyside6<6.5.1"] +pyside6 = ["pyside6 !=6.5.0,!=6.5.1"] pyqt5 = ["pyqt5"] pyqt6 = ["pyqt6"] font-fa5 = ["fonticon-fontawesome5"] From dc7e18b14f4f61d0301d8f131fb82dd98ff580bb Mon Sep 17 00:00:00 2001 From: Talley Lambert Date: Sat, 5 Aug 2023 16:23:53 -0400 Subject: [PATCH 2/2] add comments, change test --- .github/workflows/test_and_deploy.yml | 8 ++++---- pyproject.toml | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index e7e73c83..a7a43076 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -32,16 +32,16 @@ jobs: include: - python-version: "3.10" platform: macos-latest - backend: pyside6==6.5.0 + backend: pyside6 - python-version: "3.11" platform: macos-latest - backend: pyside6==6.5.0 + backend: pyside6 - python-version: "3.10" platform: windows-latest - backend: pyside6==6.5.0 + backend: pyside6 - python-version: "3.11" platform: windows-latest - backend: pyside6==6.5.0 + backend: pyside6 # python 3.7 - python-version: 3.7 diff --git a/pyproject.toml b/pyproject.toml index a0adfa03..b67e8306 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,6 +63,9 @@ dev = [ docs = ["mkdocs-macros-plugin", "mkdocs-material", "mkdocstrings[python]"] quantity = ["pint"] pyside2 = ["pyside2"] +# see issues surrounding usage of Generics in pyside6.5.x +# https://github.com/pyapp-kit/superqt/pull/177 +# https://github.com/pyapp-kit/superqt/pull/164 pyside6 = ["pyside6 !=6.5.0,!=6.5.1"] pyqt5 = ["pyqt5"] pyqt6 = ["pyqt6"]