Skip to content

Made graph recognise python_depends #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inclement merged 1 commit into from
Aug 13, 2017
Merged

Made graph recognise python_depends #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pythonforandroid/graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,12 @@ def get_recipe_order_and_bootstrap(ctx, names, bs=None):
python_modules = []
for name in chosen_order:
try:
Recipe.get_recipe(name, ctx)
recipe = Recipe.get_recipe(name, ctx)
python_modules += recipe.python_depends
except IOError:
python_modules.append(name)
else:
recipes.append(name)

python_modules = list(set(python_modules))
return recipes, python_modules, bs
2 changes: 2 additions & 0 deletions pythonforandroid/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ def build_dist_from_args(ctx, dist, args):
bs.distribution = dist
info_notify('Dist will have name {} and recipes ({})'.format(
dist.name, ', '.join(dist.recipes)))
info('Dist will also contain modules ({}) installed from pip'.format(
', '.join(ctx.python_modules)))

ctx.dist_name = bs.distribution.name
ctx.prepare_bootstrap(bs)
Expand Down