Merge pull request #30 from kaleidos/settings-move
Move settings to project repo root path.remotes/origin/enhancement/email-actions
commit
3294f9ca71
|
@ -9,7 +9,7 @@ install:
|
||||||
- pip install -r requirements.txt --use-mirrors
|
- pip install -r requirements.txt --use-mirrors
|
||||||
- pip install coveralls --use-mirrors
|
- pip install coveralls --use-mirrors
|
||||||
script:
|
script:
|
||||||
- coverage run --source=taiga --omit='*tests*,*commands*,*admin*,*.jinja,*dashboard*,*settings*,*wsgi*,*questions*,*documents*' manage.py test --settings=taiga.settings.travis taiga
|
- coverage run --source=taiga --omit='*tests*,*commands*,*admin*,*.jinja,*dashboard*,*settings*,*wsgi*,*questions*,*documents*' manage.py test --settings=settings.travis taiga
|
||||||
notifications:
|
notifications:
|
||||||
email:
|
email:
|
||||||
recipients:
|
recipients:
|
||||||
|
|
|
@ -3,7 +3,7 @@ import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "taiga.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
|
||||||
|
|
||||||
from django.core.management import execute_from_command_line
|
from django.core.management import execute_from_command_line
|
||||||
|
|
||||||
|
|
|
@ -310,5 +310,5 @@ if 'test' in sys.argv:
|
||||||
if "settings" not in ",".join(sys.argv):
|
if "settings" not in ",".join(sys.argv):
|
||||||
print ("\033[1;91mNot settings specified.\033[0m")
|
print ("\033[1;91mNot settings specified.\033[0m")
|
||||||
print ("Try: \033[1;33mpython manage.py test --settings="
|
print ("Try: \033[1;33mpython manage.py test --settings="
|
||||||
"taiga.settings.testing -v2 taiga\033[0m")
|
"settings.testing -v2 taiga\033[0m")
|
||||||
sys.exit(0)
|
sys.exit(0)
|
|
@ -19,7 +19,7 @@ import os
|
||||||
# if running multiple sites in the same mod_wsgi process. To fix this, use
|
# if running multiple sites in the same mod_wsgi process. To fix this, use
|
||||||
# mod_wsgi daemon mode with each site in its own daemon process, or use
|
# mod_wsgi daemon mode with each site in its own daemon process, or use
|
||||||
# os.environ["DJANGO_SETTINGS_MODULE"] = "taiga.settings"
|
# os.environ["DJANGO_SETTINGS_MODULE"] = "taiga.settings"
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "taiga.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
|
||||||
|
|
||||||
# This application object is used by any WSGI server configured to use this
|
# This application object is used by any WSGI server configured to use this
|
||||||
# file. This includes Django's development server, if the WSGI_APPLICATION
|
# file. This includes Django's development server, if the WSGI_APPLICATION
|
||||||
|
|
Loading…
Reference in New Issue