Deluge
diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | docs/source/devguide/tutorials/01-setup.md | 2 | ||||
| -rw-r--r-- | requirements-dev.txt | 1 | ||||
| -rw-r--r-- | requirements-tests.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 5fa96b715..b10ec78a9 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 81c64fda1..02195b192 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 34f57cfa8..c66dd799f 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 3bbf104b4..4390eaf4d 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 @@ -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 = |