Skip to content

Commit e48bc2a

Browse files
committed
Made graph recognise python_depends
1 parent 86b8280 commit e48bc2a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pythonforandroid/graph.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,12 @@ def get_recipe_order_and_bootstrap(ctx, names, bs=None):
161161
python_modules = []
162162
for name in chosen_order:
163163
try:
164-
Recipe.get_recipe(name, ctx)
164+
recipe = Recipe.get_recipe(name, ctx)
165+
python_modules += recipe.python_depends
165166
except IOError:
166167
python_modules.append(name)
167168
else:
168169
recipes.append(name)
169170

171+
python_modules = list(set(python_modules))
170172
return recipes, python_modules, bs

pythonforandroid/toolchain.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ def build_dist_from_args(ctx, dist, args):
182182
bs.distribution = dist
183183
info_notify('Dist will have name {} and recipes ({})'.format(
184184
dist.name, ', '.join(dist.recipes)))
185+
info('Dist will also contain modules ({}) installed from pip'.format(
186+
', '.join(ctx.python_modules)))
185187

186188
ctx.dist_name = bs.distribution.name
187189
ctx.prepare_bootstrap(bs)

0 commit comments

Comments
 (0)