summaryrefslogtreecommitdiffstats
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
parent2f1c008a26b50ab3487bd03bcabb39347d441f23 (diff)
downloaddeluge-eb57412601d49818383c56fdc13a9168807746d3.zip
deluge-eb57412601d49818383c56fdc13a9168807746d3.tar.gz
deluge-eb57412601d49818383c56fdc13a9168807746d3.tar.bz2
[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.
-rw-r--r--.travis.yml6
-rw-r--r--docs/source/devguide/tutorials/01-setup.md2
-rw-r--r--requirements-dev.txt1
-rw-r--r--requirements-tests.txt2
-rw-r--r--tox.ini4
5 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 5fa96b7..b10ec78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
+os: linux
dist: xenial
-sudo: required
language: python
python:
@@ -17,7 +17,7 @@ git:
# Set greater depth to get version from tags.
depth: 1000
-matrix:
+jobs:
include:
- name: Unit tests
env: TOX_ENV=py3
@@ -58,7 +58,7 @@ addons:
# Install dependencies
install:
- - pip install tox tox-venv
+ - pip install tox
# GTKUI tests
- "if [ $TOX_ENV == 'gtkui' ]; then
sudo apt install python3-gi python3-gi-cairo gir1.2-gtk-3.0;
diff --git a/docs/source/devguide/tutorials/01-setup.md b/docs/source/devguide/tutorials/01-setup.md
index 81c64fd..02195b1 100644
--- a/docs/source/devguide/tutorials/01-setup.md
+++ b/docs/source/devguide/tutorials/01-setup.md
@@ -17,7 +17,7 @@ system.
#### Build tools
sudo apt install git intltool closure-compiler python3-pip
- pip3 install --user tox tox-venv
+ pip3 install --user tox
You might need to add `~/.local/bin` to your PATH.
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 34f57cf..c66dd79 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,7 +3,6 @@
-r requirements-tests.txt
sphinx-autobuild
tox
-tox-venv
pre-commit
flake8-blind-except
flake8-builtins
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 3bbf104..4390eaf 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -1,4 +1,4 @@
-pytest != 5.2.3
+pytest != 5.2.3, < 5.4
pytest-twisted
pytest-cov
mock
diff --git a/tox.ini b/tox.ini
index 965ef83..3f4cdf0 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 =