From cd112af3a463e05d5cf983f09a8e92e9bd9965c5 Mon Sep 17 00:00:00 2001 From: Ronny Abraham Date: Tue, 10 Jan 2017 05:22:03 +0200 Subject: [PATCH] made changes to how pip gets deployed Changes to be committed: modified: modules/deploy.py modified: modules/pip.py --- modules/deploy.py | 7 ++----- modules/pip.py | 9 +++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/deploy.py b/modules/deploy.py index 609c45b..ffa72cc 100644 --- a/modules/deploy.py +++ b/modules/deploy.py @@ -8,8 +8,7 @@ from utils import virtualenv_source, booleanize, loggify from utils import print_console from pip import setup_virtualenv -from pip import setup as pip_requirements -from pip import upgrade as pip_upgrade +from pip import bootstrap_pip import os @@ -79,9 +78,7 @@ def bootstrap(): setup_rootpath() setup_virtualenv() - - pip_upgrade() # upgrade pip to latest version in the virtualenv - pip_requirements() + bootstrap_pip() # # link virtualenv to rootpath/private/virtualenv diff --git a/modules/pip.py b/modules/pip.py index e4b8f69..60e4b38 100644 --- a/modules/pip.py +++ b/modules/pip.py @@ -53,6 +53,15 @@ def setup_virtualenv(): run(mkvirtualenv_cmd) +@task +def bootstrap_pip(): + """ + bootstraps pip + """ + upgrade() + setup() + + @task def upgrade(): """