Skip to content

Fix a problem with the way we were calling virtualenv #2145

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

Closed
wants to merge 20 commits into from
Closed

Fix a problem with the way we were calling virtualenv #2145

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
06d0ee2
Update build.py
zurgeg Apr 20, 2020
22339a9
Update build.py
zurgeg Apr 20, 2020
5681738
Update build.py
zurgeg Apr 20, 2020
8e573f4
Update build.py
zurgeg Apr 20, 2020
44d9298
Update build.py
zurgeg Apr 20, 2020
f2a57f7
Update build.py
zurgeg Apr 21, 2020
14e811a
Update build.py
zurgeg Apr 21, 2020
77df9ee
Update build.py
zurgeg Apr 21, 2020
6ffeb09
Update build.py
zurgeg Apr 24, 2020
0955283
Update build.py
zurgeg Apr 24, 2020
7be35f1
Update build.py
zurgeg Apr 24, 2020
8e38c35
Update build.py
zurgeg Apr 24, 2020
e26fbbe
Update build.py
zurgeg Apr 24, 2020
0430edb
Update build.py
zurgeg Apr 24, 2020
c431d52
Update build.py
zurgeg Apr 24, 2020
cc69517
Update build.py
zurgeg Apr 24, 2020
a5fcde5
Update build.py
zurgeg Apr 24, 2020
ed68534
Update build.py
zurgeg Apr 25, 2020
8718430
Update build.py
zurgeg Apr 25, 2020
6375e04
Update build.py
zurgeg Apr 25, 2020
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
27 changes: 17 additions & 10 deletions pythonforandroid/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,17 +764,24 @@ def run_pymodules_install(ctx, modules, project_dir=None,
project_has_setup_py(project_dir) and not ignore_setup_py:
info('Will process project install, if it fails then the '
'project may not be compatible for Android install.')

venv = sh.Command(ctx.virtualenv)
venv = sh.Command('python3')
with current_directory(join(ctx.build_dir)):
shprint(venv,
'--python=python{}'.format(
ctx.python_recipe.major_minor_version_string.
partition(".")[0]
),
'venv'
)

try:
shprint(venv,
'-m venv'.format(
ctx.python_recipe.major_minor_version_string.
partition(".")[0]
),
'venv'
)
except sh.ErrorReturnCode_1:
shprint(venv,
'-m virtualenv'.format(
ctx.python_recipe.major_minor_version_string.
partition(".")[0]
),
'venv'
)
# Prepare base environment and upgrade pip:
base_env = copy.copy(os.environ)
base_env["PYTHONPATH"] = ctx.get_site_packages_dir()
Expand Down