Cleanup requirements and settings.

Minor cleanup of django settings files and python requirements.

Change-Id: I1fb1b83960601b0ed50bcca4925a80a9cfb30d64

analyticsdataserver/settings/local.py

@@ -3,7 +3,7 @@
 
 from os.path import join, normpath
 
-from base import *
+from analyticsdataserver.settings.base import *
 
 
 ########## DEBUG CONFIGURATION

analyticsdataserver/logsettings.py → analyticsdataserver/settings/logger.py

@@ -1,3 +1,5 @@
+"""Logging configuration"""
+
 import os
 import platform
 import sys

analyticsdataserver/settings/production.py

@@ -1,15 +1,15 @@
 """Production settings and globals."""
 
-
 from os import environ
-from base import *
-import yaml
-from analyticsdataserver.logsettings import get_logger_config
 
 # Normally you should not import ANYTHING from Django directly
 # into your settings, but ImproperlyConfigured is an exception.
 from django.core.exceptions import ImproperlyConfigured
 
+import yaml
+
+from analyticsdataserver.settings.base import *
+from analyticsdataserver.settings.logger import get_logger_config
 
 LOGGING = get_logger_config()
 

analyticsdataserver/settings/test.py

@@ -1,4 +1,6 @@
-from base import *
+"""Test settings and globals."""
+
+from analyticsdataserver.settings.base import *
 
 ########## IN-MEMORY TEST DATABASE
 DATABASES = {

requirements.txt

@@ -0,0 +1,3 @@
+# This file is here because many Platforms as a Service look for
+#       requirements.txt in the root directory of a project.
+-r requirements/production.txt

requirements/base.txt

@@ -1,6 +1,6 @@
 Django==1.4.12
-django-model-utils==1.4.0
+Markdown==2.4.1
 South==0.8.1
+django-model-utils==1.4.0
 djangorestframework==2.3.5
-Markdown==2.4.1
 ipython==2.1.0

requirements/doc.txt

@@ -0,0 +1,3 @@
+# Dependencies for building documentation
+-r base.txt
+Sphinx==1.2.1

requirements/local.txt

@@ -2,4 +2,3 @@
 -r base.txt
 -r test.txt
 django-debug-toolbar==0.9.4
-Sphinx==1.2b1

requirements/production.txt

@@ -2,7 +2,7 @@
 #	production that isn't in development.
 -r base.txt
 
-gunicorn==0.17.4
 MySQL-python==1.2.5
-path.py==5.2
 PyYAML==3.11
+gunicorn==0.17.4
+path.py==5.2

requirements/test.txt

@@ -1,13 +1,13 @@
 # Test dependencies go here.
 -r base.txt
 coverage==3.7
-nose==1.3.3
-django-nose==1.2
-pep8==1.5.7
-pylint==1.2.1
 diff-cover >= 0.2.1
+django-nose==1.2
+httpretty==0.8.0
 mock==1.0.1
+nose==1.3.3
 pep257==0.3.2
-httpretty==0.8.0
-requests==2.3.0
+pep8==1.5.7
+pylint==1.2.1
 pytz==2012h
+requests==2.3.0