lp:~phill-ridout/openlp/pathlib10

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2790

Tomas Groth: Approve on 2017-11-22

Tim Bentley: Approve on 2017-11-21

Diff: 1506 lines (+243/-315)

32 files modified

openlp/core/api/deploy.py (+7/-8)
openlp/core/api/endpoint/controller.py (+6/-5)
openlp/core/api/endpoint/core.py (+0/-12)
openlp/core/api/endpoint/pluginhelpers.py (+6/-9)
openlp/core/api/http/endpoint.py (+7/-5)
openlp/core/api/http/wsgiapp.py (+3/-5)
openlp/core/common/__init__.py (+0/-11)
openlp/core/common/path.py (+10/-17)
openlp/core/display/renderer.py (+2/-2)
openlp/core/lib/__init__.py (+5/-4)
openlp/core/lib/mediamanageritem.py (+20/-20)
openlp/core/lib/plugin.py (+13/-4)
openlp/core/lib/pluginmanager.py (+1/-2)
openlp/core/ui/maindisplay.py (+3/-3)
openlp/core/ui/mainwindow.py (+29/-39)
openlp/core/ui/servicemanager.py (+10/-8)
openlp/core/ui/thememanager.py (+9/-8)
openlp/core/version.py (+2/-9)
openlp/plugins/images/lib/mediaitem.py (+1/-1)
openlp/plugins/media/mediaplugin.py (+5/-4)
openlp/plugins/presentations/lib/mediaitem.py (+2/-2)
openlp/plugins/presentations/lib/presentationcontroller.py (+4/-4)
openlp/plugins/presentations/presentationplugin.py (+4/-4)
tests/functional/openlp_core/api/test_deploy.py (+11/-13)
tests/functional/openlp_core/common/test_init.py (+1/-42)
tests/functional/openlp_core/common/test_path.py (+12/-8)
tests/functional/openlp_core/lib/test_lib.py (+49/-43)
tests/functional/openlp_core/ui/test_servicemanager.py (+2/-2)
tests/functional/openlp_core/ui/test_thememanager.py (+4/-4)
tests/functional/openlp_plugins/presentations/test_pdfcontroller.py (+10/-10)
tests/functional/openlp_plugins/songs/test_openlyricsexport.py (+2/-3)
tests/interfaces/openlp_core/lib/test_pluginmanager.py (+3/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2796. By Phill on 2017-11-21

PEP8

2795. By Phill on 2017-11-21

test fix

2794. By Phill on 2017-11-20

tidyups

2793. By Phill on 2017-11-19

Minor tidyups

2792. By Phill on 2017-11-18

More pathlib refactors

2791. By Phill on 2017-11-18

HEAD

2790. By Phill on 2017-11-18

Moar pathlib refactors

2789. By Phill on 2017-11-18

Pathlib refactors and test fixes

2788. By Phill on 2017-11-16

Various fixes

lp:~phill-ridout/openlp/fixes-mkIII (revision 2794)
https://ci.openlp.io/job/Branch-01-Pull/2301/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2202/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2080/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1406/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/B...

2787. By Raoul Snyman on 2017-11-16

Add multi-to-one settings upgrading, and merge all the post-2.4 settings changes into __setting_upgrade_2__

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/settings-upgrade (revision 2791)
https://ci.openlp.io/job/Branch-01-Pull/2295/ [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2196/ [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2074...