diff --git a/nose2.cfg b/nose2.cfg deleted file mode 100644 index 451737d6c..000000000 --- a/nose2.cfg +++ /dev/null @@ -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 diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 2fbddd69f..19325fbb8 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -100,12 +100,13 @@ OPTIONAL_MODULES = [ ('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)') ] diff --git a/setup.cfg b/setup.cfg index 5b443dcf7..27af3897d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,6 +2,9 @@ # E722 do not use bare except, specify exception instead # F841 local variable '' is assigned to but never used +[aliases] +test=pytest + [pep8] exclude=resources.py,vlc.py max-line-length = 120 diff --git a/setup.py b/setup.py index 90cef4885..260f0f8be 100644 --- a/setup.py +++ b/setup.py @@ -178,6 +178,7 @@ using a computer and a data projector.""", 'pyobjc-framework-Cocoa; platform_system=="Darwin"', 'PyQt5 >= 5.12', 'PyQtWebEngine', + 'python-vlc', 'pywin32; platform_system=="Windows"', 'QtAwesome', 'requests', @@ -199,13 +200,13 @@ using a computer and a data projector.""", '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']} )