summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorCalum Lind <calumlind@gmail.com>2017-12-16 17:32:01 +0000
committerCalum Lind <calumlind@gmail.com>2017-12-16 17:39:48 +0000
commit4e79ed8124250f97919619bf9b137658b49710b2 (patch)
treefa89ec3a949966627e58f08ffee536e6f29613b0 /tox.ini
parent7787aa975f123736862c6307af72ebae477a290a (diff)
downloaddeluge-4e79ed8124250f97919619bf9b137658b49710b2.tar.gz
deluge-4e79ed8124250f97919619bf9b137658b49710b2.tar.bz2
deluge-4e79ed8124250f97919619bf9b137658b49710b2.zip
Fix tox config to install latest pip packages
Trial changed command in latest versions of twisted
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 4 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 96ab29dfe..404eab916 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,11 +16,12 @@ envlist = py27, flake8, docs, pylint
minversion=1.8
[testenv]
-passenv = DISPLAY
+install_command = pip install --ignore-installed {opts} {packages}
+passenv = DISPLAY PYTHONPATH
setenv = PYTHONPATH = {env:PWD}:
sitepackages = True
deps =
- twisted==16.6
+ twisted[tls]
service_identity
mako
chardet
@@ -58,10 +59,9 @@ commands = py.test -v --basetemp=_pytest_temp -s -m "todo" deluge/tests
[testenv:trial]
setenv = {[testenv]setenv}:{env:PWD}/deluge/tests
-whitelist_externals = trial
commands =
python -c "import libtorrent as lt; print lt.__version__"
- trial --reporter=deluge-reporter deluge.tests
+ python -m twisted.trial --reporter=deluge-reporter deluge.tests
[testenv:plugins]
setenv = PYTHONPATH = {env:PWD}:{env:PWD}/deluge/plugins