Updated to Django 1.6.

deis · Nov 27, 2013 · 25a1f6f · 25a1f6f
1 parent 42f2790
commit 25a1f6f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/api/models.py b/api/models.py
@@ -83,7 +83,6 @@ def delete(self, *args, **kwargs):
         self.owner.publish()
 
 
-@python_2_unicode_compatible
 class ProviderManager(models.Manager):
     """Manage database interactions for :class:`Provider`."""
 
@@ -126,7 +125,6 @@ def __str__(self):
         return "{}-{}".format(self.id, self.get_type_display())
 
 
-@python_2_unicode_compatible
 class FlavorManager(models.Manager):
     """Manage database interactions for :class:`Flavor`."""
 
@@ -292,7 +290,6 @@ def destroy(self):
         return tasks.destroy_layer.delay(self).wait()
 
 
-@python_2_unicode_compatible
 class NodeManager(models.Manager):
 
     def new(self, formation, layer, fqdn=None):
@@ -537,7 +534,6 @@ def run(self, command):
         return node.run(command)
 
 
-@python_2_unicode_compatible
 class ContainerManager(models.Manager):
 
     def scale(self, app, structure, **kwargs):
@@ -733,7 +729,7 @@ def push(cls, push):
         # create the build
         new_build = cls.objects.create(**push)
         # send a release signal
-        release_signal.send(sender=push, build=new_build, app=app, user=user)
+        release_signal.send(sender=user, build=new_build, app=app, user=user)
         # see if we need to scale an initial web container
         if len(app.formation.node_set.filter(layer__runtime=True)) > 0 and \
            len(app.container_set.filter(type='web')) < 1:

diff --git a/deis/settings.py b/deis/settings.py
@@ -29,6 +29,8 @@
     }
 }
 
+CONN_MAX_AGE = 60 * 3
+
 # Hosts/domain names that are valid for this site; required if DEBUG is False
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = ['localhost']

diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -1,12 +1,12 @@
 # Deis controller requirements
 boto==2.16.0
 celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
-Django==1.5.5
-django-allauth==0.14.1
+Django==1.6.0
+django-allauth==0.14.2
 django-celery==3.0.23
 django-json-field==0.5.5
 django-yamlfield==0.5
-djangorestframework==2.3.8
+djangorestframework==2.3.9
 dop==0.1.4
 gevent==1.0
 gunicorn==18.0
@@ -15,7 +15,7 @@ psycopg2==2.5.1
 pycrypto==2.6.1
 pyrax==1.6.1
 PyYAML==3.10
-South==0.8.2
+South==0.8.4
 
 # Deis client requirements
 docopt==0.6.1

diff --git a/docs/conf.py b/docs/conf.py
@@ -20,12 +20,10 @@
 #sys.path.insert(0, os.path.abspath('.'))
 sys.path.insert(0, os.path.abspath('..'))
 # set up Django
-from deis import settings
-from django.core.management import setup_environ
-
+os.environ['DJANGO_SETTINGS_MODULE'] = 'deis.settings'
+from django.conf import settings
 if not settings.SECRET_KEY:
     settings.SECRET_KEY = 'TotallyFake-SECRET_KEY-ForSphinxDocs'
-setup_environ(settings)
 
 # -- General configuration -----------------------------------------------------
 

diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -1,10 +1,10 @@
 # Deis requirements for Sphinx documentation generation
 boto==2.16.0
 celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
-Django==1.5.5
+Django==1.6.0
 django-celery==3.0.23
 django-json-field==0.5.5
-djangorestframework==2.3.8
+djangorestframework==2.3.9
 dop==0.1.4
 paramiko==1.12.0
 pyrax==1.6.1

diff --git a/requirements.txt b/requirements.txt
@@ -1,12 +1,12 @@
 # Deis controller requirements
 boto==2.16.0
 celery==3.0.22  # 3.0.23 errors, see https://github.com/opdemand/deis/issues/148
-Django==1.5.5
-django-allauth==0.14.1
+Django==1.6.0
+django-allauth==0.14.2
 django-celery==3.0.23
 django-json-field==0.5.5
 django-yamlfield==0.5
-djangorestframework==2.3.8
+djangorestframework==2.3.9
 dop==0.1.4
 gevent==1.0
 gunicorn==18.0
@@ -15,4 +15,4 @@ psycopg2==2.5.1
 pycrypto==2.6.1
 pyrax==1.6.1
 PyYAML==3.10
-South==0.8.2
+South==0.8.4