fixed typechecking and enabled on Travis

Author: ErikBjare

.travis.yml

@@ -27,12 +27,13 @@ before_install:
  - python -V
  - pip -V
  - pip3 install --upgrade pip
- - pip3 install pyinstaller
+ - pip3 install mypy pyinstaller
 
 install:
  - make build
 
 script:
+ - make typecheck
  - make test
  - make test-integration
  - make package

aw_qt/manager.py

@@ -5,7 +5,7 @@
 import logging
 import subprocess
 import shutil
-from typing import Optional, List
+from typing import Optional, List, Dict
 
 import aw_core
 
@@ -25,6 +25,7 @@ def _locate_bundled_executable(name: str) -> Optional[str]:
         if os.path.isfile(exec_path):
             # logger.debug("Found executable for {} in: {}".format(name, exec_path))
             return exec_path
+    return None
 
 
 def _is_system_module(name) -> bool:

aw_qt/trayicon.py

@@ -38,7 +38,7 @@ def open_dir(d):
 
 
 class TrayIcon(QSystemTrayIcon):
-    def __init__(self, manager: Manager, icon, parent=None, testing=False):
+    def __init__(self, manager: Manager, icon, parent=None, testing=False) -> None:
         QSystemTrayIcon.__init__(self, icon, parent)
         self.setToolTip("ActivityWatch" + (" (testing)" if testing else ""))
 
@@ -196,7 +196,3 @@ def run(manager, testing=False):
 
     # Run the application, blocks until quit
     return app.exec_()
-
-
-if __name__ == "__main__":
-    run()