summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorCalum Lind <calumlind@gmail.com>2018-10-10 14:49:39 +0100
committerCalum Lind <calumlind@gmail.com>2018-10-10 18:50:41 +0100
commit0b2cb7539ff5b321fe285f47c9b7617653471d7a (patch)
treebdf8e02b9b28beac4b7d3312c4dec5c8b386f678 /tox.ini
parent6fdbf0ba5db98dfca28e8e37df0ea046f5c99c60 (diff)
downloaddeluge-0b2cb7539ff5b321fe285f47c9b7617653471d7a.tar.gz
deluge-0b2cb7539ff5b321fe285f47c9b7617653471d7a.tar.bz2
deluge-0b2cb7539ff5b321fe285f47c9b7617653471d7a.zip
Cleanup Tox and CI configs
- Use the apt addon for installing libtorrent package. - Start the py3 test sooner as it is slow to complete. - Add if conditions for gtkui test dependencies. - Remove Appveyor tests that are taken care of by Travis.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini47
1 files changed, 15 insertions, 32 deletions
diff --git a/tox.ini b/tox.ini
index f60321311..564b33679 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
# Usage: `pip install tox` and then run `tox` from this directory.
[tox]
-envlist = py27, lint, docs
+envlist = py27, py3, lint, docs
minversion=2.0
[base]
@@ -22,58 +22,46 @@ sitepackages = True
deps =
{[base]deps}
-rrequirements-tests.txt
-whitelist_externals = pytest
+commands =
+ python -c "import libtorrent as lt; print(lt.__version__)"
+ pytest -v -s -m "not (todo or gtkui or security)" deluge/tests
[pytest]
# Hide logged warnings and errors in test output.
log_cli_level = CRITICAL
-addopts = -p no:warnings
+addopts = -p no:warnings --basetemp=_pytest_temp
# ==========
# Unit tests
# ==========
-[testenv:pydef]
-commands =
- python -c "import libtorrent as lt; print(lt.__version__)"
- pytest -v --basetemp=_pytest_temp -s -m "not (todo or gtkui or security)" deluge/tests
-
[testenv:security]
setenv = SECURITY_TESTS = True
-commands = pytest -v --basetemp=_pytest_temp -s -m "security" deluge/tests/
+commands = pytest -v -s -m "security" deluge/tests/
[testenv:pygtkui]
-commands = pytest -v --basetemp=_pytest_temp -s -m "gtkui" deluge/tests
+commands = pytest -v -s -m "gtkui" deluge/tests
[testenv:todo]
-commands = pytest -v --basetemp=_pytest_temp -s -m "todo" deluge/tests
+commands = pytest -v -s -m "todo" deluge/tests
[testenv:trial]
setenv = {[testenv]setenv}{:}{toxinidir}/deluge/tests
commands =
- python -c "import libtorrent as lt; print lt.__version__"
+ python -c "import libtorrent as lt; print(lt.__version__)"
python -m twisted.trial --reporter=deluge-reporter deluge.tests
[testenv:plugins]
setenv = PYTHONPATH = {toxinidir}{:}{toxinidir}/deluge/plugins
-whitelist_externals = bash
commands =
python setup.py build_plugins --develop --install-dir={toxinidir}/deluge/plugins/
- pytest -v --basetemp=_pytest_temp -s -m "not gtkui" deluge/plugins
+ pytest -v -s -m "not gtkui" deluge/plugins
[testenv:pluginsgtkui]
setenv = PYTHONPATH = {toxinidir}{:}{toxinidir}/deluge/plugins
commands =
python setup.py build_plugins --develop --install-dir={toxinidir}/deluge/plugins/
- pytest -v --basetemp=_pytest_temp -s deluge/plugins
-
-[testenv:py27]
-basepython = python2.7
-commands = {[testenv:pydef]commands}
-
-[testenv:py3]
-basepython = python3
-commands = {[testenv:pydef]commands}
+ pytest -v -s deluge/plugins
# =======================
@@ -134,15 +122,11 @@ deps =
{[testenv]deps}
pytest-cov
coverage
-whitelist_externals =
- {[testenv]whitelist_externals}
- coverage
commands = coverage run --branch --source=deluge -m pytest -m "not todo" deluge/tests/
[testenv:testcoverage]
setenv = {[testenv]setenv}
deps = {[testcoveragebase]deps}
-whitelist_externals = {[testcoveragebase]whitelist_externals}
commands =
{[testcoveragebase]commands}
coverage report
@@ -150,7 +134,6 @@ commands =
[testenv:testcoverage-html]
setenv = {[testenv]setenv}
deps = {[testcoveragebase]deps}
-whitelist_externals = {[testcoveragebase]whitelist_externals}
commands =
{[testcoveragebase]commands}
coverage html -d docs/build/htmlcoverage
@@ -184,9 +167,7 @@ changedir = {[docsbase]changedir}
deps =
{[docsbase]deps}
pytest-cov
-whitelist_externals =
- pytest
- mkdir
+whitelist_externals = mkdir
commands =
mkdir -p build/doccoverage
sphinx-build -W -b coverage -d build/doctrees source build/doccoverage
@@ -201,13 +182,15 @@ usedevelop = True
deps = -rrequirements-dev.txt
[testenv:denv2]
-envdir = .venv2
basepython = python2.7
+envdir = .venv2
usedevelop = {[basedev]usedevelop}
deps = {[basedev]deps}
+commands =
[testenv:denv3]
basepython = python3
envdir = .venv3
usedevelop = {[basedev]usedevelop}
deps = {[basedev]deps}
+commands =