diff --git a/.travis.yml b/.travis.yml index 16b52930..41eac8b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - pip install -r requirements.txt --use-mirrors - pip install coveralls --use-mirrors 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: email: recipients: diff --git a/manage.py b/manage.py index 605f691a..f9726f9e 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import os import sys 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 diff --git a/taiga/settings/__init__.py b/settings/__init__.py similarity index 100% rename from taiga/settings/__init__.py rename to settings/__init__.py diff --git a/taiga/settings/common.py b/settings/common.py similarity index 99% rename from taiga/settings/common.py rename to settings/common.py index 02e40021..8138debc 100644 --- a/taiga/settings/common.py +++ b/settings/common.py @@ -310,5 +310,5 @@ if 'test' in sys.argv: if "settings" not in ",".join(sys.argv): print ("\033[1;91mNot settings specified.\033[0m") 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) diff --git a/taiga/settings/development.py b/settings/development.py similarity index 100% rename from taiga/settings/development.py rename to settings/development.py diff --git a/taiga/settings/local.py.example b/settings/local.py.example similarity index 100% rename from taiga/settings/local.py.example rename to settings/local.py.example diff --git a/taiga/settings/production.py b/settings/production.py similarity index 100% rename from taiga/settings/production.py rename to settings/production.py diff --git a/taiga/settings/testing.py b/settings/testing.py similarity index 100% rename from taiga/settings/testing.py rename to settings/testing.py diff --git a/taiga/settings/travis.py b/settings/travis.py similarity index 100% rename from taiga/settings/travis.py rename to settings/travis.py diff --git a/taiga/wsgi.py b/taiga/wsgi.py index 9cc7cbed..ada27df2 100644 --- a/taiga/wsgi.py +++ b/taiga/wsgi.py @@ -19,7 +19,7 @@ import os # 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 # 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 # file. This includes Django's development server, if the WSGI_APPLICATION