Merge lp:~cjwatson/isitdeployable/django-1.8 into lp:isitdeployable

[Colin Watson]

Upgrade to Django 1.8.

[lp:~cjwatson/isitdeployable/django-1.8]

274. By Colin Watson on 2018-01-29

Upgrade to Django 1.8.

[Daniel Manrique (roadmr)]

Wow was this really all that was needed? (other than the prereq branches you've already taken care of) How about lingering deprecation warnings? Did it behave properly while manual-testing? (I know the deployable test suite is not super thorough).

LGTM, I do recall the main sticking point was the django_comments thing but that seems to be solved here.

Also, I don't see updates to https://code.launchpad.net/~ubuntuone-hackers/isitdeployable-dependencies/trunk, I don't recall the situation here because we're now building a docker image and I don't remember if we still use that dependencies branch with wheels. Just curious; the need for updating that branch will be apparent if the docker image fails to build :)

In any case, +1, since this looks good in general, I have a couple of comments but they shouldn't be blocking.

review: Approve

[Colin Watson (cjwatson)]

There are some deprecation warnings for 1.9 now, but those can be handled in a later step. I've done some manual experimentation and the site seems to be behaving itself: I was able to create a project in the admin view, wait for the worker to scan it, see my pending QA, mark revisions as good/bad, create deployment requests, and mark deployment requests as deployed.

Oops, sorry about forgetting dependencies - I only had them locally. I've pushed an MP for that now (https://code.launchpad.net/~cjwatson/isitdeployable-dependencies/django-1.8/+merge/336790).

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2017-08-25 18:25:11 +0000
+++ django_project/settings_base.py	2018-01-29 15:34:29 +0000
@@ -49,9 +49,9 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django.contrib.comments',
     'django.contrib.admin',
     'devserver',
+    'django_comments',
     'django_openid_auth',
     'djcelery',
     'revtracker',
@@ -142,12 +142,6 @@
 USE_I18N = True
 USE_L10N = True
 
-# debug-toolbar settings
-
-DEBUG_TOOLBAR_CONFIG = {
-    'INTERCEPT_REDIRECTS': False,
-}
-
 # celery settings
 
 CELERY_BROKER_URL = os.getenv('CELERY_BROKER_URL', 'amqp://')

=== modified file 'requirements.txt'
--- requirements.txt	2018-01-29 15:34:29 +0000
+++ requirements.txt	2018-01-29 15:34:29 +0000
@@ -7,15 +7,15 @@
 bson==0.3.3
 celery==3.1.23
 convoy==0.2.4
-Django==1.7.11
+Django==1.8.18
 django-celery==3.1.17
-django-debug-toolbar==0.10.0
+django-contrib-comments==1.8.0
+django-debug-toolbar==1.9.1
 django-devserver==0.7.0
 django-getenv==1.3.1
 django-kombu==0.9.4
 django-openid-auth==0.9
-# A checkout of https://github.com/bfirsh/django-ordered-model at 2998740eeda348473d8a8965b40b2292c31efd85
-django-ordered-model==0.3.0.jw1
+django-ordered-model==1.1.0
 django-picklefield==0.2.1
 django-pgtools==0.2
 django-waffle==0.10.1

=== modified file 'revtracker/data.py'
--- revtracker/data.py	2018-01-29 15:34:29 +0000
+++ revtracker/data.py	2018-01-29 15:34:29 +0000
@@ -9,12 +9,10 @@
 #
 # What's the best interface to get that info in the fewest queries?
 
-import operator
-
 from django.core.urlresolvers import reverse
-from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import F
+from django_comments.models import Comment
 
 from .models import (
     DeploymentRequest,

=== modified file 'revtracker/tests/factory.py'
--- revtracker/tests/factory.py	2018-01-29 15:34:29 +0000
+++ revtracker/tests/factory.py	2018-01-29 15:34:29 +0000
@@ -6,9 +6,9 @@
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
-from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
+from django_comments.models import Comment
 
 from revtracker.models import (
     DeploymentRequest,

=== modified file 'revtracker/tests/test_views.py'
--- revtracker/tests/test_views.py	2018-01-29 15:34:29 +0000
+++ revtracker/tests/test_views.py	2018-01-29 15:34:29 +0000
@@ -48,7 +48,7 @@
     def test_query_count(self):
         project = self.factory.make_project()
         self.factory.make_revision(project=project, status=Revision.STATUS_OK)
-        self.assertNumQueries(4, views.index_data)
+        self.assertNumQueries(5, views.index_data)
 
     def test_query_count_multiple(self):
         project = self.factory.make_project()
@@ -56,7 +56,7 @@
         project = self.factory.make_project()
         self.factory.make_revision(project=project, status=Revision.STATUS_OK)
         # FIXME: O(projects)
-        self.assertNumQueries(7, views.index_data)
+        self.assertNumQueries(8, views.index_data)
 
 
 class GetProjectInfoTests(TestCase):

=== modified file 'revtracker/urls.py'
--- revtracker/urls.py	2014-03-27 18:22:19 +0000
+++ revtracker/urls.py	2018-01-29 15:34:29 +0000
@@ -1,5 +1,5 @@
 from django.conf.urls import patterns, include, url
-from django.contrib.comments import urls as comments_urls
+from django_comments import urls as comments_urls
 
 api_v1_urls = patterns('revtracker.views',
     url(r'^project/(?P<project_name>[\w\-]+)$', 'api_v1_project'),

=== modified file 'revtracker/views.py'
--- revtracker/views.py	2018-01-29 15:34:29 +0000
+++ revtracker/views.py	2018-01-29 15:34:29 +0000
@@ -5,7 +5,6 @@
 from checklist import data as checklist_data
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.contrib.comments.forms import CommentForm
 from django.core.urlresolvers import reverse
 from django.http import (
     Http404,
@@ -20,6 +19,7 @@
     require_GET,
     require_POST,
     )
+from django_comments.forms import CommentForm
 import waffle
 from waffle.decorators import waffle_flag
 
@@ -185,7 +185,7 @@
 
 
 def index_data():
-    projects = Project.objects.all().select_related('revision_set')
+    projects = Project.objects.all().prefetch_related('revision_set')
     info = dict()
     info['projects'] = [index_project_to_info(project) for project in projects]
     return info
@@ -224,7 +224,7 @@
 
 def get_project(name):
     try:
-        return Project.objects.filter(name__exact=name).select_related('revision_set', 'deployed_revision').get()
+        return Project.objects.filter(name__exact=name).select_related('deployed_revision').prefetch_related('revision_set').get()
     except Project.DoesNotExist:
         raise Http404('No such project: %s' % str(name))
 

=== modified file 'setup.py'
--- setup.py	2018-01-29 15:34:29 +0000
+++ setup.py	2018-01-29 15:34:29 +0000
@@ -7,9 +7,10 @@
     author_email="[e-mail]",
     license="AGPL3",
     install_requires=[
-        'Django==1.5.1',
+        'Django>=1.8',
         'soupmatchers==0.2',
         'testtools',
+        'django-contrib-comments',
         'django_openid_auth',
         'celery',
         'django-celery',