lp:~alisonken1/openlp/pjlink2-p

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2813

Tomas Groth: Approve on 2018-02-16

Tim Bentley: Approve on 2018-02-13

Raoul Snyman: Pending requested 2018-02-12

Diff: 852 lines (+595/-40)

10 files modified

openlp/core/api/tab.py (+7/-11)
openlp/core/common/__init__.py (+39/-0)
openlp/core/projectors/manager.py (+2/-5)
openlp/core/projectors/pjlink.py (+143/-18)
tests/functional/openlp_core/api/test_tab.py (+11/-0)
tests/openlp_core/__init__.py (+26/-0)
tests/openlp_core/projectors/__init__.py (+1/-1)
tests/openlp_core/projectors/test_projector_pjlink_udp.py (+360/-0)
tests/openlp_core/projectors/test_projectorsourceform.py (+0/-2)
tests/resources/projector/data.py (+6/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2811. By Ken Roberts on 2018-02-11

Move MY_IP4 dict to get_local_ip4 function

2810. By Ken Roberts on 2018-02-11

PJLink2 Update P

2809. By Ken Roberts on 2018-01-14

- Ongoing conversions from self.asserts to plain asserts
- Remove test_ part of method name for bugfix tests no longer used
- Move tests *_change_status_* from pjlink_commands_01 to pjlink_base
- Move test projector_reset_information from pjlink_commands_01 to pjlink_commands_02
- Move lamp_nonstandard_reply from bugfix to pjlink_commands_01
- Move clss_nonstandard_reply 1/2 from bugfix to pjlink_commands_01
- Move test_projector_get_* tests from pjlink_commands_01 to pjlink_base
- Added pjli...

2808. By Raoul Snyman on 2018-01-13

Fix bug #1742910 by moving the threads to the application object instead of the main window object.

Add this to your merge proposal:
--------------------------------------------------------------------------------
lp:~raoul-snyman/openlp/bug-1742910 (revision 2810)
https://ci.openlp.io/job/Branch-01-Pull/2418/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2319/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/114/ ...

2807. By Raoul Snyman on 2018-01-07

Major overhaul of how threading in OpenLP works. Rather than messing around with threads yourself, you create a worker object descended from ThreadWorker, implement start() (and stop() if it's a long-running thread), and run it using run_thread().

Changes related to thread API:

- WebSocket was refactored (mostly into the worker)
- HttpServer was refactored a bit
- CheckMediaWorker was refactored a bit
- Version check refactored
- SongSelect search refactored
- New _wait_for_threads() method...

2806. By Ken Roberts on 2018-01-03

--------------------------------------------------------------------------------
lp:~alisonken1/openlp/pjlink2-n (revision 2806)
https://ci.openlp.io/job/Branch-01-Pull/2409/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2310/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/105/ [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/29/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-ma...

2805. By Simon Hanna on 2018-01-02

Fixed the version checking to be more robust

* Strip the response so empty responses that contain whitespace are in fact empty
* Change http to https to result in one less query
* Add test for responses containing white space
* Add .cache to bzrignore (generated by pytest when tests fail)

2804. By Tim Bentley on 2018-01-01

Update the year to 2018
Add some missing copyright files
Reorder and fix the imports for all files.
Fix a timing issue with the mac build which makes it fail all the time.

lp:~trb143/openlp/textcleanups (revision 2812)
https://ci.openlp.io/job/Branch-01-Pull/2406/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2307/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/102/ [SUCCESS]
https://ci.openlp.io/job/Branch-03...

2803. By Phill on 2017-12-24

Move song test resources

lp:~phill-ridout/openlp/moar_test_cleanups (revision 2809)
https://ci.openlp.io/job/Branch-01-Pull/2390/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2291/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/86/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/11/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Bra...

2802. By Phill on 2017-12-24

Some more pathlib refactors.
Test tidy ups

lp:~phill-ridout/openlp/pathlib11 (revision 2806)
https://ci.openlp.io/job/Branch-01-Pull/2384/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2285/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/80/ [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/5/ [WAITING]
[SUCCESS]
https://ci.openlp.i...