raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into test_fixes

Browse Source
This commit is contained in:
Benjamin Hoving 2019-09-18 14:59:50 -04:00
commit 9cc2d4a5af
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -34,6 +34,7 @@ list
node_modules
openlp.cfg
openlp.pro
openlp/core/resources.py
openlp/core/resources.py.old
openlp/plugins/presentations/lib/vendor/Pyro4
openlp/plugins/presentations/lib/vendor/serpent.py
@ -41,3 +42,4 @@ output
package-lock.json
tags
test
openlp-test-projectordb.sqlite

46
.gitlab-ci.yml
View File

@ -22,16 +22,16 @@ test-debian:
image: debian:unstable
before_script:
- apt-get update
- apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia \
python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit \
python3-pyqt5.qtwebengine python3-sqlalchemy python3-chardet python3-lxml python3-enchant \
python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov python3-pip \
python3-alembic python3-xdg python3-dbus.mainloop.pyqt5 python3-pep8 python3-websockets \
python3-waitress python3-webob python3-requests python3-pymediainfo python3-qtawesome \
python3-opengl python3-appdirs python3-vlc python3-zeroconf mediainfo pylint3 xvfb
- apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia
python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit
python3-pyqt5.qtwebengine python3-dbus.mainloop.pyqt5 python3-sqlalchemy python3-alembic
python3-chardet python3-lxml python3-enchant python3-bs4 python3-mako python3-uno
python3-pytest python3-pytest-cov python3-websockets python3-webob python3-waitress
python3-requests python3-pymediainfo python3-qtawesome python3-opengl python3-appdirs
python3-vlc python3-zeroconf python3-pip python3-pep8 mediainfo mupdf-tools xvfb
- sh scripts/generate_resources.sh
script:
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
test-ubuntu:
stage: test
@ -40,31 +40,31 @@ test-ubuntu:
image: ubuntu:rolling
before_script:
- apt-get update
- apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia \
python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit \
python3-pyqt5.qtwebengine python3-sqlalchemy python3-chardet python3-lxml python3-enchant \
python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov python3-pip \
python3-alembic python3-xdg python3-dbus.mainloop.pyqt5 python3-pep8 python3-websockets \
python3-waitress python3-webob python3-requests python3-pymediainfo python3-qtawesome \
python3-opengl python3-appdirs python3-vlc python3-zeroconf mediainfo pylint3 xvfb
- apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia
python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit
python3-pyqt5.qtwebengine python3-dbus.mainloop.pyqt5 python3-sqlalchemy python3-alembic
python3-chardet python3-lxml python3-enchant python3-bs4 python3-mako python3-uno
python3-pytest python3-pytest-cov python3-websockets python3-webob python3-waitress
python3-requests python3-pymediainfo python3-qtawesome python3-opengl python3-appdirs
python3-vlc python3-zeroconf python3-pip python3-pep8 mediainfo mupdf-tools xvfb
- sh scripts/generate_resources.sh
script:
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
test-fedora:
stage: test
image: fedora
before_script:
- dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
- dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
- dnf install -y python3-PyQt5 python3-qt5-webkit python3-qt5-webengine python3-sqlalchemy python3-alembic \
python3-beautifulsoup4 python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest \
python3-websockets python3-appdirs python3-webob python3-QtAwesome python3-waitress \
python3-pymediainfo python3-pyopengl python3-pylint python-pysword python3-requests \
mediainfo patch xorg-x11-server-Xvfb python3-vlc python3-zeroconf
- dnf install -y python3-PyQt5 python3-qt5-webkit python3-qt5-webengine python3-sqlalchemy python3-alembic
python3-beautifulsoup4 python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest
python3-websockets python3-appdirs python3-webob python3-QtAwesome python3-waitress python3-vlc
python3-pymediainfo python3-pyopengl python-pysword python3-requests python3-zeroconf mediainfo
patch xorg-x11-server-Xvfb ghostscript mupdf
- sh scripts/generate_resources.sh
script:
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore
- xvfb-run -s '-screen 0 1024x768x24' pytest-3 -Wignore --ignore tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
test-macos:
only:

2
scripts/generate_resources.sh
View File

@ -34,7 +34,9 @@
#
###############################################################################
# Backup the existing resources
if [ -f "openlp/core/resources.py" ]; then
mv openlp/core/resources.py openlp/core/resources.py.old
fi
# Create the new data from the updated qrc
pyrcc5 -o openlp/core/resources.py.new resources/images/openlp-2.qrc