Update Django to 1.8 and DRF to 3.3, add new Django migrations, update serializers/pagination/metadata, update browsable API styling.

awx/settings/defaults.py

@@ -18,6 +18,15 @@ for setting in dir(global_settings):
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
+def is_testing(argv=None):
+    '''Return True if running django or py.test unit tests.'''
+    argv = sys.argv if argv is None else argv
+    if len(argv) >= 1 and ('py.test' in argv[0] or 'py/test.py' in argv[0]):
+        return True
+    elif len(argv) >= 2 and argv[1] == 'test':
+        return True
+    return False
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 SQL_DEBUG = DEBUG
@@ -32,9 +41,11 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'awx.sqlite3'),
-        # Test database cannot be :memory: for celery/inventory tests to work.
-        'TEST_NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
         'ATOMIC_REQUESTS': True,
+        'TEST': {
+            # Test database cannot be :memory: for celery/inventory tests.
+            'NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
+        },
     }
 }
 
@@ -170,7 +181,6 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.staticfiles',
-    'south',
     'rest_framework',
     'django_extensions',
     'djcelery',
@@ -188,9 +198,8 @@ INSTALLED_APPS = (
 INTERNAL_IPS = ('127.0.0.1',)
 
 REST_FRAMEWORK = {
-    'DEFAULT_PAGINATION_SERIALIZER_CLASS': 'awx.api.pagination.PaginationSerializer',
-    'PAGINATE_BY': 25,
-    'PAGINATE_BY_PARAM': 'page_size',
+    'DEFAULT_PAGINATION_CLASS': 'awx.api.pagination.Pagination',
+    'PAGE_SIZE': 25,
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'awx.api.authentication.TokenAuthentication',
         'rest_framework.authentication.BasicAuthentication',
@@ -213,6 +222,7 @@ REST_FRAMEWORK = {
         'rest_framework.renderers.JSONRenderer',
         'awx.api.renderers.BrowsableAPIRenderer',
     ),
+    'DEFAULT_METADATA_CLASS': 'awx.api.metadata.Metadata',
     'EXCEPTION_HANDLER': 'awx.api.views.api_exception_handler',
     'VIEW_NAME_FUNCTION': 'awx.api.generics.get_view_name',
     'VIEW_DESCRIPTION_FUNCTION': 'awx.api.generics.get_view_description',
@@ -309,8 +319,9 @@ DEBUG_TOOLBAR_CONFIG = {
 
 # Use Django-devserver if installed.
 try:
-    import devserver
-    INSTALLED_APPS += (devserver.__name__,)
+    import devserver # noqa
+    # FIXME: devserver has issues with Django 1.8?
+    # INSTALLED_APPS += (devserver.__name__,)
 except ImportError:
     pass
 
@@ -329,9 +340,6 @@ DEVSERVER_MODULES = (
 # Set default ports for live server tests.
 os.environ.setdefault('DJANGO_LIVE_TEST_SERVER_ADDRESS', 'localhost:9013-9199')
 
-# Skip migrations when running tests.
-SOUTH_TESTS_MIGRATE = False
-
 # Initialize Django-Celery.
 djcelery.setup_loader()
 

awx/settings/development.py

@@ -83,7 +83,8 @@ include(optional('/etc/tower/conf.d/*.py'), scope=locals())
 # only the defaults.
 try:
     include(optional('local_*.py'), scope=locals())
-    include('postprocess.py', scope=locals())
+    if not is_testing(sys.argv):
+        include('postprocess.py', scope=locals())
 except ImportError:
     traceback.print_exc()
     sys.exit(1)

awx/settings/local_settings.py.docker_compose

@@ -30,23 +30,18 @@ DATABASES = {
     }
 }
 
-def is_testing(argv):
-    if "py.test" in argv[0] or "py/test.py" in argv[0]:
-        return True
-    elif argv[1] == "test":
-        return True
-    return False
-
 # Use SQLite for unit tests instead of PostgreSQL.  If the lines below are
 # commented out, Django will create the test_awx-dev database in PostgreSQL to
 # run unit tests.
-if len(sys.argv) >= 2 and is_testing(sys.argv):
+if is_testing(sys.argv):
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.sqlite3',
             'NAME': os.path.join(BASE_DIR, 'awx.sqlite3'),
-            # Test database cannot be :memory: for celery/inventory tests.
-            'TEST_NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
+            'TEST': {
+                # Test database cannot be :memory: for celery/inventory tests.
+                'NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
+            },
         }
     }
     

awx/settings/local_settings.py.example

@@ -30,23 +30,18 @@ DATABASES = {
     }
 }
 
-def is_testing(argv):
-    if "py.test" in argv[0] or "py/test.py" in argv[0]:
-        return True
-    elif argv[1] == "test":
-        return True
-    return False
-
 # Use SQLite for unit tests instead of PostgreSQL.  If the lines below are
 # commented out, Django will create the test_awx-dev database in PostgreSQL to
 # run unit tests.
-if len(sys.argv) >= 2 and is_testing(sys.argv):
+if is_testing(sys.argv):
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.sqlite3',
             'NAME': os.path.join(BASE_DIR, 'awx.sqlite3'),
-            # Test database cannot be :memory: for celery/inventory tests.
-            'TEST_NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
+            'TEST': {
+                # Test database cannot be :memory: for celery/inventory tests.
+                'NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
+            },
         }
     }
     

awx/settings/production.py

@@ -21,9 +21,6 @@ SQL_DEBUG = DEBUG
 # Clear database settings to force production environment to define them.
 DATABASES = {}
 
-# Enable South to look for migrations in .pyc files.
-SOUTH_USE_PYC = True
-
 # Clear the secret key to force production environment to define it.
 SECRET_KEY = None