diff --git a/modules/pip.py b/modules/pip.py index d47e405..44e707e 100644 --- a/modules/pip.py +++ b/modules/pip.py @@ -5,8 +5,8 @@ import sys import os import logging -from utils import virtualenv_source, virtualenv -from utils import print_console, printerr +from .utils import virtualenv_source, virtualenv +from .utils import print_console, printerr ERROR_BAD_BRANCH_PARAM = -3 ERROR_BAD_PARAM = -2 @@ -230,8 +230,8 @@ def copyto(branch): configuration.virtualenv.requirements.local, branch_config.virtualenv.requirements.filename) - print "current_local_path: %s" % current_local_path - print "branch_local_path: %s" % branch_local_path + print("current_local_path: %s" % current_local_path) + print("branch_local_path: %s" % branch_local_path) message = "Copying file from current branch '{branch_src}' to " \ "destination branch '{branch_dst}'. Continue? Y/n ".format( diff --git a/share/templates/conf/django/files/local.jinja2 b/share/templates/conf/django/files/local.jinja2 index e28f538..a05d2fe 100644 --- a/share/templates/conf/django/files/local.jinja2 +++ b/share/templates/conf/django/files/local.jinja2 @@ -134,3 +134,5 @@ LOGGING = { } } +# import this AFTER all the above +from {{ project_name }}._settings.{{ project_branch }}_custom import * diff --git a/share/templates/conf/gunicorn/files/local.jinja2 b/share/templates/conf/gunicorn/files/local.jinja2 index e28f538..a05d2fe 100644 --- a/share/templates/conf/gunicorn/files/local.jinja2 +++ b/share/templates/conf/gunicorn/files/local.jinja2 @@ -134,3 +134,5 @@ LOGGING = { } } +# import this AFTER all the above +from {{ project_name }}._settings.{{ project_branch }}_custom import *