Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/pep440 into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353806 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:~raoul-snyman/openlp/pep440 into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/pep440 into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/354087 -- 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:~raoul-snyman/openlp/pep440 into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/354087 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:~raoul-snyman/openlp/pep440 into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/pep440 into lp:openlp. Commit message: Make our version number PEP 440 compliant and add a script for Jenkins to report back to a merge proposal. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/354087 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 into lp:openlp. === modified file 'MANIFEST.in' --- MANIFEST.in 2014-05-05 17:31:45 + +++ MANIFEST.in 2018-08-31 05:56:04 + @@ -7,9 +7,11 @@ recursive-include openlp *.png recursive-include openlp *.ps recursive-include openlp *.json +recursive-include openlp *.ttf recursive-include documentation * recursive-include resources * recursive-include scripts * +recursive-include tests/resources * include copyright.txt include LICENSE include README.txt === modified file 'openlp/core/ui/themeform.py' --- openlp/core/ui/themeform.py 2018-08-25 14:08:19 + +++ openlp/core/ui/themeform.py 2018-08-31 05:56:04 + @@ -153,7 +153,7 @@ Calculate the number of lines on a page by rendering text """ # Do not trigger on start up -if self.currentPage != self.welcome_page: +if self.currentPage() != self.welcome_page: self.update_theme() self.theme_manager.generate_image(self.theme, True) === added file 'scripts/mp_update.py' --- scripts/mp_update.py 1970-01-01 00:00:00 + +++ scripts/mp_update.py 2018-08-31 05:56:04 + @@ -0,0 +1,61 @@ +#!/usr/bin/env python2 +import sys +import os +from argparse import ArgumentParser +from launchpadlib.credentials import UnencryptedFileCredentialStore +from launchpadlib.launchpad import Launchpad + +HERE = os.path.dirname(os.path.abspath(__file__)) + + +def parse_args(): +""" +Parse the command line arguments +""" +parser = ArgumentParser() +parser.add_argument('-p', '--merge-proposal', required=True, +help='The main part of the URL to the merge proposal, without the hostname.') +parser.add_argument('-m', '--message', required=True, +help='The comment to add to the merge proposal') +parser.add_argument('-s', '--subject', default=None, help='The subject for the comment') +return parser.parse_args() + + +def get_merge_proposal(merge_proposal_url): +""" +Get the merge proposal for the ``merge_proposal_url`` +""" +lp = Launchpad.login_with('OpenLP CI', 'production', version='devel', + credential_store=UnencryptedFileCredentialStore(os.path.join(HERE, 'launchpadcreds.txt'))) +openlp_project = lp.projects['openlp'] +merge_proposals = openlp_project.getMergeProposals() +for merge_proposal in merge_proposals: +if str(merge_proposal).endswith(merge_proposal_url): +return merge_proposal +return None + + +def create_comment(merge_proposal, comment, subject): +""" +Create a comment on the merge proposal +""" +if not subject: +subject = 'Jenkins test update' +merge_proposal.createComment(subject=subject, content=comment) + + +def main(): +""" +Run the thing +""" +args = parse_args() +merge_proposal = get_merge_proposal(args.merge_proposal) +if not merge_proposal: +print('No merge proposal with that URL found') +sys.exit(1) +else: +create_comment(merge_proposal, args.message, args.subject) + + +if __name__ == '__main__': +main() === modified file 'setup.py' --- setup.py 2017-12-29 09:15:48 + +++ setup.py 2018-08-31 05:56:04 + @@ -99,10 +99,11 @@ if tree_revision == tag_revision: version_string = tag_version.decode('utf-8') else: -version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8')) +version_string = '{version}.dev{revision}'.format(version=tag_version.decode('utf-8'), + revision=tree_revision.decode('utf-8')) ver_file = open(VERSION_FILE, 'w') ver_file.write(version_string) -except: +except Exception: ver_file = open(VERSION_FILE, 'r') version_string = ver_file.read().strip() finally: === modified file 'tests/functional/openlp_core/ui/media/test_systemplayer.py' --- tests/functional/openlp_core/ui/media/test_systemplayer.py 2018-01-07 18:07:22 + +++ tests/functional/openlp_core/ui/media/test_systemplayer.py 2018-08-31 05:56:04 + @@ -508,6 +508,30 @@ # THEN: The correct values should be set up assert worker is not None +@patch('openlp.core.ui.media.systemplayer.functools.partial') +@patch('openlp.core.ui.media.systemplayer.QtMultimedia.QMediaContent') +def test_start(self, MockQMediaContent, mocked_partial): +""" +Test the start method +""" +# GIVEN: A CheckMediaWorker instance +worker =
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/pep440 into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/pep440 into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353806 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 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:~raoul-snyman/openlp/pep440 into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/pep440 into lp:openlp. Commit message: Make our version number PEP 440 compliant and add a script for Jenkins to report back to a merge proposal. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353806 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 into lp:openlp. === modified file 'MANIFEST.in' --- MANIFEST.in 2014-05-05 17:31:45 + +++ MANIFEST.in 2018-08-27 18:00:23 + @@ -7,9 +7,11 @@ recursive-include openlp *.png recursive-include openlp *.ps recursive-include openlp *.json +recursive-include openlp *.ttf recursive-include documentation * recursive-include resources * recursive-include scripts * +recursive-include tests/resources * include copyright.txt include LICENSE include README.txt === added file 'scripts/mp_update.py' --- scripts/mp_update.py 1970-01-01 00:00:00 + +++ scripts/mp_update.py 2018-08-27 18:00:23 + @@ -0,0 +1,61 @@ +#!/usr/bin/env python2 +import sys +import os +from argparse import ArgumentParser +from launchpadlib.credentials import UnencryptedFileCredentialStore +from launchpadlib.launchpad import Launchpad + +HERE = os.path.dirname(os.path.abspath(__file__)) + + +def parse_args(): +""" +Parse the command line arguments +""" +parser = ArgumentParser() +parser.add_argument('-p', '--merge-proposal', required=True, +help='The main part of the URL to the merge proposal, without the hostname.') +parser.add_argument('-m', '--message', required=True, +help='The comment to add to the merge proposal') +parser.add_argument('-s', '--subject', default=None, help='The subject for the comment') +return parser.parse_args() + + +def get_merge_proposal(merge_proposal_url): +""" +Get the merge proposal for the ``merge_proposal_url`` +""" +lp = Launchpad.login_with('OpenLP CI', 'production', version='devel', + credential_store=UnencryptedFileCredentialStore(os.path.join(HERE, 'launchpadcreds.txt'))) +openlp_project = lp.projects['openlp'] +merge_proposals = openlp_project.getMergeProposals() +for merge_proposal in merge_proposals: +if str(merge_proposal).endswith(merge_proposal_url): +return merge_proposal +return None + + +def create_comment(merge_proposal, comment, subject): +""" +Create a comment on the merge proposal +""" +if not subject: +subject = 'Jenkins test update' +merge_proposal.createComment(subject=subject, content=comment) + + +def main(): +""" +Run the thing +""" +args = parse_args() +merge_proposal = get_merge_proposal(args.merge_proposal) +if not merge_proposal: +print('No merge proposal with that URL found') +sys.exit(1) +else: +create_comment(merge_proposal, args.message, args.subject) + + +if __name__ == '__main__': +main() === modified file 'setup.py' --- setup.py 2017-12-29 09:15:48 + +++ setup.py 2018-08-27 18:00:23 + @@ -99,10 +99,11 @@ if tree_revision == tag_revision: version_string = tag_version.decode('utf-8') else: -version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8')) +version_string = '{version}.dev{revision}'.format(version=tag_version.decode('utf-8'), + revision=tree_revision.decode('utf-8')) ver_file = open(VERSION_FILE, 'w') ver_file.write(version_string) -except: +except Exception: ver_file = open(VERSION_FILE, 'r') version_string = ver_file.read().strip() finally: ___ 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:~raoul-snyman/openlp/pep440 into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/pep440 into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353607 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 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:~raoul-snyman/openlp/pep440 into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/pep440 into lp:openlp. Commit message: Make our version number PEP 440 compliant and add a script for Jenkins to report back to a merge proposal. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353607 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 into lp:openlp. === added file 'scripts/mp_update.py' --- scripts/mp_update.py 1970-01-01 00:00:00 + +++ scripts/mp_update.py 2018-08-22 23:08:29 + @@ -0,0 +1,61 @@ +#!/usr/bin/env python2 +import sys +import os +from argparse import ArgumentParser +from launchpadlib.credentials import UnencryptedFileCredentialStore +from launchpadlib.launchpad import Launchpad + +HERE = os.path.dirname(os.path.abspath(__file__)) + + +def parse_args(): +""" +Parse the command line arguments +""" +parser = ArgumentParser() +parser.add_argument('-p', '--merge-proposal', required=True, +help='The main part of the URL to the merge proposal, without the hostname.') +parser.add_argument('-m', '--message', required=True, +help='The comment to add to the merge proposal') +parser.add_argument('-s', '--subject', default=None, help='The subject for the comment') +return parser.parse_args() + + +def get_merge_proposal(merge_proposal_url): +""" +Get the merge proposal for the ``merge_proposal_url`` +""" +lp = Launchpad.login_with('OpenLP CI', 'production', version='devel', + credential_store=UnencryptedFileCredentialStore(os.path.join(HERE, 'launchpadcreds.txt'))) +openlp_project = lp.projects['openlp'] +merge_proposals = openlp_project.getMergeProposals() +for merge_proposal in merge_proposals: +if str(merge_proposal).endswith(merge_proposal_url): +return merge_proposal +return None + + +def create_comment(merge_proposal, comment, subject): +""" +Create a comment on the merge proposal +""" +if not subject: +subject = 'Jenkins test update' +merge_proposal.createComment(subject, content=comment) + + +def main(): +""" +Run the thing +""" +args = parse_args() +merge_proposal = get_merge_proposal(args.merge_proposal) +if not merge_proposal: +print('No merge proposal with that URL found') +sys.exit(1) +else: +create_comment(merge_proposal, args.message, args.subject) + + +if __name__ == '__main__': +main() === modified file 'setup.py' --- setup.py 2017-12-29 09:15:48 + +++ setup.py 2018-08-22 23:08:29 + @@ -99,10 +99,11 @@ if tree_revision == tag_revision: version_string = tag_version.decode('utf-8') else: -version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8')) +version_string = '{version}.dev{revision}'.format(version=tag_version.decode('utf-8'), + revision=tree_revision.decode('utf-8')) ver_file = open(VERSION_FILE, 'w') ver_file.write(version_string) -except: +except Exception: ver_file = open(VERSION_FILE, 'r') version_string = ver_file.read().strip() finally: ___ 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:~raoul-snyman/openlp/pep440 into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/pep440 into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353579 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 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:~raoul-snyman/openlp/pep440 into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/pep440 into lp:openlp. Commit message: Make our version number PEP 440 compliant. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353579 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 into lp:openlp. === added file 'scripts/mp_update.py' --- scripts/mp_update.py 1970-01-01 00:00:00 + +++ scripts/mp_update.py 2018-08-22 14:27:13 + @@ -0,0 +1,58 @@ +#!/usr/bin/env python2 +import sys +import os +from argparse import ArgumentParser +from launchpadlib.credentials import UnencryptedFileCredentialStore +from launchpadlib.launchpad import Launchpad + +HERE = os.path.dirname(os.path.abspath(__file__)) + + +def parse_args(): +""" +Parse the command line arguments +""" +parser = ArgumentParser() +parser.add_argument('-p', '--merge-proposal', required=True, +help='The main part of the URL to the merge proposal, without the hostname.') +parser.add_argument('-m', '--message', required=True, +help='The comment to add to the merge proposal') +return parser.parse_args() + + +def get_merge_proposal(merge_proposal_url): +""" +Get the merge proposal for the ``merge_proposal_url`` +""" +lp = Launchpad.login_with('OpenLP CI', 'production', version='devel', + credential_store=UnencryptedFileCredentialStore(os.path.join(HERE, 'launchpadcreds.txt'))) +openlp_project = lp.projects['openlp'] +merge_proposals = openlp_project.getMergeProposals() +for merge_proposal in merge_proposals: +if str(merge_proposal).endswith(merge_proposal_url): +return merge_proposal +return None + + +def create_comment(merge_proposal, comment): +""" +Create a comment on the merge proposal +""" +merge_proposal.createComment(subject='comment', content=comment) + + +def main(): +""" +Run the thing +""" +args = parse_args() +merge_proposal = get_merge_proposal(args.merge_proposal) +if not merge_proposal: +print('No merge proposal with that URL found') +sys.exit(1) +else: +create_comment(merge_proposal, args.message) + + +if __name__ == '__main__': +main() === modified file 'setup.py' --- setup.py 2017-12-29 09:15:48 + +++ setup.py 2018-08-22 14:27:13 + @@ -99,10 +99,11 @@ if tree_revision == tag_revision: version_string = tag_version.decode('utf-8') else: -version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8')) +version_string = '{version}.dev{revision}'.format(version=tag_version.decode('utf-8'), + revision=tree_revision.decode('utf-8')) ver_file = open(VERSION_FILE, 'w') ver_file.write(version_string) -except: +except Exception: ver_file = open(VERSION_FILE, 'r') version_string = ver_file.read().strip() finally: ___ 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:~raoul-snyman/openlp/pep440 into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/pep440 into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353548 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 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:~raoul-snyman/openlp/pep440 into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/pep440 into lp:openlp. Commit message: Make our version number PEP 440 compliant. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353548 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 into lp:openlp. === added file 'scripts/mp_update.py' --- scripts/mp_update.py 1970-01-01 00:00:00 + +++ scripts/mp_update.py 2018-08-22 05:11:37 + @@ -0,0 +1,53 @@ +#!/usr/bin/env python2 +import sys +from argparse import ArgumentParser +from launchpadlib.launchpad import Launchpad + + +def parse_args(): +""" +Parse the command line arguments +""" +parser = ArgumentParser() +parser.add_argument('-p', '--merge-proposal', required=True, +help='The main part of the URL to the merge proposal, without the hostname.') +parser.add_argument('-m', '--message', required=True, +help='The comment to add to the merge proposal') +return parser.parse_args() + + +def get_merge_proposal(merge_proposal_url): +""" +Get the merge proposal for the ``merge_proposal_url`` +""" +lp = Launchpad.login_with('OpenLP CI', 'production', version='devel') +openlp_project = lp.projects['openlp'] +merge_proposals = openlp_project.getMergeProposals() +for merge_proposal in merge_proposals: +if str(merge_proposal).endswith(merge_proposal_url): +return merge_proposal +return None + + +def create_comment(merge_proposal, comment): +""" +Create a comment on the merge proposal +""" +merge_proposal.createComment(subject='comment', content=comment) + + +def main(): +""" +Run the thing +""" +args = parse_args() +merge_proposal = get_merge_proposal(args.merge_proposal) +if not merge_proposal: +print('No merge proposal with that URL found') +sys.exit(1) +else: +create_comment(merge_proposal, args.message) + + +if __name__ == '__main__': +main() === modified file 'setup.py' --- setup.py 2017-12-29 09:15:48 + +++ setup.py 2018-08-22 05:11:37 + @@ -99,10 +99,11 @@ if tree_revision == tag_revision: version_string = tag_version.decode('utf-8') else: -version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8')) +version_string = '{version}.dev{revision}'.format(version=tag_version.decode('utf-8'), + revision=tree_revision.decode('utf-8')) ver_file = open(VERSION_FILE, 'w') ver_file.write(version_string) -except: +except Exception: ver_file = open(VERSION_FILE, 'r') version_string = ver_file.read().strip() finally: ___ 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:~raoul-snyman/openlp/pep440 into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/pep440 into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353547 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 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:~raoul-snyman/openlp/pep440 into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/pep440 into lp:openlp. Commit message: Make our version number PEP 440 compliant. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/pep440/+merge/353547 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/pep440 into lp:openlp. === modified file 'setup.py' --- setup.py 2017-12-29 09:15:48 + +++ setup.py 2018-08-22 04:10:52 + @@ -99,10 +99,11 @@ if tree_revision == tag_revision: version_string = tag_version.decode('utf-8') else: -version_string = '%s-bzr%s' % (tag_version.decode('utf-8'), tree_revision.decode('utf-8')) +version_string = '{version}-dev{revision}'.format(version=tag_version.decode('utf-8'), + revision=tree_revision.decode('utf-8')) ver_file = open(VERSION_FILE, 'w') ver_file.write(version_string) -except: +except Exception: ver_file = open(VERSION_FILE, 'r') version_string = ver_file.read().strip() finally: ___ 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