diff --git a/modules/pip.py b/modules/pip.py index 057302b..407ca8b 100644 --- a/modules/pip.py +++ b/modules/pip.py @@ -141,13 +141,16 @@ def freeze(param=False): @task -def copy(branch): +def copyto(branch): """ - copy requirements from the specified branch to the current branch + copy requirements from the current branch to the specified branch this only changes the requirements on the local branches. It does not upload remotely. This is because I want to use deploy.sync to do all remote updates + + Keyword Arguments: + branch -- the branch to copy to """ configuration = env.config @@ -161,11 +164,10 @@ def copy(branch): "values.".format(branch=branch, branchlist=branch_list), ERROR_BAD_BRANCH_PARAM) - elif configuration.project.branch == 'development': + elif branch == 'development': printerr( - "This method copies to current branch which is you set to " - "development. That is not allowed for sanity reasons.", + "This method does not allow copying to development branch", ERROR_BAD_BRANCH_PARAM) elif configuration.project.branch == branch: @@ -175,24 +177,10 @@ def copy(branch): "This will simply copy over \n\tthe requirements file for " "this branch with itself", ERROR_BAD_BRANCH_PARAM) - print "current: %s" % configuration.virtualenv.requirements.filepath - from initialize import get_config branch_config = get_config(branch) - print "current filepath: %s" % \ - configuration.virtualenv.requirements.filepath - print "current filename: %s" % \ - configuration.virtualenv.requirements.filename - - print - - print "branch filepath: %s" % \ - branch_config.virtualenv.requirements.filepath - print "branch filename: %s" % \ - branch_config.virtualenv.requirements.filename - current_local_path = os.path.join( configuration.virtualenv.requirements.local, configuration.virtualenv.requirements.filename) @@ -201,16 +189,22 @@ def copy(branch): configuration.virtualenv.requirements.local, branch_config.virtualenv.requirements.filename) - print "current_local : %s" % current_local_path - print "branch_local : %s" % branch_local_path + print "current_local_path: %s" % current_local_path + print "branch_local_path: %s" % branch_local_path - print - print - print - - message = "Copying file from branch {branch_src} to " \ - "branch {branch_dst}. Continue? Y/n ".format( - branch_src=branch, branch_dst=configuration.project.branch) + message = "Copying file from current branch '{branch_src}' to " \ + "destination branch '{branch_dst}'. Continue? Y/n ".format( + branch_src=configuration.project.branch, branch_dst=branch) from utils import prompt_continue prompt_continue(message=message) + + from utils import upload_template + upload_template( + filename=configuration.virtualenv.requirements.filename, + destination=branch_local_path, + context=None, + use_jinja=False, + use_sudo=False, + backup=True, + template_dir=configuration.virtualenv.requirements.local)