django-repositories/fabric
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add import for custom local settings

Browse source
This commit is contained in:
Ronny Abraham 2019-02-11 23:50:30 +02:00
parent 54654dbf4c
commit 0211723fe9
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/pip.py
View file

@ -5,8 +5,8 @@ import sys
import os import os
import logging import logging
from utils import virtualenv_source, virtualenv from .utils import virtualenv_source, virtualenv
from utils import print_console, printerr from .utils import print_console, printerr
ERROR_BAD_BRANCH_PARAM = -3 ERROR_BAD_BRANCH_PARAM = -3
ERROR_BAD_PARAM = -2 ERROR_BAD_PARAM = -2
@ -230,8 +230,8 @@ def copyto(branch):
configuration.virtualenv.requirements.local, configuration.virtualenv.requirements.local,
branch_config.virtualenv.requirements.filename) branch_config.virtualenv.requirements.filename)
print "current_local_path: %s" % current_local_path print("current_local_path: %s" % current_local_path)
print "branch_local_path: %s" % branch_local_path print("branch_local_path: %s" % branch_local_path)
message = "Copying file from current branch '{branch_src}' to " \ message = "Copying file from current branch '{branch_src}' to " \
"destination branch '{branch_dst}'. Continue? Y/n ".format( "destination branch '{branch_dst}'. Continue? Y/n ".format(

2
share/templates/conf/django/files/local.jinja2
View file

@ -134,3 +134,5 @@ LOGGING = {
} }
} }
# import this AFTER all the above
from {{ project_name }}._settings.{{ project_branch }}_custom import *

2
share/templates/conf/gunicorn/files/local.jinja2
View file

@ -134,3 +134,5 @@ LOGGING = {
} }
} }
# import this AFTER all the above
from {{ project_name }}._settings.{{ project_branch }}_custom import *