Merge pull request #125 from MightyCreak/flake8

Use Flake8 instead of PyLint + integrate MyPy

Author: MightyCreak

.flake8

@@ -0,0 +1,6 @@
+[flake8]
+builtins = _
+max-line-length = 100
+
+# Temporary
+exclude = src/diffuse/main.py

.github/workflows/main.yml

@@ -17,20 +17,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/setup-python@v2
+    - run: sudo apt install libgirepository1.0-dev
+    - run: pip install -r requirements.txt
 
-    - name: Pylint
-      uses: cclauss/GitHub-Action-for-pylint@master
-      with:
-        args: "apk add --no-cache gtk+3.0-dev gobject-introspection-dev ; pip install -r requirements.txt ; pylint src/**/*.py"
+    - name: Flake8
+      run: flake8 src/
+
+    - name: MyPy
+      run: mypy src/
 
   meson-build-test:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/setup-python@v2
 
     - name: Install dependencies
       run: sudo apt-get -y install appstream appstream-util desktop-file-utils gettext
@@ -52,6 +53,7 @@ jobs:
       options: --privileged
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
     - name: Flatpak builder
       uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
       with:

.mypy.ini

@@ -0,0 +1,2 @@
+[mypy]
+warn_unused_ignores = True

requirements.txt

@@ -1,2 +1,3 @@
-PyGObject~=3.40
-pylint~=2.11
+flake8 ~= 3.8
+mypy ~= 0.910
+PyGObject ~= 3.40

src/diffuse/dialogs.py

@@ -19,17 +19,14 @@
 
 import os
 
-# pylint: disable=wrong-import-position
-import gi
+from diffuse import constants  # type: ignore
+from diffuse import utils
+
+import gi  # type: ignore
 gi.require_version('GObject', '2.0')
 gi.require_version('Gtk', '3.0')
-from gi.repository import GObject, Gtk
-# pylint: enable=wrong-import-position
+from gi.repository import GObject, Gtk  # type: ignore # noqa: E402
 
-# pylint: disable-next=no-name-in-module
-from diffuse import constants
-
-from diffuse import utils
 
 # the about dialog
 class AboutDialog(Gtk.AboutDialog):
@@ -41,8 +38,8 @@ def __init__(self):
         self.set_comments(_('Diffuse is a graphical tool for merging and comparing text files.'))
         self.set_copyright(constants.COPYRIGHT)
         self.set_website(constants.WEBSITE)
-        self.set_authors([ 'Derrick Moser <[email protected]>',
-                           'Romain Failliot <[email protected]>' ])
+        self.set_authors(['Derrick Moser <[email protected]>',
+                          'Romain Failliot <[email protected]>'])
         self.set_translator_credits(_('translator-credits'))
         license_text = [
             constants.APP_NAME + ' ' + constants.VERSION + '\n\n',
@@ -59,9 +56,10 @@ def __init__(self):
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.''') ]
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.''')]
         self.set_license(''.join(license_text))
 
+
 # custom dialogue for picking files with widgets for specifying the encoding
 # and revision
 class FileChooserDialog(Gtk.FileChooserDialog):
@@ -85,7 +83,7 @@ def __init__(self, title, parent, prefs, action, accept, rev=False):
         label.show()
         self.encoding = entry = utils.EncodingMenu(
             prefs,
-            action in [ Gtk.FileChooserAction.OPEN, Gtk.FileChooserAction.SELECT_FOLDER ])
+            action in [Gtk.FileChooserAction.OPEN, Gtk.FileChooserAction.SELECT_FOLDER])
         hbox.pack_start(entry, False, False, 5)
         entry.show()
         if rev:
@@ -96,7 +94,7 @@ def __init__(self, title, parent, prefs, action, accept, rev=False):
             hbox.pack_end(label, False, False, 0)
             label.show()
 
-        self.vbox.pack_start(hbox, False, False, 0) # pylint: disable=no-member
+        self.vbox.pack_start(hbox, False, False, 0)
         hbox.show()
         self.set_current_folder(self.last_chosen_folder)
         self.connect('current-folder-changed', self._current_folder_changed_cb)
@@ -110,10 +108,10 @@ def get_encoding(self):
     def get_revision(self):
         return self.revision.get_text()
 
-    # pylint: disable-next=arguments-differ
     def get_filename(self):
         # convert from UTF-8 string to unicode
-        return Gtk.FileChooserDialog.get_filename(self) # pylint: disable=no-member
+        return Gtk.FileChooserDialog.get_filename(self)
+
 
 # dialogue used to search for text
 class NumericDialog(Gtk.Dialog):
@@ -138,12 +136,13 @@ def __init__(self, parent, title, text, val, lower, upper, step=1, page=0):
         vbox.pack_start(hbox, True, True, 0)
         hbox.show()
 
-        self.vbox.pack_start(vbox, False, False, 0) # pylint: disable=no-member
+        self.vbox.pack_start(vbox, False, False, 0)
         vbox.show()
 
     def button_cb(self, widget):
         self.response(Gtk.ResponseType.ACCEPT)
 
+
 # dialogue used to search for text
 class SearchDialog(Gtk.Dialog):
     def __init__(self, parent, pattern=None, history=None):
@@ -190,7 +189,7 @@ def __init__(self, parent, pattern=None, history=None):
         vbox.pack_start(button, False, False, 0)
         button.show()
 
-        self.vbox.pack_start(vbox, False, False, 0) # pylint: disable=no-member
+        self.vbox.pack_start(vbox, False, False, 0)
         vbox.show()
 
     # callback used when the Enter key is pressed