refactor wip

.coveragerc

@@ -3,8 +3,6 @@ omit =
     */venv/*
     */virtualenv/*
     api/__init__.py
-    celerytasks/__init__.py
-    celerytasks/models.py
     client/__init__.py
     client/models.py
     client/tests/__init__.py

Makefile

@@ -6,10 +6,10 @@ db:
 	python manage.py migrate
 
 test:
-	python manage.py test api celerytasks client web
+	python manage.py test api client cm provider web
 
 coverage:
-	coverage run manage.py test api celerytasks client web
+	coverage run manage.py test api client cm provider web
 	coverage html
 
 flake8:

api/admin.py

@@ -26,8 +26,8 @@ class BuildAdmin(admin.ModelAdmin):
     in the Django admin.
     """
     date_hierarchy = 'created'
-    list_display = ('sha', 'owner', 'formation')
-    list_filter = ('owner', 'formation')
+    list_display = ('sha', 'owner', 'app')
+    list_filter = ('owner', 'app')
 admin.site.register(Build, BuildAdmin)
 
 
@@ -36,18 +36,28 @@ class ConfigAdmin(admin.ModelAdmin):
     in the Django admin.
     """
     date_hierarchy = 'created'
-    list_display = ('version', 'owner', 'formation')
-    list_filter = ('owner', 'formation')
+    list_display = ('version', 'owner', 'app')
+    list_filter = ('owner', 'app')
 admin.site.register(Config, ConfigAdmin)
 
 
+class ReleaseAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Release` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('owner', 'app', 'version')
+    list_filter = ('owner', 'app')
+admin.site.register(Release, ReleaseAdmin)
+
+
 class ContainerAdmin(admin.ModelAdmin):
     """Set presentation options for :class:`~api.models.Container` models
     in the Django admin.
     """
     date_hierarchy = 'created'
-    list_display = ('short_name', 'owner', 'formation', 'status')
-    list_filter = ('owner', 'formation', 'status')
+    list_display = ('short_name', 'owner', 'formation', 'app', 'status')
+    list_filter = ('owner', 'formation', 'app', 'status')
 admin.site.register(Container, ContainerAdmin)
 
 
@@ -86,7 +96,7 @@ class LayerAdmin(admin.ModelAdmin):
     in the Django admin.
     """
     date_hierarchy = 'created'
-    list_display = ('id', 'owner', 'formation', 'flavor', 'level', 'run_list')
+    list_display = ('id', 'owner', 'formation', 'flavor', 'proxy', 'runtime', 'config')
     list_filter = ('owner', 'formation', 'flavor')
 admin.site.register(Layer, LayerAdmin)
 
@@ -109,13 +119,3 @@ class ProviderAdmin(admin.ModelAdmin):
     list_display = ('id', 'owner', 'type')
     list_filter = ('owner', 'type')
 admin.site.register(Provider, ProviderAdmin)
-
-
-class ReleaseAdmin(admin.ModelAdmin):
-    """Set presentation options for :class:`~api.models.Release` models
-    in the Django admin.
-    """
-    date_hierarchy = 'created'
-    list_display = ('owner', 'formation', 'version')
-    list_filter = ('owner', 'formation')
-admin.site.register(Release, ReleaseAdmin)