From 2d79ef8fe5e52c61f4a78782770377cd6b41958b Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Fri, 7 Jun 2024 13:46:48 +0200 Subject: [PATCH] ci: added webengine dependencies --- .gitlab-ci.yml | 16 +++++++++++++++- pyproject.toml | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ad8d876..3a547290 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,10 @@ stages: - End2End - Deploy +.install-qt-webengine-deps: &install-qt-webengine-deps + - apt-get -y install libnss3 libxdamage1 libasound2 libatomic1 libxcursor1 + - export QTWEBENGINE_DISABLE_SANDBOX=1 + before_script: - if [[ "$CI_PROJECT_PATH" != "bec/bec_widgets" ]]; then echo -e "\033[35;1m Using branch $CHILD_PIPELINE_BRANCH of BEC Widgets \033[0;m"; @@ -110,6 +114,7 @@ tests: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyqt6] - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests @@ -133,6 +138,7 @@ tests-3.10-pyside6: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyside6] - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests @@ -148,9 +154,10 @@ tests-3.12-pyside6: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyside6] - - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests + - pytest -vv --junitxml=report.xml --random-order ./tests/unit_tests allow_failure: true tests-3.10-pyqt5: @@ -163,6 +170,7 @@ tests-3.10-pyqt5: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyqt5] - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests @@ -178,6 +186,7 @@ tests-3.11-pyqt5: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyqt5] - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests @@ -193,6 +202,7 @@ tests-3.12-pyqt5: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyqt5] - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests @@ -208,6 +218,7 @@ tests-3.10-pyqt6: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyqt6] - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests @@ -223,6 +234,7 @@ tests-3.11-pyqt6: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyqt6] - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests @@ -238,6 +250,7 @@ tests-3.12-pyqt6: - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - pip install -e ./bec/bec_lib[dev] - pip install -e .[dev,pyqt6] - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests @@ -253,6 +266,7 @@ end-2-end-conda: script: - apt-get update - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 + - *install-qt-webengine-deps - conda config --prepend channels conda-forge - conda config --set channel_priority strict - conda config --set always_yes yes --set changeps1 no diff --git a/pyproject.toml b/pyproject.toml index 662a93a3..d0dda2cb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ dev = [ "isort", "fakeredis", ] -pyqt5 = ["PyQt5>=5.9"] +pyqt5 = ["PyQt5>=5.9", "PyQtWebEngine>=5.9"] pyqt6 = ["PyQt6>=6.7", "PyQt6-WebEngine>=6.7"] pyside6 = ["PySide6>=6.7"]