diff options
author | Calum Lind <calumlind@gmail.com> | 2018-10-25 15:02:53 +0100 |
---|---|---|
committer | Calum Lind <calumlind@gmail.com> | 2018-11-02 08:47:57 +0000 |
commit | 97e7d95dd3cf9e922db147d49f23c931ad692c31 (patch) | |
tree | da132daaf6c8e569aa9d525a7b81a9049173ebf3 /packaging | |
parent | 26c28445a5f89fe883aa6becae3e87d71ed3f589 (diff) | |
download | deluge-97e7d95dd3cf9e922db147d49f23c931ad692c31.tar.gz deluge-97e7d95dd3cf9e922db147d49f23c931ad692c31.tar.bz2 deluge-97e7d95dd3cf9e922db147d49f23c931ad692c31.zip |
Cleanup tox configuration
There were issues with dependencies and tox environments under Python 3
so refactored the tox configuration to be more consistent and clearer.
- Moved travis to default to Python 3 for linting and tests.
- Fixed missing mock for cairo in sphinx config.
- Collated the base deps sections to improve readability.
- Added PYTEST_ADDOPTS env to override pytest verbosity in just tox
tests as this was a common option being used.
- Renamed env 'testcoverage' to the more concise 'coverage' and moved
html creation under single env as handy to have this output as well
as report.
- Cleaned up the isort config for gtk3.
- Added `bad-continuation` to pylint config as conflcts with black
formatting.
- Fix isort issue with bbfreeze script. This will likely be removed
in future so just skip sorting it.
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/win32/deluge-bbfreeze.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging/win32/deluge-bbfreeze.py b/packaging/win32/deluge-bbfreeze.py index 400bf640f..a58161882 100644 --- a/packaging/win32/deluge-bbfreeze.py +++ b/packaging/win32/deluge-bbfreeze.py @@ -10,7 +10,7 @@ # the additional special exception to link portions of this program with the OpenSSL library. # See LICENSE for more details. # - +# isort:skip_file from __future__ import print_function import glob @@ -19,6 +19,7 @@ import re import shutil import sys + import bbfreeze import gtk from win32verstamp import stamp |