[settings] Moved settings to the root dir again. Avoid common setting.py name

Author: paulocheque

.travis.yml

@@ -21,30 +21,34 @@ matrix:
   - python: 2.7
     env:
       - DJANGO=1.11
+      - DATABASE=sqlite
   - python: 2.7
     env:
       - DJANGO=1.11
-      - DATABASE=_postgres
+      - DATABASE=postgres
   # https://docs.djangoproject.com/en/2.2/ref/contrib/gis/install/
   - python: 3.6
     env:
       - DJANGO=2.2
+      - DATABASE=sqlite
   - python: 3.6
     env:
       - DJANGO=2.2
-      - DATABASE=_postgres
+      - DATABASE=postgres
   # https://docs.djangoproject.com/en/3.0/ref/contrib/gis/install/
   # https://docs.djangoproject.com/en/3.0/releases/3.0/#id2
   - python: 3.7
     env:
       - DJANGO=3.0
+      - DATABASE=sqlite
   - python: 3.8
     env:
       - DJANGO=3.0
+      - DATABASE=sqlite
   - python: 3.8
     env:
       - DJANGO=3.0
-      - DATABASE=_postgres
+      - DATABASE=postgres
 
 before_script:
   - export PYTHONPATH=$PYTHONPATH:$(pwd)
@@ -69,7 +73,7 @@ install:
   - pip install Django~=${DJANGO}.0
 
 script:
-  - pytest --create-db --reuse-db --no-migrations --ds=ddf_settings.settings${DATABASE}
+  - pytest --create-db --reuse-db --no-migrations --ds=settings_${DATABASE}
 
 after_success:
   - coveralls

manage.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 try:
-    import ddf_settings.settings # Assumed to be in the same directory.
+    import settings_sqlite # 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", "ddf_settings.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings_sqlite")
     from django.core.management import execute_from_command_line
     execute_from_command_line()

pytest.ini

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

ddf_settings/settings.py renamed to settings_ddf.py

@@ -6,19 +6,6 @@
 
 IMPORT_DDF_MODELS = True
 
-DDF_TEST_GEODJANGO = False
-
-# SQlite and SpatialLite
-# brew install spatialite-tools
-# brew install gdal
-SPATIALITE_LIBRARY_PATH = '/usr/local/lib/mod_spatialite.dylib'
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ':memory:',
-    }
-}
-
 SECRET_KEY = 'ddf-secret-key'
 
 ALLOWED_HOSTS = ['*'] # Since Django 1.11, it is verified when running tests

ddf_settings/settings_mysql.py renamed to settings_mysql.py

@@ -1,4 +1,4 @@
-from settings import *
+from settings_ddf import *
 
 DDF_TEST_GEODJANGO = True
 

ddf_settings/settings_postgres.py renamed to settings_postgres.py

@@ -1,4 +1,4 @@
-from settings import *
+from settings_ddf import *
 
 DDF_TEST_GEODJANGO = True
 

settings_sqlite.py

@@ -0,0 +1,15 @@
+from settings_ddf import *
+
+DDF_TEST_GEODJANGO = False
+
+# SQlite and SpatialLite
+# brew install spatialite-tools
+# brew install gdal
+SPATIALITE_LIBRARY_PATH = '/usr/local/lib/mod_spatialite.dylib'
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ':memory:',
+    }
+}
+