Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/main into lp:openlp

2019-05-08 Thread Raoul Snyman 
Review: Needs Information

Please explain to me again how PyInstaller will handle this, and how to use 
this approach in Debian? Remember, our users are not Python developers.

I don't care how "unpythonic" run_openlp.py is, I care how practical it is.
-- 
https://code.launchpad.net/~bastian-germann/openlp/main/+merge/367156
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

2019-05-08 Thread Raoul Snyman 
Linting passed!
-- 
https://code.launchpad.net/~bastian-germann/openlp/main/+merge/367156
Your team OpenLP Core is requested to review the proposed merge of 
lp:~bastian-germann/openlp/main into 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/main into lp:openlp

2019-05-08 Thread Bastian Germann 
Bastian Germann has proposed merging lp:~bastian-germann/openlp/main into 
lp:openlp.

Commit message:
Use start script __main__.py which enables 'python -m openlp'

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~bastian-germann/openlp/main/+merge/367156

The situation with OpenLP exporting two packages (openlp and run_openlp) is 
unpythonic. There is an obvious fix for that: using __main__.py. A neat side 
effect: It enables starting OpenLP via 'python -m openlp'.

As packages will have to be touched anyway because the start script was renamed 
to run_openlp.py during the current development cycle we should take the chance 
and do it the right way.
-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~bastian-germann/openlp/main into lp:openlp.
=== renamed file 'run_openlp.py' => 'openlp/__main__.py'
=== modified file 'setup.py'
--- setup.py	2019-05-02 10:35:29 +
+++ setup.py	2019-05-08 22:28:31 +
@@ -161,7 +161,6 @@
 url='https://openlp.org/',
 license='GPL-3.0-or-later',
 packages=find_packages(exclude=['ez_setup', 'tests*']),
-py_modules=['run_openlp'],
 include_package_data=True,
 zip_safe=False,
 python_requires='>=3.6',
@@ -207,5 +206,5 @@
 'python-xlib; platform_system=="Linux"'
 ],
 test_suite='nose2.collector.collector',
-entry_points={'gui_scripts': ['openlp = run_openlp:start']}
+entry_points={'gui_scripts': ['openlp = openlp.__main__:start']}
 )

=== modified file 'tests/functional/openlp_core/ui/test_mainwindow.py'
--- tests/functional/openlp_core/ui/test_mainwindow.py	2019-05-04 12:05:53 +
+++ tests/functional/openlp_core/ui/test_mainwindow.py	2019-05-08 22:28:31 +
@@ -107,7 +107,7 @@
 Test that passing a non service file does nothing.
 """
 # GIVEN a non service file as an argument to openlp
-service = 'run_openlp.py'
+service = 'setup.py'
 
 # WHEN the argument is processed
 self.main_window.open_cmd_line_files(service)

___
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: Failed

2019-05-08 Thread Raoul Snyman 
macOS tests failed, please see https://ci.openlp.io/job/MP-04-macOS-Tests/77/ 
for more details
-- 
https://code.launchpad.net/~bastian-germann/openlp/main/+merge/367156
Your team OpenLP Core is requested to review the proposed merge of 
lp:~bastian-germann/openlp/main into 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

2019-05-08 Thread Raoul Snyman 
Linux tests passed!
-- 
https://code.launchpad.net/~bastian-germann/openlp/main/+merge/367156
Your team OpenLP Core is requested to review the proposed merge of 
lp:~bastian-germann/openlp/main into 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:~raoul-snyman/openlp/wix-packaging into lp:openlp/packaging

2019-05-08 Thread Bastian Germann 
You can now use PyMuPDF instead of mupdf.exe
-- 
https://code.launchpad.net/~raoul-snyman/openlp/wix-packaging/+merge/367013
Your team OpenLP Core is subscribed to branch lp:openlp/packaging.

___
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:~raoul-snyman/openlp/wix-packaging into lp:openlp/packaging

2019-05-08 Thread Raoul Snyman 
Replies inline :-)

Diff comments:

> 
> === modified file 'builders/windows-builder.py'
> --- builders/windows-builder.py   2019-03-13 21:00:05 +
> +++ builders/windows-builder.py   2019-05-07 05:01:47 +
> @@ -315,11 +403,10 @@
>  copy(os.path.join(self.mutool_exe), os.path.join(self.dist_path, 
> 'mutool.exe'))
>  else:
>  self._print('... WARNING: mutool.exe not found')
> -self._print_verbose('... MediaInfo.exe')
> -if self.mediainfo_exe and os.path.isfile(self.mediainfo_exe):
> -copy(os.path.join(self.mediainfo_exe), 
> os.path.join(self.dist_path, 'MediaInfo.exe'))
> -else:
> -self._print('... WARNING: MediaInfo.exe not found')
> +vlc_path = os.path.join('C:\\', 'Program Files', 'VideoLAN', 'VLC')

Right, of course.

> +for fname in ['libvlc.dll', 'libvlccore.dll']:
> +self._print_verbose('... {}'.format(fname))
> +copy(os.path.join(vlc_path, fname), os.path.join(self.dist_path, 
> fname))
>  
>  def after_run_sphinx(self):
>  """
> 
> === modified file 'osx/LICENSE.txt'
> --- osx/LICENSE.txt   2012-06-09 19:02:47 +
> +++ osx/LICENSE.txt   2019-05-07 05:01:47 +
> @@ -1,285 +1,626 @@
> - GNU GENERAL PUBLIC LICENSE
> -Version 2, June 1991

Yep, I found out that it is used in the portable build, and also as the license 
file in the OpenLP directory (which I think is necessary)

> +GNU GENERAL PUBLIC LICENSE
> +   Version 3, 29 June 2007
>  
> - Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
> - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + Copyright (C) 2007 Free Software Foundation, Inc. 
>   Everyone is permitted to copy and distribute verbatim copies
>   of this license document, but changing it is not allowed.
>  
> - Preamble
> -
> -  The licenses for most software are designed to take away your
> -freedom to share and change it.  By contrast, the GNU General Public
> -License is intended to guarantee your freedom to share and change free
> -software--to make sure the software is free for all its users.  This
> -General Public License applies to most of the Free Software
> -Foundation's software and to any other program whose authors commit to
> -using it.  (Some other Free Software Foundation software is covered by
> -the GNU Lesser General Public License instead.)  You can apply it to
> +Preamble
> +
> +  The GNU General Public License is a free, copyleft license for
> +software and other kinds of works.
> +
> +  The licenses for most software and other practical works are designed
> +to take away your freedom to share and change the works.  By contrast,
> +the GNU General Public License is intended to guarantee your freedom to
> +share and change all versions of a program--to make sure it remains free
> +software for all its users.  We, the Free Software Foundation, use the
> +GNU General Public License for most of our software; it applies also to
> +any other work released this way by its authors.  You can apply it to
>  your programs, too.
>  
>When we speak of free software, we are referring to freedom, not
>  price.  Our General Public Licenses are designed to make sure that you
>  have the freedom to distribute copies of free software (and charge for
> -this service if you wish), that you receive source code or can get it
> -if you want it, that you can change the software or use pieces of it
> -in new free programs; and that you know you can do these things.
> +them if you wish), that you receive source code or can get it if you
> +want it, that you can change the software or use pieces of it in new
> +free programs, and that you know you can do these things.
>  
> -  To protect your rights, we need to make restrictions that forbid
> -anyone to deny you these rights or to ask you to surrender the rights.
> -These restrictions translate to certain responsibilities for you if you
> -distribute copies of the software, or if you modify it.
> +  To protect your rights, we need to prevent others from denying you
> +these rights or asking you to surrender the rights.  Therefore, you have
> +certain responsibilities if you distribute copies of the software, or if
> +you modify it: responsibilities to respect the freedom of others.
>  
>For example, if you distribute copies of such a program, whether
> -gratis or for a fee, you must give the recipients all the rights that
> -you have.  You must make sure that they, too, receive or can get the
> -source code.  And you must show them these terms so they know their
> -rights.
> -
> -  We protect your rights with two steps: (1) copyright the software, and
> -(2) offer you this license which gives you legal permission to copy,
> -distribute and/or modify the software.
> -
> -  Also, for each author's protection and ours, we

Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/wix-packaging into lp:openlp/packaging

2019-05-08 Thread Tomas Groth 
Review: Needs Fixing

See inline

Diff comments:

> 
> === modified file 'builders/windows-builder.py'
> --- builders/windows-builder.py   2019-03-13 21:00:05 +
> +++ builders/windows-builder.py   2019-05-07 05:01:47 +
> @@ -315,11 +403,10 @@
>  copy(os.path.join(self.mutool_exe), os.path.join(self.dist_path, 
> 'mutool.exe'))
>  else:
>  self._print('... WARNING: mutool.exe not found')
> -self._print_verbose('... MediaInfo.exe')
> -if self.mediainfo_exe and os.path.isfile(self.mediainfo_exe):
> -copy(os.path.join(self.mediainfo_exe), 
> os.path.join(self.dist_path, 'MediaInfo.exe'))
> -else:
> -self._print('... WARNING: MediaInfo.exe not found')
> +vlc_path = os.path.join('C:\\', 'Program Files', 'VideoLAN', 'VLC')

This path must be able to change when doing a x86 build on x64 host.

> +for fname in ['libvlc.dll', 'libvlccore.dll']:
> +self._print_verbose('... {}'.format(fname))
> +copy(os.path.join(vlc_path, fname), os.path.join(self.dist_path, 
> fname))
>  
>  def after_run_sphinx(self):
>  """
> 
> === modified file 'osx/LICENSE.txt'
> --- osx/LICENSE.txt   2012-06-09 19:02:47 +
> +++ osx/LICENSE.txt   2019-05-07 05:01:47 +
> @@ -1,285 +1,626 @@
> - GNU GENERAL PUBLIC LICENSE
> -Version 2, June 1991

Didn't we talk about not including the license file?

> +GNU GENERAL PUBLIC LICENSE
> +   Version 3, 29 June 2007
>  
> - Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
> - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + Copyright (C) 2007 Free Software Foundation, Inc. 
>   Everyone is permitted to copy and distribute verbatim copies
>   of this license document, but changing it is not allowed.
>  
> - Preamble
> -
> -  The licenses for most software are designed to take away your
> -freedom to share and change it.  By contrast, the GNU General Public
> -License is intended to guarantee your freedom to share and change free
> -software--to make sure the software is free for all its users.  This
> -General Public License applies to most of the Free Software
> -Foundation's software and to any other program whose authors commit to
> -using it.  (Some other Free Software Foundation software is covered by
> -the GNU Lesser General Public License instead.)  You can apply it to
> +Preamble
> +
> +  The GNU General Public License is a free, copyleft license for
> +software and other kinds of works.
> +
> +  The licenses for most software and other practical works are designed
> +to take away your freedom to share and change the works.  By contrast,
> +the GNU General Public License is intended to guarantee your freedom to
> +share and change all versions of a program--to make sure it remains free
> +software for all its users.  We, the Free Software Foundation, use the
> +GNU General Public License for most of our software; it applies also to
> +any other work released this way by its authors.  You can apply it to
>  your programs, too.
>  
>When we speak of free software, we are referring to freedom, not
>  price.  Our General Public Licenses are designed to make sure that you
>  have the freedom to distribute copies of free software (and charge for
> -this service if you wish), that you receive source code or can get it
> -if you want it, that you can change the software or use pieces of it
> -in new free programs; and that you know you can do these things.
> +them if you wish), that you receive source code or can get it if you
> +want it, that you can change the software or use pieces of it in new
> +free programs, and that you know you can do these things.
>  
> -  To protect your rights, we need to make restrictions that forbid
> -anyone to deny you these rights or to ask you to surrender the rights.
> -These restrictions translate to certain responsibilities for you if you
> -distribute copies of the software, or if you modify it.
> +  To protect your rights, we need to prevent others from denying you
> +these rights or asking you to surrender the rights.  Therefore, you have
> +certain responsibilities if you distribute copies of the software, or if
> +you modify it: responsibilities to respect the freedom of others.
>  
>For example, if you distribute copies of such a program, whether
> -gratis or for a fee, you must give the recipients all the rights that
> -you have.  You must make sure that they, too, receive or can get the
> -source code.  And you must show them these terms so they know their
> -rights.
> -
> -  We protect your rights with two steps: (1) copyright the software, and
> -(2) offer you this license which gives you legal permission to copy,
> -distribute and/or modify the software.
> -
> -  Also, for each author's protection and ours, we want to make certain

[Openlp-core] Linting: Passed

2019-05-08 Thread Raoul Snyman 
Linting passed!
-- 
https://code.launchpad.net/~trb143/openlp/no_vlc/+merge/367111
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

2019-05-08 Thread Raoul Snyman 
Linux tests passed!
-- 
https://code.launchpad.net/~trb143/openlp/no_vlc/+merge/367111
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/no_vlc into lp:openlp

2019-05-08 Thread Tim Bentley 
The proposal to merge lp:~trb143/openlp/no_vlc into lp:openlp has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~trb143/openlp/no_vlc/+merge/367110
-- 
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: Failed

2019-05-08 Thread Raoul Snyman 
Linting failed, please see https://ci.openlp.io/job/MP-03-Linting/93/ for more 
details
-- 
https://code.launchpad.net/~trb143/openlp/no_vlc/+merge/367110
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

2019-05-08 Thread Raoul Snyman 
Linux tests passed!
-- 
https://code.launchpad.net/~trb143/openlp/no_vlc/+merge/367110
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/no_vlc into lp:openlp

2019-05-08 Thread Tim Bentley 
The proposal to merge lp:~trb143/openlp/no_vlc into lp:openlp has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~trb143/openlp/no_vlc/+merge/367067
-- 
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