summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbendikro <bro.devel@gmail.com>2016-10-31 12:51:12 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2016-11-01 15:04:14 +0100
commit2f4cb0156c1e43e8f93aa3f84b47c5a500480c7d (patch)
tree01147672cbc25feea63d39e142ca8e69379d540b
parent[Tests] Move test torrents into data subdir (diff)
downloaddeluge-2f4cb0156c1e43e8f93aa3f84b47c5a500480c7d.tar.xz
deluge-2f4cb0156c1e43e8f93aa3f84b47c5a500480c7d.zip
[Tests] Fix for isort config package handling
* Force gtk modules to be third_party for tox/travis testing.
-rw-r--r--setup.cfg8
-rw-r--r--tox.ini4
2 files changed, 7 insertions, 5 deletions
diff --git a/setup.cfg b/setup.cfg
index 9e75a1308..46d52025e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,10 +15,10 @@ includes = glib, gio, cairo, pango, pangocairo, atk, gobject, gtk.keysyms,
frameworks = CoreFoundation, Foundation, AppKit
[isort]
-known_standard_library = unicodedata
-known_third_party = pygtk, gtk, gobject, gtk.gdk, pango, cairo, pangocairo, twisted,
- pytest, OpenSSL, pkg_resources, chardet, bbfreeze, win32verstamp, mock
-known_first_party = msgfmt
+known_standard_library = future_builtins
+# Ignore Windows specific modules
+known_third_party = bbfreeze, win32verstamp
+known_first_party = msgfmt, deluge
order_by_type = true
line_length = 120
not_skip = __init__.py
diff --git a/tox.ini b/tox.ini
index a15d9cbb8..7c8010eb8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -96,7 +96,9 @@ whitelist_externals =
commands =
isort --version
python -c "import subprocess, sys; output = subprocess.check_output(\
- 'isort -q --diff --recursive deluge docs packaging *.py', shell=True);\
+ 'isort -q --diff --recursive deluge docs packaging *.py\
+ -o pygtk -o gtk -o gobject -o gtk.gdk -o pango -o cairo -o pangocairo\
+ ', shell=True);\
print output; sys.exit(bool(output))"
[testenv:flake8]