[settings] Moved the settings files to a subfolder to avoid conflict with pip install --editable and other tools

Author: paulocheque

.travis.yml

@@ -47,7 +47,6 @@ matrix:
       - DATABASE=_postgres
 
 before_script:
-  - export DJANGO_SETTINGS_MODULE=settings
   - export PYTHONPATH=$PYTHONPATH:$(pwd)
   # check gis
   - gdal-config --version
@@ -70,7 +69,7 @@ install:
   - pip install Django~=${DJANGO}.0
 
 script:
-  - pytest --create-db --reuse-db --no-migrations --ds=settings${DATABASE}
+  - pytest --create-db --reuse-db --no-migrations --ds=ddf_settings.settings${DATABASE}
 
 after_success:
   - coveralls

settings.py renamed to ddf_settings/settings.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 try:
-    import settings # Assumed to be in the same directory.
+    import ddf_settings.settings # Assumed to be in the same directory.
 except ImportError:
     import sys
     sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
     sys.exit(1)
 
 if __name__ == "__main__":
     import os
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ddf_settings.settings")
     from django.core.management import execute_from_command_line
     execute_from_command_line()

settings_mysql.py renamed to ddf_settings/settings_mysql.py

@@ -1,4 +1,4 @@
 [pytest]
-DJANGO_SETTINGS_MODULE = settings
+DJANGO_SETTINGS_MODULE = ddf_settings.settings
 addopts = --pyargs --create-db --reuse-db --no-migrations
 python_files = test_*.py