Commit Graph

919 Commits

Author SHA1 Message Date
Tomas Groth
e7526f1e59 merge trunk 2018-10-30 20:46:55 +01:00
Bastian Germann
191273fbe8 Remove unused imports 2018-10-27 13:05:41 +02:00
Bastian Germann
6aa998edd0 Replace PyICU with PyQt's QCollator
Use QCollator as new collator to get rid of the PyICU dependency.
Simplify the natural sorting with its numeric mode.
Simplify one test that is heavily dependent on implementation.
Run one sorting test on macOS which was disabled.
2018-10-27 12:50:15 +02:00
df3b3520ff Fix up some tests and things 2018-10-26 23:01:13 -07:00
d1c4cea777 Fix linting issues 2018-10-26 18:40:20 -07:00
ec479e589b Fix a bunch of linting issues (which should also help resolve other circular dependencies) 2018-10-26 16:15:31 -07:00
4bed8eabed Attempt to remove/reduce circular imports 2018-10-26 11:26:12 -07:00
80c57a9c6d HEAD 2018-10-25 19:15:25 -07:00
Philip Ridout
a867c54b94 HEAD 2018-10-24 22:02:06 +01:00
Philip Ridout
aa744e0d99 PEP fixes 2018-10-22 21:42:25 +01:00
Philip Ridout
bdec3f407b Remove proxy settings from individual bibles and use the centeral OpenLP proxy server settings. 2018-10-22 21:17:55 +01:00
aa3b0c4bcc HEAD 2018-10-01 21:39:42 -07:00
37424b3b13 HEAD 2018-09-07 07:59:21 -07:00
67e6806924 HEAD, plus loading screens from settings 2018-09-06 23:43:01 -07:00
Simon Hanna
a4c1e306b5 Remote imports from openlp/core/lib/__init__.py and update other files accordingly 2018-08-25 16:08:19 +02:00
Tim Bentley
b6dc37fb0b remove more and fix code 2018-06-10 20:29:00 +01:00
b521b9aeba HEAD 2018-04-11 09:08:34 -07:00
Tim Bentley
2531e56910 Fix quotes 2018-03-09 21:58:45 +00:00
a0d6f2d94a HEAD 2018-03-07 21:46:50 -07:00
Tim Bentley
36276d4fac fix tests 2018-02-23 16:22:48 +00:00
Tim Bentley
f7169ee708 remove ppt viewer 2018-02-02 21:33:41 +00:00
Tim Bentley
c9ff4b2209 fix web api 2018-01-27 09:41:11 +00:00
7490c7ad1e HEAD 2018-01-13 17:55:21 -07:00
13885b1a39 HEAD 2018-01-03 23:10:20 -07:00
Tim Bentley
162742927e head fixes 2017-12-29 10:19:33 +00:00
Tim Bentley
41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley
cfc487d623 tests 2017-12-28 08:27:44 +00:00
Tim Bentley
f9e20e2108 tests 2017-12-28 08:22:55 +00:00
Phill Ridout
bbc1bf3732 few missed changes 2017-12-24 08:52:53 +00:00
Phill Ridout
a4054d3c2c Move song test resources to a 'song' sub directory'
A few other minor changes
2017-12-24 08:42:46 +00:00
Phill Ridout
cb53a266ce HEAD 2017-12-24 07:40:07 +00:00
Phill Ridout
5f1212b68e Pep8 2017-12-24 07:33:22 +00:00
Phill Ridout
d35e0329c3 More test fixes? 2017-12-24 07:15:50 +00:00
Tim Bentley
9e6ecb7272 fix errors 2017-12-24 07:11:30 +00:00
ca581d00bd HEAD 2017-12-23 14:53:54 -07:00
Tim Bentley
560467757a pep8 2017-12-23 09:30:02 +00:00
Tim Bentley
35d2ce263e finished 2017-12-23 09:22:53 +00:00
Tim Bentley
6729e78231 almost finished 2017-12-23 09:09:45 +00:00
Tim Bentley
17b62ee6c9 functional more bits 2017-12-23 07:55:26 +00:00
Phill Ridout
a866bc5499 Test fixes 2017-12-22 22:35:09 +00:00
Phill Ridout
38c124224f more test tidy ups 2017-12-22 22:21:38 +00:00
Tim Bentley
aee4f76093 functional more bits 2017-12-22 22:20:04 +00:00
Phill Ridout
3bdf6d0bd6 HEAD 2017-12-22 21:21:39 +00:00
Phill Ridout
c3c1f1dc66 Test tidy ups 2017-12-22 21:20:49 +00:00
Tim Bentley
e9b4d2d7be functional more bits 2017-12-22 21:16:06 +00:00
Tim Bentley
19918d0aa9 functional more bits 2017-12-22 21:04:29 +00:00
Tim Bentley
e17386d5ab functional more bits 2017-12-22 17:51:59 +00:00
Tim Bentley
1abc6e6316 functional more bits 2017-12-22 17:15:30 +00:00
Tim Bentley
dd53bfd157 functional bibles 2017-12-22 16:53:40 +00:00
Tim Bentley
9843d48478 bible tests and head 2017-12-22 15:50:45 +00:00
Tim Bentley
0ed4ac5224 more assert updates and py.test fixes
py.test now runs on the whole test without major errors.

lp:~trb143/openlp/asserts (revision 2826)
https://ci.openlp.io/job/Branch-01-Pull/2371/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2272/              [SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2132/               [SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1458/                [SUCCESS]
https://ci.openlp.io/job/Branch-04...

bzr-revno: 2799
2017-12-22 15:11:30 +00:00
Tim Bentley
ed3d92d818 Fix tests and make pytest run clean 2017-12-22 10:45:39 +00:00
Phill Ridout
e9f4637895 Impress tests 2017-12-17 15:28:21 +00:00
d75b3f3ef1 Add some tests for threading, and fix a problem in a test related to the threading change 2017-12-17 00:25:29 -07:00
9a14750d65 HEAD 2017-12-11 13:25:58 -07:00
c7ea4c460e Fix up some stuff around the screen list 2017-12-01 17:35:21 -07:00
64a245bef9 HEAD 2017-12-01 14:58:34 -07:00
b3669c4f5d Change things around a bit 2017-11-30 15:46:03 -07:00
d9e2994deb Actually run the function, ID10T 2017-11-30 15:29:41 -07:00
8fa9bdcf58 Skip the test if not on Linux 2017-11-30 15:15:11 -07:00
Phill Ridout
7d0b841269 tidyups 2017-11-20 21:57:34 +00:00
Phill Ridout
9196db5af0 Pathlib refactors and test fixes 2017-11-18 11:23:15 +00:00
Phill
71eaccb547 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...

bzr-revno: 2788
2017-11-16 18:52:59 +00:00
Phill Ridout
35e13022a6 image media test fixes 2017-11-15 18:33:21 +00:00
Phill Ridout
9606b99976 Fix md5 thumbnail regression
Fixes: https://launchpad.net/bugs/1692187
2017-11-13 20:07:20 +00:00
Phill Ridout
b1d88ac4f7 test fix 2017-11-11 16:36:50 +00:00
Phill Ridout
e763cd81df HEAD 2017-11-11 12:20:45 +00:00
Phill Ridout
66534a58ab Head 2017-11-06 22:41:36 +00:00
Phill Ridout
3cf0be000b head 2017-11-03 22:46:27 +00:00
6718be4cff HEAD 2017-11-03 15:31:48 -07:00
Phill Ridout
94dd107abe Changed merged errors
Fixes: https://launchpad.net/bugs/1400415
2017-11-03 20:55:41 +00:00
8b34852236 Rename some tests so that they can be picked up by nose2; Fix some patches that were wrong; Fix a bug in our code that the now running tests picked up 2017-10-28 23:01:25 -07:00
53c8337017 Moved ScreenList to display module 2017-10-10 14:15:08 -07:00
Philip Ridout
46f93a9d1b head 2017-10-10 20:17:48 +01:00
Philip Ridout
66049f0c96 bible pathlib changes 2017-10-10 20:09:20 +01:00
15a4a93c96 Phase 2 complete 2017-10-10 00:08:44 -07:00
bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Tim Bentley
b07f2e9f86 head 2017-10-01 21:11:03 +01:00
Philip Ridout
70e50f4aaa Pep fixes 2017-09-30 23:45:24 +01:00
Philip Ridout
d8a32d3962 HEAD 2017-09-30 22:47:50 +01:00
Philip Ridout
ab49b8b8ad pathlib changes for song plugin 2017-09-30 21:16:30 +01:00
Tim Bentley
d77f0127e8 head 2017-09-29 19:42:15 +01:00
Tim Bentley
b783783a29 add files 2017-09-26 21:33:58 +01:00
Tim Bentley
5b2ac0f97b more moves 2017-09-26 18:49:41 +01:00
Philip Ridout
047a1b3808 pep fixes 2017-09-24 20:33:07 +01:00
Philip Ridout
d61ed7e9b1 converted the image plugin over to using Path objects 2017-09-23 14:06:42 +01:00
Philip Ridout
0ee8ebb1c2 PEP fixes 2017-09-18 07:32:19 +01:00
Philip Ridout
7f98003d54 test fixes 2017-09-17 20:43:15 +01:00
Philip Ridout
8ed5903ced Moved most of the presentation plugin over to pathlib 2017-09-15 20:01:09 +01:00
bf3e891567 HEAD 2017-09-06 21:56:14 -07:00
Tim Bentley
7abef1df22 fix lables and render bug 2017-08-27 18:13:14 +01:00
Tim Bentley
b546f3cecb Head 2017-08-27 17:26:06 +01:00
Philip Ridout
8f9cb4a090 Modify setting upgrade code to provide versioned updates. Upgrade settings to use JSON encoded Path objects 2017-08-26 16:06:11 +01:00
Philip Ridout
f8a68c23d0 Enable JSON to handle unsupported objects and tests 2017-08-25 21:03:25 +01:00
Philip Ridout
6ac671a5fa HEAD 2017-08-23 21:13:58 +01:00
Tim Bentley
bbcd5691fe fix more tests 2017-08-12 20:34:56 +01:00
Philip Ridout
b384e6f2fa Convert some more utility fuctions over to using the pathlib 2017-08-12 18:45:56 +01:00
Tim Bentley
bc03652cda Finish tests 2017-08-11 17:09:14 +01:00
Tim Bentley
7bcaec2cb3 start of the tests 2017-08-09 06:15:10 +01:00