[Openlp-core] macOS Test Results: Failed
macOS tests failed, please see https://ci.openlp.io/job/MP-04-macOS-Tests/58/ for more details -- https://code.launchpad.net/~trb143/openlp/media_state/+merge/365821 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~trb143/openlp/media_state/+merge/365821 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~trb143/openlp/media_state/+merge/365821 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/media_state into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/media_state into lp:openlp.
Commit message:
Fix up VLC so it works and plays.
Still not finished but getting there.
Requested reviews:
Phill (phill-ridout)
Related bugs:
Bug #1823575 in OpenLP: "PluginManager still has plugin list"
https://bugs.launchpad.net/openlp/+bug/1823575
For more details, see:
https://code.launchpad.net/~trb143/openlp/media_state/+merge/365821
VLC plays and handles missing live display gracefully. Preview still works.
Added experimental setting to remove UI incomplete stuff.
various bug fixes and improvments,
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file '.bzrignore'
--- .bzrignore 2019-03-04 20:37:11 +
+++ .bzrignore 2019-04-10 19:57:31 +
@@ -15,6 +15,7 @@
*.e4*
*eric[1-9]project
.git
+env
# Git files
.gitignore
htmlcov
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2019-03-03 13:32:31 +
+++ openlp/core/common/settings.py 2019-04-10 19:57:31 +
@@ -129,6 +129,9 @@
``advanced/slide limits`` to ``SlideLimits.Wrap``. **NOTE**, this means that the rules have to cover all cases!
So, if the type of the old value is bool, then there must be two rules.
"""
+on_monitor_default = True
+if log.isEnabledFor(logging.DEBUG):
+on_monitor_default = False
__default_settings__ = {
'settings/version': 0,
'advanced/add page break': False,
@@ -185,6 +188,7 @@
'core/click live slide to unblank': False,
'core/blank warning': False,
'core/ccli number': '',
+'core/experimental': False,
'core/has run wizard': False,
'core/language': '[en]',
'core/last version test': '',
@@ -202,13 +206,13 @@
'core/view mode': 'default',
# The other display settings (display position and dimensions) are defined in the ScreenList class due to a
# circular dependency.
-'core/display on monitor': True,
+'core/display on monitor': on_monitor_default,
'core/override position': False,
'core/monitor': {},
'core/application version': '0.0',
'images/background color': '#00',
-'media/players': 'system,webkit',
-'media/override player': QtCore.Qt.Unchecked,
+'media/media auto start': QtCore.Qt.Unchecked,
+'media/stream command': '',
'remotes/download version': '0.0',
'players/background color': '#00',
'servicemanager/last directory': None,
@@ -311,7 +315,9 @@
('bibles/proxy name', '', []), # Just remove these bible proxy settings. They weren't used in 2.4!
('bibles/proxy address', '', []),
('bibles/proxy username', '', []),
-('bibles/proxy password', '', [])
+('bibles/proxy password', '', []),
+('media/players', '', []),
+('media/override player', '', [])
]
@staticmethod
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py 2019-02-14 15:09:09 +
+++ openlp/core/lib/theme.py 2019-04-10 19:57:31 +
@@ -46,6 +46,7 @@
Image = 2
Transparent = 3
Video = 4
+Stream = 5
@staticmethod
def to_string(background_type):
@@ -62,6 +63,8 @@
return 'transparent'
elif background_type == BackgroundType.Video:
return 'video'
+elif background_type == BackgroundType.Stream:
+return 'stream'
@staticmethod
def from_string(type_string):
@@ -78,6 +81,8 @@
return BackgroundType.Transparent
elif type_string == 'video':
return BackgroundType.Video
+elif type_string == 'stream':
+return BackgroundType.Stream
class BackgroundGradientType(object):
=== modified file 'openlp/core/ui/media/__init__.py'
--- openlp/core/ui/media/__init__.py 2019-03-17 10:01:52 +
+++ openlp/core/ui/media/__init__.py 2019-04-10 19:57:31 +
@@ -48,6 +48,7 @@
CD = 3
DVD = 4
Folder = 5
+Stream = 6
class ItemMediaInfo(object):
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2019-02-14 15:09:09 +
+++ openlp/core/ui/media/mediacontroller.py 2019-04-10 19:57:31 +
@@ -23,7 +23,6 @@
The :mod:`~openlp.core.ui.media.mediacontroller` module contains a base class for media components and other widgets
related to playing media, such as sliders.
"""
-import datetime
import logging
try:
@@ -33,7 +32,7 @@
pymediainfo_available = False
from subprocess import check_output
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore
from openlp.core.state import State
from openlp.core.api.http import register_endpoint
@@ -44,11 +43,9 @@
from openlp.core.lib.serviceitem import ItemCapabilities
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import DisplayControllerType
-from
[Openlp-core] [Merge] lp:~trb143/openlp/media_state into lp:openlp
The proposal to merge lp:~trb143/openlp/media_state into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/media_state/+merge/365762 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
Review: Approve -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365811 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
Review: Approve -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365811 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~trb143/openlp/media_state into lp:openlp
Just an FYI: I fixed those macOS tests, if you merge from trunk. -- https://code.launchpad.net/~trb143/openlp/media_state/+merge/365762 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
Review: Approve -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365811 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1795876] Re: License violations
The license will be changed on 1st May. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1795876 Title: License violations Status in OpenLP: In Progress Status in OpenLP 2.0 series: Won't Fix Status in OpenLP 2.2 series: Won't Fix Status in OpenLP 2.4 series: Won't Fix Status in OpenLP trunk series: In Progress Bug description: OpenLP (GPLv2 only) is currently violating at least two licenses: PyQt5's GPLv3 only and request's Apache 2.0. There are two options to heal these violations: relicense OpenLP or replace the dependencies. A third option would be aquiring a commercial PyQt5 license from Riverbank and replacing requests only, but as it is paid per developer this seems to be infeasible for an open source project. REPLACING = Replacing requests would be feasible: urllib is already used throughout the codebase. Just use it for the currently three files which import requests as well. I do not know if it would be feasible to replace PyQt5 with PySide2. RELICENSING === You would have to use the GPLv3 license to heal both of the violations (GPLv3 is compatible with Apache 2.0). You could also use GPLv2 or later, but the logical license combined with PyQt5 is always GPLv3. That leads to another issue: pysword is GPLv2 only and a license move would require you to drop this optional dependency. But I guess this would be a minor issue as it is not released yet (?). I do not know if relicensing is feasible as you would have to ask the majority of copyright holders to agree with the license change. In either case you should inform your users not later than with your next (fixed!) release about the license violation as they could be in trouble using OpenLP. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1795876/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] macOS Test Results: Passed
macOS tests passed! -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365811 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365811 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365811 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
Bastian Germann has proposed merging lp:~bastian-germann/openlp/depends into
lp:openlp.
Commit message:
Improve dependency handling including PEP508 Environment Markers and using the
library provided by pymediainfo for Windows tests
Requested reviews:
Tomas Groth (tomasgroth)
Phill (phill-ridout)
Tim Bentley (trb143)
For more details, see:
https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365811
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'scripts/appveyor.yml'
--- scripts/appveyor.yml 2019-03-04 20:32:05 +
+++ scripts/appveyor.yml 2019-04-10 17:04:03 +
@@ -21,11 +21,6 @@
- appveyor DownloadFile https://mupdf.com/downloads/archive/mupdf-1.14.0-windows.zip
- 7z x mupdf-1.14.0-windows.zip
- cp mupdf-1.14.0-windows/mutool.exe openlp-branch/mutool.exe
- # Download and unpack mediainfo
- - appveyor DownloadFile https://mediaarea.net/download/binary/mediainfo/18.08.1/MediaInfo_CLI_18.08.1_Windows_i386.zip
- - mkdir MediaInfo
- - 7z x -oMediaInfo MediaInfo_CLI_18.08.1_Windows_i386.zip
- - cp MediaInfo\\MediaInfo.exe openlp-branch\\MediaInfo.exe
build: off
=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py 2019-02-21 21:26:36 +
+++ scripts/check_dependencies.py 2019-04-10 17:04:03 +
@@ -40,8 +40,8 @@
VERS = {
'Python': '3.6',
-'PyQt5': '5.5',
-'Qt5': '5.5',
+'PyQt5': '5.12',
+'Qt5': '5.9',
'pymediainfo': '2.2',
'sqlalchemy': '0.5',
'enchant': '1.6'
@@ -57,6 +57,7 @@
LINUX_MODULES = [
# Optical drive detection.
'dbus',
+'Xlib',
]
MACOSX_MODULES = [
@@ -93,6 +94,7 @@
OPTIONAL_MODULES = [
+('qdarkstyle', '(dark style support)'),
('mysql.connector', '(MySQL support)'),
('pyodbc', '(ODBC support)'),
('psycopg2', '(PostgreSQL support)'),
=== modified file 'setup.py'
--- setup.py 2019-03-28 21:03:32 +
+++ setup.py 2019-04-10 17:04:03 +
@@ -22,7 +22,6 @@
###
import re
-import sys
from subprocess import Popen, PIPE
from setuptools import setup, find_packages
@@ -112,40 +111,6 @@
finally:
ver_file.close()
-requires = [
-'alembic',
-'appdirs',
-'beautifulsoup4',
-'chardet',
-'lxml',
-'Mako',
-'pymediainfo >= 2.2',
-'PyQt5 >= 5.12',
-'PyQtWebEngine',
-'QtAwesome',
-'requests',
-'SQLAlchemy >= 0.5',
-'waitress',
-'WebOb',
-'websockets'
-]
-test_requires = [
-'nose2',
-'pylint',
-'pyodbc',
-'pysword'
-]
-if sys.platform.startswith('win'):
-requires.append('pywin32')
-elif sys.platform.startswith('darwin'):
-requires.extend([
-'pyobjc',
-'pyobjc-framework-Cocoa'
-])
-elif sys.platform.startswith('linux'):
-requires.append('dbus-python')
-test_requires.append('xlib')
-
setup(
name='OpenLP',
@@ -200,8 +165,29 @@
include_package_data=True,
zip_safe=False,
python_requires='>=3.6',
-install_requires=requires,
+install_requires=[
+'alembic',
+'appdirs',
+'beautifulsoup4',
+'chardet',
+'dbus-python; platform_system=="Linux"',
+'lxml',
+'Mako',
+'pymediainfo >= 2.2',
+'pyobjc; platform_system=="Darwin"',
+'pyobjc-framework-Cocoa; platform_system=="Darwin"',
+'PyQt5 >= 5.12',
+'PyQtWebEngine',
+'pywin32; platform_system=="Windows"',
+'QtAwesome',
+'requests',
+'SQLAlchemy >= 0.5',
+'waitress',
+'WebOb',
+'websockets'
+],
extras_require={
+'darkstyle': ['QDarkStyle'],
'mysql': ['mysql-connector-python'],
'odbc': ['pyodbc'],
'postgresql': ['psycopg2'],
@@ -211,7 +197,13 @@
'jenkins': ['python-jenkins'],
'launchpad': ['launchpadlib']
},
-tests_require=test_requires,
+tests_require=[
+'nose2',
+'pylint',
+'pyodbc',
+'pysword',
+'python-xlib; platform_system=="Linux"'
+],
test_suite='nose2.collector.collector',
entry_points={'gui_scripts': ['openlp = run_openlp:start']}
)
___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
The proposal to merge lp:~bastian-germann/openlp/depends into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365765 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/depends into lp:openlp
Review: Needs Fixing Please remove the media changes. -- https://code.launchpad.net/~bastian-germann/openlp/depends/+merge/365765 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
