Moving to new project structure.

Author: Joe Stubbs

agave_clients/service/views.py

@@ -19,7 +19,7 @@
 from common.error import Error
 from common.responses import error_dict, success_dict, error_response, success_response
 
-from service.models import IdnOauthConsumerApps, AmApplicationKeyMapping
+from agave_clients.service.models import IdnOauthConsumerApps, AmApplicationKeyMapping
 
 
 

agave_clients/settings.py

@@ -6,9 +6,12 @@
 
 # sensitive settings:
 try:
-    from local_settings import *
+    from deployment_settings import *
 except:
-    pass
+    try:
+        from local_settings import *
+    except:
+        from local_settings_example import *
 
 # ---------------
 # AUTHENTICATION
@@ -150,7 +153,7 @@
 ROOT_URLCONF = 'agave_clients.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'wsgi.application'
+WSGI_APPLICATION = 'agave_clients.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -167,7 +170,7 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'service',
+    'agave_clients.service',
     'django.contrib.admin',
     'rest_framework',
     'corsheaders',
@@ -217,6 +220,9 @@
 
 # sensitive settings:
 try:
-    from local_settings import *
+    from deployment_settings import *
 except:
-    pass
+    try:
+        from local_settings import *
+    except:
+        from local_settings_example import *

agave_clients/wsgi.py

@@ -12,13 +12,6 @@
 
 """
 import os
-import sys
-HERE = os.path.dirname(os.path.realpath(__file__))
-for idx, p in enumerate(sys.path):
-    if p == HERE:
-        sys.path.pop(idx)
-
-sys.path.append(os.path.abspath(os.path.join(HERE,'..')))
 
 # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
 # if running multiple sites in the same mod_wsgi process. To fix this, use

agave_clients/manage.py manage.py

@@ -3,8 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    # sys.path.append(os.path.abspath(os.path.join(os.getcwd(),'..')))
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "agave_clients.settings")
 
     from django.core.management import execute_from_command_line