Merge branch 'update-requirements'

Update ALL external requirements to current stable.

circle/circle/settings/test.py

-from base import *  # noqa
+from .base import *  # noqa
 
 
-########## TEST SETTINGS
-TEST_RUNNER = 'discover_runner.DiscoverRunner'
-TEST_DISCOVER_TOP_LEVEL = SITE_ROOT
-TEST_DISCOVER_ROOT = SITE_ROOT
-TEST_DISCOVER_PATTERN = "test_*.py"
 ########## IN-MEMORY TEST DATABASE
 ########## IN-MEMORY TEST DATABASE
 DATABASES = {
 DATABASES = {
     "default": {
     "default": {
@@ -21,7 +16,6 @@ SOUTH_TESTS_MIGRATE = False
 
 
 INSTALLED_APPS += (
 INSTALLED_APPS += (
     'acl.tests',
     'acl.tests',
-    'django_nose',
 )
 )
 
 
 CACHES = {
 CACHES = {

circle/dashboard/tests/test_views.py

@@ -4,7 +4,6 @@ from unittest import skip
 from django.test import TestCase
 from django.test import TestCase
 from django.test.client import Client
 from django.test.client import Client
 from django.contrib.auth.models import User, Group
 from django.contrib.auth.models import User, Group
-from django.core.exceptions import SuspiciousOperation
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import Permission
 from django.contrib.auth.models import Permission
 from django.contrib.auth import authenticate
 from django.contrib.auth import authenticate
@@ -897,8 +896,8 @@ class TransferOwnershipViewTest(LoginMixin, TestCase):
         c2 = self.u2.notification_set.count()
         c2 = self.u2.notification_set.count()
         c = Client()
         c = Client()
         self.login(c, 'user2')
         self.login(c, 'user2')
-        with self.assertRaises(SuspiciousOperation):
-            c.post('/dashboard/vm/1/tx/')
+        response = c.post('/dashboard/vm/1/tx/')
+        assert response.status_code == 400
         self.assertEqual(self.u2.notification_set.count(), c2)
         self.assertEqual(self.u2.notification_set.count(), c2)
 
 
     def test_owned_offer(self):
     def test_owned_offer(self):

circle/dashboard/views.py

@@ -30,9 +30,8 @@ from django.template import RequestContext
 
 
 from django.forms.models import inlineformset_factory
 from django.forms.models import inlineformset_factory
 from django_tables2 import SingleTableView
 from django_tables2 import SingleTableView
-from braces.views import (
-    LoginRequiredMixin, SuperuserRequiredMixin, AccessMixin
-)
+from braces.views import LoginRequiredMixin, SuperuserRequiredMixin
+from braces.views._access import AccessMixin
 
 
 from .forms import (
 from .forms import (
     CircleAuthenticationForm, DiskAddForm, HostForm, LeaseForm, MyProfileForm,
     CircleAuthenticationForm, DiskAddForm, HostForm, LeaseForm, MyProfileForm,
@@ -504,6 +503,7 @@ class OperationView(DetailView):
 class VmOperationView(OperationView):
 class VmOperationView(OperationView):
 
 
     model = Instance
     model = Instance
+    context_object_name = 'instance'  # much simpler to mock object
 
 
 
 
 class VmMigrateView(VmOperationView):
 class VmMigrateView(VmOperationView):
@@ -2274,6 +2274,7 @@ def get_disk_download_status(request, pk):
 
 
 class InstanceActivityDetail(SuperuserRequiredMixin, DetailView):
 class InstanceActivityDetail(SuperuserRequiredMixin, DetailView):
     model = InstanceActivity
     model = InstanceActivity
+    context_object_name = 'instanceactivity'  # much simpler to mock object
     template_name = 'dashboard/instanceactivity_detail.html'
     template_name = 'dashboard/instanceactivity_detail.html'
 
 
     def get_context_data(self, **kwargs):
     def get_context_data(self, **kwargs):

requirements.txt

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

requirements/base.txt

-Django==1.5.6
+amqp==1.4.5
+anyjson==0.3.3
+billiard==3.3.0.17
 bpython==0.12
 bpython==0.12
 celery==3.1.11
 celery==3.1.11
-django-braces==1.2.2
+django-braces==1.4.0
 django-celery==3.1.10
 django-celery==3.1.10
 django-crispy-forms==1.4.0
 django-crispy-forms==1.4.0
-django-model-utils==1.4.0
+django-model-utils==2.0.3
 django-sizefield==0.4
 django-sizefield==0.4
-django-tables2==0.14.0
-django-taggit==0.11.2
+django-tables2==0.15.0
+django-taggit==0.12
+Django==1.6.3
+docutils==0.11
+Jinja2==2.7.2
+kombu==3.0.15
 logutils==0.3.3
 logutils==0.3.3
-netaddr==0.7.10
+MarkupSafe==0.21
+netaddr==0.7.11
+nose==1.3.1
+pip-tools==0.3.4
+psycopg2==2.5.2
+Pygments==1.6
+pylibmc==1.3.0
+python-dateutil==2.2
+pytz==2014.2
 requests==2.2.1
 requests==2.2.1
-South==0.8.1
-psycopg2==2.5.1
-pylibmc
+simplejson==3.4.0
+six==1.6.1
+South==0.8.4
+sqlparse==0.1.11

requirements/local.txt

 # Local development dependencies go here
 # Local development dependencies go here
 -r base.txt
 -r base.txt
-coverage==3.6
-django-discover-runner==0.4
-django-debug-toolbar==0.9.4
-Sphinx==1.2b1
+coverage==3.7.1
+django-debug-toolbar==1.1
+Sphinx==1.2.2

requirements/production.txt

 # Pro-tip: Try not to put anything here. There should be no dependency in
 # Pro-tip: Try not to put anything here. There should be no dependency in
-#	production that isn't in development.
+# production that isn't in development.
 -r base.txt
 -r base.txt
-
-gunicorn==0.17.4
-uWSGI==2.0.3
+uWSGI==2.0.4

requirements/test.txt

 # Test dependencies go here.
 # Test dependencies go here.
 -r base.txt
 -r base.txt
-coverage==3.6
-django-discover-runner==0.4
-django-nose==1.2
-mock==1.0.1
+coverage==3.7.1
 factory-boy==2.3.1
 factory-boy==2.3.1
+mock==1.0.1