From 5d3ae533dd97f3c70f53d5ba20682fa7d86e5d48 Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Sat, 5 Feb 2022 17:42:47 +0100 Subject: [PATCH 1/5] TST: enable PyQt 5.15 tests for macOS, Windows --- azure-pipelines.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2b07e6183..2b40e7210 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -48,13 +48,19 @@ jobs: # Test a few configurations on MacOS X - macos: py37-test-pyqt513 - macos: py38-test-pyqt514-all + # PyQt 5.15 failing on Linux possibly due to X11-related problems (X11/lib/libxcb) + # - let's try on macOS + - macos: py39-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - macos: py37-test-pyside513 # Test a few configurations on Windows - windows: py37-test-pyqt510 - # FIXME: The following fails due to https://github.com/jupyter/qtconsole/issues/400 - # - windows: py38-test-pyqt514-all + # The following failed due to https://github.com/jupyter/qtconsole/issues/400 - should be fixed upstream + - windows: py38-test-pyqt514-all + # PyQt 5.15 failing on Linux possibly due to X11-related problems (X11/lib/libxcb) + # - let's try on Windows + - windows: py39-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - windows: py37-test-pyside513-all From 381c7d82ce60a1bd759f2d2908d99f814b5a5feb Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Sat, 5 Feb 2022 17:59:13 +0100 Subject: [PATCH 2/5] DNM: test more PyQt 5.15 configurations --- azure-pipelines.yml | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2b40e7210..547c2cd8c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,44 +27,48 @@ jobs: coverage: 'false' # Linux builds - test on all supported PyQt5 versions, and include all dependencies in some builds - - linux: py37-test-pyqt59-legacy - - linux: py37-test-pyqt510 - - linux: py37-test-pyqt511-all - - linux: py37-test-pyqt512 - - linux: py37-test-pyqt513-all - - linux: py38-test-pyqt514 + # - linux: py37-test-pyqt59-legacy + # - linux: py37-test-pyqt510 + # - linux: py37-test-pyqt511-all + # - linux: py37-test-pyqt512 + # - linux: py37-test-pyqt513-all + # - linux: py38-test-pyqt514 # TODO: The PyQt 5.15 builds have never passed, need to investigate why - # - linux: py39-test-pyqt515 - # - linux: py310-test-pyqt515 + - linux: py38-test-pyqt515 + - linux: py39-test-pyqt515 + - linux: py310-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - linux: py36-test-pyside512 # - linux: py37-test-pyside513-all # - linux: py38-test-pyside514 # Test against latest developer versions of some packages - - linux: py310-test-pyqt514-dev-all + # - linux: py310-test-pyqt514-dev-all # Test a few configurations on MacOS X - - macos: py37-test-pyqt513 - - macos: py38-test-pyqt514-all + # - macos: py37-test-pyqt513 + # - macos: py38-test-pyqt514-all # PyQt 5.15 failing on Linux possibly due to X11-related problems (X11/lib/libxcb) # - let's try on macOS + - macos: py38-test-pyqt515 - macos: py39-test-pyqt515 + - macos: py310-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - macos: py37-test-pyside513 # Test a few configurations on Windows - - windows: py37-test-pyqt510 + # - windows: py37-test-pyqt510 # The following failed due to https://github.com/jupyter/qtconsole/issues/400 - should be fixed upstream - windows: py38-test-pyqt514-all # PyQt 5.15 failing on Linux possibly due to X11-related problems (X11/lib/libxcb) # - let's try on Windows - windows: py39-test-pyqt515 + - windows: py310-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - windows: py37-test-pyside513-all # Try out documentation build on Linux and Windows - - linux: py37-docs-pyqt513 - - macos: py37-docs-pyqt513 - - windows: py38-docs-pyqt513 + # - linux: py37-docs-pyqt513 + # - macos: py37-docs-pyqt513 + # - windows: py38-docs-pyqt513 From 3d40b83d7f9f35243a02b205bdae29be8d7524af Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Sat, 5 Feb 2022 21:28:29 +0100 Subject: [PATCH 3/5] TST: PyQt 5.15 libxkb deps --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 547c2cd8c..5afd6c3d6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,10 @@ jobs: coverage: codecov libraries: apt: + - libxcb.*-dev - libxkbcommon-x11-0 + - libxkbcommon-x11-dev + - libxkbcommon-dev brew: - enchant @@ -51,20 +54,17 @@ jobs: # - macos: py38-test-pyqt514-all # PyQt 5.15 failing on Linux possibly due to X11-related problems (X11/lib/libxcb) # - let's try on macOS - - macos: py38-test-pyqt515 - - macos: py39-test-pyqt515 - - macos: py310-test-pyqt515 + # - macos: py37-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - macos: py37-test-pyside513 # Test a few configurations on Windows # - windows: py37-test-pyqt510 # The following failed due to https://github.com/jupyter/qtconsole/issues/400 - should be fixed upstream - - windows: py38-test-pyqt514-all + # - windows: py38-test-pyqt514-all # PyQt 5.15 failing on Linux possibly due to X11-related problems (X11/lib/libxcb) # - let's try on Windows - - windows: py39-test-pyqt515 - - windows: py310-test-pyqt515 + # - windows: py38-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - windows: py37-test-pyside513-all From 16708c9f1fad33caed3d9dfba00dbb06f380958f Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Sat, 5 Feb 2022 21:39:46 +0100 Subject: [PATCH 4/5] TST: All PyQt 5.15 with libxcb/libxkb debs on Linux --- azure-pipelines.yml | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5afd6c3d6..e69671d00 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,12 +13,12 @@ jobs: xvfb: true coverage: codecov + + # The Linux PyQt 5.15 installation requires apt-getting its xcb deps libraries: apt: - libxcb.*-dev - - libxkbcommon-x11-0 - libxkbcommon-x11-dev - - libxkbcommon-dev brew: - enchant @@ -30,14 +30,12 @@ jobs: coverage: 'false' # Linux builds - test on all supported PyQt5 versions, and include all dependencies in some builds - # - linux: py37-test-pyqt59-legacy - # - linux: py37-test-pyqt510 - # - linux: py37-test-pyqt511-all - # - linux: py37-test-pyqt512 - # - linux: py37-test-pyqt513-all - # - linux: py38-test-pyqt514 - - # TODO: The PyQt 5.15 builds have never passed, need to investigate why + - linux: py37-test-pyqt59-legacy + - linux: py37-test-pyqt510 + - linux: py37-test-pyqt511-all + - linux: py37-test-pyqt512 + - linux: py37-test-pyqt513-all + - linux: py38-test-pyqt514 - linux: py38-test-pyqt515 - linux: py39-test-pyqt515 - linux: py310-test-pyqt515 @@ -47,28 +45,27 @@ jobs: # - linux: py38-test-pyside514 # Test against latest developer versions of some packages - # - linux: py310-test-pyqt514-dev-all + - linux: py310-test-pyqt514-dev-all # Test a few configurations on MacOS X - # - macos: py37-test-pyqt513 - # - macos: py38-test-pyqt514-all - # PyQt 5.15 failing on Linux possibly due to X11-related problems (X11/lib/libxcb) - # - let's try on macOS - # - macos: py37-test-pyqt515 + - macos: py37-test-pyqt513 + - macos: py38-test-pyqt514-all + - macos: py39-test-pyqt515 + - macos: py310-test-pyqt515-all # FIXME: The PySide builds are broken, needs investigating # - macos: py37-test-pyside513 # Test a few configurations on Windows - # - windows: py37-test-pyqt510 + - windows: py37-test-pyqt510 # The following failed due to https://github.com/jupyter/qtconsole/issues/400 - should be fixed upstream - # - windows: py38-test-pyqt514-all - # PyQt 5.15 failing on Linux possibly due to X11-related problems (X11/lib/libxcb) - # - let's try on Windows - # - windows: py38-test-pyqt515 + - windows: py38-test-pyqt514-all + - windows: py38-test-pyqt515 + - windows: py39-test-pyqt515 + - windows: py310-test-pyqt515-all # FIXME: The PySide builds are broken, needs investigating # - windows: py37-test-pyside513-all # Try out documentation build on Linux and Windows - # - linux: py37-docs-pyqt513 - # - macos: py37-docs-pyqt513 - # - windows: py38-docs-pyqt513 + - linux: py37-docs-pyqt513 + - macos: py37-docs-pyqt513 + - windows: py38-docs-pyqt513 From c7c3e34edb9abcf8ee038fe1053ddc64113e2d01 Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Sun, 6 Feb 2022 00:15:37 +0100 Subject: [PATCH 5/5] TST: Select set of PyQt 5.15 pyver/arch combos --- azure-pipelines.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e69671d00..b5cb275d3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,32 +36,27 @@ jobs: - linux: py37-test-pyqt512 - linux: py37-test-pyqt513-all - linux: py38-test-pyqt514 - - linux: py38-test-pyqt515 - linux: py39-test-pyqt515 - - linux: py310-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - linux: py36-test-pyside512 # - linux: py37-test-pyside513-all # - linux: py38-test-pyside514 # Test against latest developer versions of some packages - - linux: py310-test-pyqt514-dev-all + - linux: py310-test-pyqt515-dev-all # Test a few configurations on MacOS X - macos: py37-test-pyqt513 - macos: py38-test-pyqt514-all - - macos: py39-test-pyqt515 - macos: py310-test-pyqt515-all # FIXME: The PySide builds are broken, needs investigating # - macos: py37-test-pyside513 # Test a few configurations on Windows - windows: py37-test-pyqt510 - # The following failed due to https://github.com/jupyter/qtconsole/issues/400 - should be fixed upstream + # The following failed due to https://github.com/jupyter/qtconsole/issues/400 - fixed upstream - windows: py38-test-pyqt514-all - - windows: py38-test-pyqt515 - - windows: py39-test-pyqt515 - - windows: py310-test-pyqt515-all + - windows: py310-test-pyqt515 # FIXME: The PySide builds are broken, needs investigating # - windows: py37-test-pyside513-all