From 4ee58649c86d9c4bd4ac89dd46325d0a1c443122 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Rekucki?= Date: Tue, 8 Jun 2010 12:04:42 +0200 Subject: [PATCH 1/1] Use the right version of PIP. --- deployment.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deployment.py b/deployment.py index 8f06d764..789d3425 100644 --- a/deployment.py +++ b/deployment.py @@ -25,6 +25,9 @@ class DeploySite(object): self.env['PYTHON_BIN'] = os.path.join( self.env['PYTHON_BASE'], 'bin', 'python') + self.env['PYTHON_VERSION'] + if 'PIP_BIN' not in self.env: + self.env['PIP_BIN'] = os.path.join(self.env['PYTHON_BASE'], 'bin', 'pip') + if 'PYTHON_SITE' not in self.env: self.env['PYTHON_SITE'] = os.path.join( self.env['PYTHON_BASE'], 'lib', @@ -113,11 +116,11 @@ class PIPSite(DeploySite): def install_dependencies(self): self.info("Installing requirements") - os.system("pip install -r %s" % self.find_resource('requirements.txt')) + os.system("%s install -r %s" % (self.env['PIP_BIN'], self.find_resource('requirements.txt'))) try: self.info("Installing local requirements") - os.system("pip install -r %s" % self.find_resource('requirements_local.txt')) + os.system("%s install -r %s" % (self.env['PIP_BIN'], self.find_resource('requirements_local.txt'))) except ValueError: pass -- 2.20.1