openlp-core team mailing list archive

[Bastian Germann <bastiangermann@xxxxxxxxxxx>]

Bastian Germann has proposed merging lp:~bastian-germann/openlp/dependencies into lp:openlp.

Commit message:
Sync dependencies in setup.py and check_dependencies; replacing nose2 with pytest

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~bastian-germann/openlp/dependencies/+merge/367931
-- 
Your team OpenLP Core is subscribed to branch 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-25 14:48:48 +0000
@@ -100,12 +100,13 @@
     ('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)'),
+    ('pytest', '(testing framework)'),
     ('pylint', '(linter)')
 ]
 

=== modified file 'setup.cfg'
--- setup.cfg	2019-04-08 21:03:57 +0000
+++ setup.cfg	2019-05-25 14:48:48 +0000
@@ -2,6 +2,9 @@
 # E722 do not use bare except, specify exception instead
 # F841 local variable '<variable>' is assigned to but never used
 
+[aliases]
+test=pytest
+
 [pep8]
 exclude=resources.py,vlc.py
 max-line-length = 120

=== modified file 'setup.py'
--- setup.py	2019-05-02 10:35:29 +0000
+++ setup.py	2019-05-25 14:48:48 +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,13 @@
         'launchpad': ['launchpadlib']
     },
     tests_require=[
-        'nose2',
         'pylint',
         'PyMuPDF',
         'pyodbc',
         'pysword',
+        'pytest',
         'python-xlib; platform_system=="Linux"'
     ],
-    test_suite='nose2.collector.collector',
+    setup_requires=['pytest-runner'],
     entry_points={'gui_scripts': ['openlp = run_openlp:start']}
 )