summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2020-04-11 18:56:46 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2020-04-12 17:37:42 +0100
commiteb57412601d49818383c56fdc13a9168807746d3 (patch)
treec8eadf311b7ae508770167d7cb53b0086b24a5f3 /tox.ini
parent2f1c008a26b50ab3487bd03bcabb39347d441f23 (diff)
downloaddeluge-eb57412601d49818383c56fdc13a9168807746d3.tar.gz
deluge-eb57412601d49818383c56fdc13a9168807746d3.tar.bz2
deluge-eb57412601d49818383c56fdc13a9168807746d3.zip
[Tests] Fix tox, pytest and travis issues
* Error occurring with Pytest 5.4 so pin to below that version. * Fix minor issues with Travis config. * Use full command-switches for pytest in tox config. * Remove pin for pip as issue with pip-wheel-metadata was fixed in 19.3 * Remove tox-venv as causing issues of incompatible packages installed. The latest versions of the virtualenv package should handle these duties.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 965ef8369..3f4cdf081 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ addopts = -p no:warnings --basetemp=_pytest_temp
[basesetup]
# Minimum pip and setuptools versions to fix system and travis issues.
deps =
- pip >= 10, <= 18.1
+ pip >= 10
setuptools >= 40
[basetests]
@@ -53,7 +53,7 @@ install_command = python -m pip install --ignore-installed {opts} {packages}
passenv = DISPLAY PYTHONPATH
setenv =
PYTHONPATH = {toxinidir}
- PYTEST_ADDOPTS = -v -s
+ PYTEST_ADDOPTS = --verbose --capture=no
sitepackages = True
deps = {[basetests]deps}
commands =