Skip to content

Commit

Permalink
Merge pull request #1673 from AndreMiras/feature/tox_update_and_linte…
Browse files Browse the repository at this point in the history
…r_fixes

tox update and linter fixes
  • Loading branch information
inclement authored Feb 4, 2019
2 parents dec1bad + 757b7c0 commit 1e49255
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
7 changes: 1 addition & 6 deletions pythonforandroid/graph.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/android/src/android/runnable.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[tox]
envlist = pep8,py27,py3
basepython = python3

[testenv]
deps =
Expand All @@ -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

0 comments on commit 1e49255

Please sign in to comment.