From a6ddd44bc9cd2efe7ef41fadba5c6dc368716b81 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Mon, 30 Jan 2023 21:57:21 +0100
Subject: [PATCH] Add testing with pyqt5
---
.gitlab-ci.yml | 51 +++++++++++++++++++++++++++++++++++++++++++++++---
pyproject.toml | 2 +-
2 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5da3c2d7..01bd4f81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,9 @@ before_script:
- python -m pip install --upgrade pip
- python --version
- pip install pytest pytest-cov sphinx furo numpydoc pytest-xvfb pytest-qt setuptools_scm sphinx-qt-documentation pytest-xdist pytest-mpl
+ - pip install $QT_API
+ - export PYTEST_QT_API=$QT_API
+ - export QT_API=$QT_API
# - export CXXFLAGS='--coverage'
- pip install -ve .
# Move file, but should be handled by installation
@@ -30,19 +33,59 @@ before_script:
coverage: /(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/
-run-test-3.8:
+run-test-3.8-pyside2:
+ variables:
+ QT_API: pyside2
image: python:3.8
extends: ".run-test"
-run-test-3.9:
+run-test-3.8-pyqt5:
+ variables:
+ QT_API: pyqt5
+ image: python:3.8
+ extends: ".run-test"
+
+run-test-3.9-pyside2:
+ variables:
+ QT_API: pyside2
+ image: python:3.9
+ extends: ".run-test"
+
+run-test-3.9-pyqt5:
+ variables:
+ QT_API: pyqt5
image: python:3.9
extends: ".run-test"
-run-test-3.10:
+run-test-3.10-pyside2:
+ variables:
+ QT_API: pyside2
+ image: python:3.10
+ extends: ".run-test"
+
+run-test-3.10-pyqt5:
+ variables:
+ QT_API: pyqt5
+ image: python:3.10
+ extends: ".run-test"
+
+run-test-3.10-pyside6:
+ variables:
+ QT_API: pyside6
+ image: python:3.10
+ extends: ".run-test"
+ allow_failure: true
+
+run-test-3.10-pyqt6:
+ variables:
+ QT_API: pyqt6
image: python:3.10
extends: ".run-test"
+ allow_failure: true
run-doc-test:
+ variables:
+ QT_API: pyside2
image: python:3.10
stage: test
script:
@@ -53,6 +96,8 @@ run-doc-test:
# extends: ".run-test"
pages:
+ variables:
+ QT_API: pyqt5
stage: deploy
image: python:3.10
script:
diff --git a/pyproject.toml b/pyproject.toml
index 32b7026b..180be81b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ requires-python = ">=3.8"
dependencies = [
"numpy",
"pybind11>=2.3.0",
- "pyside2",
+ # "pyside2",
"qtpy",
"graphviz>=0.19",
"matplotlib",
--
GitLab