Adding upstream version 2.1.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>

1 files changed, 14 insertions, 20 deletions

diff --git a/setup.cfg b/setup.cfg
index ad212e6..1f2bd04 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,6 +7,11 @@ build-dir = docs/build
 all_files = true
 fresh-env = true
 
+[spellcheck_docs]
+source-dir = docs/source
+build-dir = docs/build
+builder = spelling
+
 [py2app]
 app = ['deluge/ui/ui_entry.py']
 arch = x86_64
@@ -18,30 +23,19 @@ includes = glib, gio, cairo, pango, pangocairo, atk, gobject, gtk.keysyms,
 	HTMLParser
 frameworks = CoreFoundation, Foundation, AppKit
 
-[isort]
-known_standard_library = future_builtins
-known_third_party = 
-	cairo, gi,
-	twisted, OpenSSL, pytest, recommonmark, chardet, pkg_resources, zope, mock,
-	sphinx, rencode, six, mako
-known_first_party = msgfmt, deluge
-order_by_type = true
-not_skip = __init__.py
-multi_line_output = 3
-include_trailing_comma = True
-force_grid_wrap = 0
-line_length = 88
-use_parentheses = True
-
 [flake8]
 max-line-length = 120
 builtins = _,_n,__request__
-exclude = .git,.tox,.eggs,dist,build
-ignore = 
+extend-exclude = dist,build
+extend-ignore = 
 	A003,
-	C813,C815,C816,
-	W503,
-	E203
+	E203,
+	N818
+per-file-ignores = 
+	deluge/ui/gtk3/*.py : E402
+	deluge/**/gtkui.py: E402
+	deluge/**/gtkui/*.py: E402
+	deluge/plugins/Stats/deluge_stats/graph.py: E402
 
 [pycodestyle]
 max-line-length = 88