Skip to content
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

Fixed garden install for newer virtualenvs #100

Merged
merged 1 commit into from
Apr 3, 2014
Merged

Fixed garden install for newer virtualenvs #100

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
6 changes: 3 additions & 3 deletions buildozer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ def _install_application_requirement(self, module):
self.cmd('curl http://python-distribute.org/distribute_setup.py | venv/bin/python', get_stdout=True, cwd=self.buildozer_dir)

self.debug('Install requirement {} in virtualenv'.format(module))
self.cmd('pip-2.7 install --download-cache={} --target={} {}'.format(
self.cmd('pip install --download-cache={} --target={} {}'.format(
self.global_cache_dir, self.applibs_dir, module),
env=self.env_venv,
cwd=self.buildozer_dir)
Expand All @@ -421,7 +421,7 @@ def check_garden_requirements(self):
return

self._ensure_virtualenv()
self.cmd('pip-2.7 install Kivy-Garden==0.1.1', env=self.env_venv)
self.cmd('pip install Kivy-Garden==0.1.1', env=self.env_venv)

# recreate gardenlibs
self.rmdir(self.gardenlibs_dir)
Expand All @@ -445,7 +445,7 @@ def _ensure_virtualenv(self):
return
self.venv = join(self.buildozer_dir, 'venv')
if not self.file_exists(self.venv):
self.cmd('virtualenv-2.7 --python=python2.7 ./venv',
self.cmd('virtualenv --python=python2.7 ./venv',
cwd=self.buildozer_dir)

# read virtualenv output and parse it
Expand Down