openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #33991
[Merge] lp:~bastian-germann/openlp/dependencies into lp:openlp
Bastian Germann has proposed merging lp:~bastian-germann/openlp/dependencies into lp:openlp.
Commit message:
Sync dependencies in setup.py and check_dependencies; eliminating nose2
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~bastian-germann/openlp/dependencies/+merge/367492
--
Your team OpenLP Core is requested to review the proposed merge of lp:~bastian-germann/openlp/dependencies into lp:openlp.
=== removed file 'nose2.cfg'
--- nose2.cfg 2017-12-02 05:31:23 +0000
+++ nose2.cfg 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-[unittest]
-verbose = true
-plugins = nose2.plugins.mp
-
-[log-capture]
-always-on = true
-clear-handlers = true
-filter = -nose
-log-level = ERROR
-
-[test-result]
-always-on = true
-descriptions = true
-
-[coverage]
-always-on = true
-coverage = openlp
-coverage-report = html
-
-[multiprocess]
-always-on = false
-processes = 4
-
-[output-buffer]
-always-on = true
-stderr = true
-stdout = true
=== modified file 'scripts/check_dependencies.py'
--- scripts/check_dependencies.py 2019-05-05 08:13:10 +0000
+++ scripts/check_dependencies.py 2019-05-15 22:38:49 +0000
@@ -100,12 +100,12 @@
('pyodbc', '(ODBC support)'),
('psycopg2', '(PostgreSQL support)'),
('enchant', '(spell checker)'),
+ ('fitz', '(executable-independent PDF support)'),
('pysword', '(import SWORD bibles)'),
('uno', '(LibreOffice/OpenOffice support)'),
# development/testing modules
('jenkins', '(access jenkins api)'),
('launchpadlib', '(launchpad script support)'),
- ('nose2', '(testing framework)'),
('pylint', '(linter)')
]
=== modified file 'setup.py'
--- setup.py 2019-05-02 10:35:29 +0000
+++ setup.py 2019-05-15 22:38:49 +0000
@@ -178,6 +178,7 @@
'pyobjc-framework-Cocoa; platform_system=="Darwin"',
'PyQt5 >= 5.12',
'PyQtWebEngine',
+ 'python-vlc',
'pywin32; platform_system=="Windows"',
'QtAwesome',
'requests',
@@ -199,13 +200,12 @@
'launchpad': ['launchpadlib']
},
tests_require=[
- 'nose2',
'pylint',
'PyMuPDF',
'pyodbc',
'pysword',
'python-xlib; platform_system=="Linux"'
],
- test_suite='nose2.collector.collector',
+ test_suite='tests',
entry_points={'gui_scripts': ['openlp = run_openlp:start']}
)
Follow ups