Merge pull request kivy#1673 from AndreMiras/feature/tox_update_and_linter_fixes

inclement · web-flow · commit 1e49255cfc34 · 2019-02-04T00:24:13.000Z
tox update and linter fixes
diff --git a/pythonforandroid/graph.py b/pythonforandroid/graph.py
@@ -1,7 +1,7 @@
 from copy import deepcopy
 from itertools import product
 
-from pythonforandroid.logger import (info, warning)
+from pythonforandroid.logger import info
 from pythonforandroid.recipe import Recipe
 from pythonforandroid.bootstrap import Bootstrap
 from pythonforandroid.util import BuildInterruptingException
@@ -126,11 +126,6 @@ def get_recipe_order_and_bootstrap(ctx, names, bs=None):
             info('Circular dependency found in graph {}, skipping it.'.format(
                 possible_order))
             continue
-        except:
-            warning('Failed to import recipe named {}; the recipe exists '
-                    'but appears broken.'.format(name))
-            warning('Exception was:')
-            raise
         orders.append(list(order))
 
     # prefer python2 and SDL2 if available
diff --git a/pythonforandroid/recipes/android/src/android/runnable.py b/pythonforandroid/recipes/android/src/android/runnable.py
@@ -33,7 +33,7 @@ def __call__(self, *args, **kwargs):
     def run(self):
         try:
             self.func(*self.args, **self.kwargs)
-        except:
+        except:  # noqa E722
             import traceback
             traceback.print_exc()
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
 envlist = pep8,py27,py3
+basepython = python3
 
 [testenv]
 deps =
@@ -17,6 +18,6 @@ commands = flake8 pythonforandroid/ tests/ ci/
 ignore =
     E123, E124, E126,
     E226,
-    E402, E501, E722,
-    F812, F841, W503,
+    E402, E501,
+    F841, W503,
     W504
