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

bzr-revno: 2876
This commit is contained in:
Bastian Germann 2019-06-06 21:25:25 +01:00 committed by Tim Bentley
commit abf172fa7c
4 changed files with 8 additions and 30 deletions

View File

@ -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

View File

@ -100,12 +100,13 @@ OPTIONAL_MODULES = [
('pyodbc', '(ODBC support)'), ('pyodbc', '(ODBC support)'),
('psycopg2', '(PostgreSQL support)'), ('psycopg2', '(PostgreSQL support)'),
('enchant', '(spell checker)'), ('enchant', '(spell checker)'),
('fitz', '(executable-independent PDF support)'),
('pysword', '(import SWORD bibles)'), ('pysword', '(import SWORD bibles)'),
('uno', '(LibreOffice/OpenOffice support)'), ('uno', '(LibreOffice/OpenOffice support)'),
# development/testing modules # development/testing modules
('jenkins', '(access jenkins api)'), ('jenkins', '(access jenkins api)'),
('launchpadlib', '(launchpad script support)'), ('launchpadlib', '(launchpad script support)'),
('nose2', '(testing framework)'), ('pytest', '(testing framework)'),
('pylint', '(linter)') ('pylint', '(linter)')
] ]

View File

@ -2,6 +2,9 @@
# E722 do not use bare except, specify exception instead # E722 do not use bare except, specify exception instead
# F841 local variable '<variable>' is assigned to but never used # F841 local variable '<variable>' is assigned to but never used
[aliases]
test=pytest
[pep8] [pep8]
exclude=resources.py,vlc.py exclude=resources.py,vlc.py
max-line-length = 120 max-line-length = 120

View File

@ -178,6 +178,7 @@ using a computer and a data projector.""",
'pyobjc-framework-Cocoa; platform_system=="Darwin"', 'pyobjc-framework-Cocoa; platform_system=="Darwin"',
'PyQt5 >= 5.12', 'PyQt5 >= 5.12',
'PyQtWebEngine', 'PyQtWebEngine',
'python-vlc',
'pywin32; platform_system=="Windows"', 'pywin32; platform_system=="Windows"',
'QtAwesome', 'QtAwesome',
'requests', 'requests',
@ -199,13 +200,13 @@ using a computer and a data projector.""",
'launchpad': ['launchpadlib'] 'launchpad': ['launchpadlib']
}, },
tests_require=[ tests_require=[
'nose2',
'pylint', 'pylint',
'PyMuPDF', 'PyMuPDF',
'pyodbc', 'pyodbc',
'pysword', 'pysword',
'pytest',
'python-xlib; platform_system=="Linux"' 'python-xlib; platform_system=="Linux"'
], ],
test_suite='nose2.collector.collector', setup_requires=['pytest-runner'],
entry_points={'gui_scripts': ['openlp = run_openlp:start']} entry_points={'gui_scripts': ['openlp = run_openlp:start']}
) )