lp:~phill-ridout/openlp/pathlib3

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2762

Raoul Snyman: Approve on 2017-08-25

Tim Bentley: Approve on 2017-08-24

Tomas Groth: Pending requested 2017-08-24

Diff: 1856 lines (+314/-348)

48 files modified

openlp/core/__init__.py (+16/-12)
openlp/core/api/endpoint/controller.py (+2/-2)
openlp/core/api/endpoint/pluginhelpers.py (+2/-5)
openlp/core/api/http/endpoint.py (+1/-2)
openlp/core/api/http/wsgiapp.py (+6/-2)
openlp/core/common/__init__.py (+47/-47)
openlp/core/common/applocation.py (+8/-19)
openlp/core/common/settings.py (+0/-28)
openlp/core/lib/__init__.py (+13/-15)
openlp/core/lib/db.py (+2/-2)
openlp/core/lib/pluginmanager.py (+1/-1)
openlp/core/lib/theme.py (+2/-3)
openlp/core/ui/firsttimeform.py (+3/-2)
openlp/core/ui/mainwindow.py (+2/-1)
openlp/core/ui/media/mediacontroller.py (+1/-1)
openlp/core/ui/printserviceform.py (+1/-1)
openlp/core/ui/servicemanager.py (+6/-5)
openlp/core/ui/themeform.py (+3/-1)
openlp/core/ui/thememanager.py (+13/-12)
openlp/plugins/bibles/lib/importers/csvbible.py (+2/-1)
openlp/plugins/bibles/lib/manager.py (+3/-2)
openlp/plugins/images/lib/mediaitem.py (+6/-5)
openlp/plugins/media/lib/mediaitem.py (+2/-1)
openlp/plugins/media/mediaplugin.py (+2/-2)
openlp/plugins/presentations/lib/impresscontroller.py (+2/-1)
openlp/plugins/presentations/lib/pdfcontroller.py (+2/-1)
openlp/plugins/presentations/lib/presentationcontroller.py (+4/-3)
openlp/plugins/presentations/presentationplugin.py (+1/-1)
openlp/plugins/remotes/remoteplugin.py (+10/-9)
openlp/plugins/songs/forms/editsongform.py (+1/-1)
openlp/plugins/songs/lib/importers/songbeamer.py (+2/-1)
openlp/plugins/songs/lib/importers/songimport.py (+2/-1)
openlp/plugins/songs/lib/mediaitem.py (+3/-2)
openlp/plugins/songs/lib/openlyricsexport.py (+2/-1)
openlp/plugins/songusage/forms/songusagedetailform.py (+2/-1)
scripts/appveyor.yml (+1/-1)
tests/functional/openlp_core_common/test_applocation.py (+5/-7)
tests/functional/openlp_core_common/test_common.py (+61/-35)
tests/functional/openlp_core_common/test_init.py (+36/-32)
tests/functional/openlp_core_lib/test_db.py (+5/-4)
tests/functional/openlp_core_lib/test_file_dialog.py (+0/-45)
tests/functional/openlp_core_lib/test_lib.py (+15/-15)
tests/functional/openlp_core_ui/test_firsttimeform.py (+2/-1)
tests/functional/openlp_core_ui/test_thememanager.py (+2/-2)
tests/functional/openlp_plugins/bibles/test_manager.py (+2/-2)
tests/functional/openlp_plugins/media/test_mediaplugin.py (+3/-5)
tests/functional/openlp_plugins/presentations/test_presentationcontroller.py (+4/-2)
tests/interfaces/openlp_core_common/test_utils.py (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2764. By Phill on 2017-08-24

Fixed issues with this branch and recent commits to trunk

2763. By Phill on 2017-08-23

Patched appveyor.yml

2762. By Phill on 2017-08-23

HEAD

2761. By Phill on 2017-08-18

indentation fix

2760. By Phill on 2017-08-18

made some more changes to core/__init__ and applocation

2759. By Phill on 2017-08-12

Convert some more utility fuctions over to using the pathlib

2758. By Phill on 2017-08-11

Definitely ready for merging, unless, of course you guys find some more issues!

Part 2

Changed the pathedit widget over to using pathlib
Added a 'patched' file dialog
Added a few utility methods

lp:~phill-ridout/openlp/pathlib2 (revision 2763)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2125/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2033/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1938/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis...

2757. By Ken Roberts on 2017-08-11

- Restructured AVMT to shortcut return on invalid input
- Added AVMT bad data test
- Fix AVMT tests
- Added extra logging information for CLSS errors
- Added CLSS failure tests
- Restructure ERST to not use hard-coded error breakout
- Added several ERST tests
- Fix ERST tests
- Added tests for pjlink.process_command

--------------------------------
lp:~alisonken1/openlp/pjlink2-h (revision 2757)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2130/
[SUCCESS] https://ci.openlp.io/job/Branc...

2756. By Ken Roberts on 2017-08-07

- Break PJLink class into base class and process commands class
- Restructure class methods
- Break projector PJLink tests into pjlink_base and pjlink_commands
- Restructure test methods
- Remove unused test imports
- Rename several tests
- Remove extraneous test (test_projector_return_ok)
- Added tests for process_erst reply

So much for no code changes this update :).
- Convert AVMT check to use dict instead of if..elif
- Fix AVMT test

--------------------------------
lp:~alisonken1/openlp...

2755. By Raoul Snyman on 2017-08-03

Remove the version number from various places within OpenLP. Fix the import path of UiStrings.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/remove-version-number (revision 2756)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2112/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2022/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1930/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1307/
[SUCCESS] https:...