Merge branch 'master' into feature-adrienverge#10-move-pictures

ojob · Nov 12, 2017 · 7348af7 · 7348af7
2 parents 6189ae6 + bb98625
commit 7348af7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/photocollage/gtkgui.py b/photocollage/gtkgui.py
@@ -25,8 +25,8 @@
 
 import cairo
 import gi
-gi.require_version('Gtk', '3.0')  # noqa
-from gi.repository import Gtk, Gdk, GObject, GdkPixbuf
+gi.require_version('Gtk', '3.0')  # noqa: E402
+from gi.repository import Gtk, Gdk, GObject, GdkPixbuf  # noqa: I202
 from six.moves import urllib  # Python 2 backward compatibility
 
 from photocollage import APP_NAME, artwork, collage, render

diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,3 @@
 [flake8]
 import-order-style = pep8
+application-import-names = photocollage