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

[Colin Watson]

Upgrade to Django 1.11.

I seem to be on a roll, so let's keep going (but I think this is probably about it for now). This was straightforward enough that I decided to go all the way to the next Django LTS. I've done the usual manual testing of behaviour with both bzr and git projects, as well as ensuring that "make docker-test" passes.

Requires https://code.launchpad.net/~cjwatson/isitdeployable-dependencies/django-1.11/+merge/336881.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

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

285. By Colin Watson on 2018-01-31

Merge trunk.

=== modified file 'Makefile.db'
--- Makefile.db	2017-09-08 12:27:04 +0000
+++ Makefile.db	2018-01-31 14:39:16 +0000
@@ -35,7 +35,6 @@
 
 start-db:
 	$(MAKE) setup-db
-	$(DJANGO_MANAGE) syncdb --noinput  # TODO: Remove once south is dropped.
 	$(MAKE) migrate
 
 stop-db:

=== modified file 'Makefile.docker'
--- Makefile.docker	2018-01-31 13:04:52 +0000
+++ Makefile.docker	2018-01-31 14:39:16 +0000
@@ -63,7 +63,6 @@
 app-update-db: DB_USER=$(shell echo $(DATABASE_URL) | cut -d ':' -f 2 | cut -d '@' -f 1 | sed -e 's|//||')
 app-update-db: export DATABASE_URL=$(ADMIN_DATABASE_URL)
 app-update-db:
-	$(MAKE) manage ARGS='syncdb --noinput' PYTHON=python
 	$(MAKE) manage ARGS='migrate --noinput' PYTHON=python
 	$(MAKE) manage ARGS='grantuser $(DB_USER)' PYTHON=python
 

=== modified file 'checklist/urls.py'
--- checklist/urls.py	2014-03-27 20:10:52 +0000
+++ checklist/urls.py	2018-01-31 14:39:16 +0000
@@ -1,10 +1,12 @@
-from django.conf.urls import patterns, include, url
-
-api_v1_urls = patterns('checklist.views',
-    url(r'^step/(?P<step_id>\d+)/\+set-description$', 'api_v1_step_set_description', name="api_v1_step_set_description"),
-)
-
-
-urlpatterns = patterns('checklist.views',
+from django.conf.urls import include, url
+
+from checklist import views
+
+api_v1_urls = [
+    url(r'^step/(?P<step_id>\d+)/\+set-description$', views.api_v1_step_set_description, name="api_v1_step_set_description"),
+]
+
+
+urlpatterns = [
     url(r'^api/v1/', include(api_v1_urls)),
-)
+]

=== modified file 'dependencies.txt'
--- dependencies.txt	2018-01-30 15:33:52 +0000
+++ dependencies.txt	2018-01-31 14:39:16 +0000
@@ -32,7 +32,6 @@
 python-paste
 python-piston-mini-client
 python-polib
-python-psycopg2
 python-pygooglechart
 python-reportlab
 python-restrictedpython

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2018-01-29 15:34:06 +0000
+++ django_project/settings_base.py	2018-01-31 14:39:16 +0000
@@ -50,7 +50,6 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.admin',
-    'devserver',
     'django_comments',
     'django_openid_auth',
     'djcelery',
@@ -126,17 +125,20 @@
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.csrf",
-    "django.core.context_processors.static",
-    "django.core.context_processors.request",
-)
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-    'django.template.loaders.eggs.Loader',
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+                'django.template.context_processors.csrf',
+                'django.template.context_processors.static',
+                'django.template.context_processors.request',
+            ],
+        },
+    },
+]
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'
 TIME_ZONE = 'UTC'
 USE_I18N = True

=== modified file 'django_project/urls.py'
--- django_project/urls.py	2016-01-27 04:23:46 +0000
+++ django_project/urls.py	2018-01-31 14:39:16 +0000
@@ -1,28 +1,31 @@
 from django.conf import settings
 from django.contrib import admin
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views.generic import RedirectView
+from django.views.static import serve
 import django_openid_auth.urls
 
 import djcelery
 djcelery.setup_loader()
 
+from revtracker import views
+
 admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^', include('revtracker.urls')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^openid/', include(django_openid_auth.urls)),
     url(r'^checklist/', include('checklist.urls')),
-    # combo view for serving css outside dev/ prefi
-    url(r'^combo/rev-\w+/$', 'revtracker.views.combo_view', name='dpa-combo-link'),
-    url(r'^combo/$', 'revtracker.views.combo_view', name='dpa-combo'),
-    (r'^favicon\.ico$', RedirectView.as_view(url='%s/favicon.ico' % settings.STATIC_URL)),
-)
+    # combo view for serving css outside dev/ prefix
+    url(r'^combo/rev-\w+/$', views.combo_view, name='dpa-combo-link'),
+    url(r'^combo/$', views.combo_view, name='dpa-combo'),
+    url(r'^favicon\.ico$', RedirectView.as_view(url='%s/favicon.ico' % settings.STATIC_URL)),
+]
 
-urlpatterns += patterns('',
-    (r'^assets/(.*)', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
-)
+urlpatterns += [
+    url(r'^assets/(.*)', serve, {'document_root': settings.STATIC_ROOT}),
+]
 
 urlpatterns += staticfiles_urlpatterns()

=== modified file 'requirements.txt'
--- requirements.txt	2018-01-30 15:33:52 +0000
+++ requirements.txt	2018-01-31 14:39:16 +0000
@@ -7,18 +7,17 @@
 bson==0.3.3
 celery==3.1.23
 convoy==0.2.4
-Django==1.8.18
-django-celery==3.1.17
+Django==1.11.9
+django-celery==3.2.2
 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
-django-ordered-model==1.1.0
+django-openid-auth==0.14
+django-ordered-model==1.4.3
 django-picklefield==0.2.1
-django-pgtools==0.2
-django-waffle==0.10.1
+django-pgtools==0.4.2
+django-waffle==0.13.0
 dj-database-url==0.4.2
 gorun==1.7
 gunicorn==19.3.0
@@ -37,7 +36,7 @@
 oops-dictconfig==0.0.2
 oops-wsgi==0.0.11
 Paste==1.7.5.1
-psycopg2==2.4.5
+psycopg2==2.7.3.2
 pybars==0.0.4
 pygit2==0.24.2
 PyMeta==0.5.0

=== modified file 'revtracker/data.py'
--- revtracker/data.py	2018-01-29 15:34:06 +0000
+++ revtracker/data.py	2018-01-31 14:39:16 +0000
@@ -341,8 +341,8 @@
 def deployment_requests(status=DeploymentRequest.STATUS_WAITING):
     requests = DeploymentRequest.objects.filter(
             status=status,
-            ).select_related('project__name', 'deploy_revision__revno',
-                             'requester__username', 'completer__username',
+            ).select_related('project', 'deploy_revision',
+                             'requester', 'completer',
             )
     if status == DeploymentRequest.STATUS_WAITING:
         requests = requests.order_by('-date_created')

=== modified file 'revtracker/tests/test_views_logged_in.py'
--- revtracker/tests/test_views_logged_in.py	2018-01-29 14:57:56 +0000
+++ revtracker/tests/test_views_logged_in.py	2018-01-31 14:39:16 +0000
@@ -2,6 +2,7 @@
 import soupmatchers
 
 from django.core.urlresolvers import reverse
+from django.test import override_settings
 
 from revtracker.models import Project, Revision
 from revtracker.tests import (
@@ -19,10 +20,9 @@
     )
 
 
+@override_settings(ROOT_URLCONF='revtracker.urls')
 class IndexViewTests(TestCase):
 
-    urls = 'revtracker.urls'
-
     def setUp(self):
         super(IndexViewTests, self).setUp()
         self.create_user_and_log_in()
@@ -110,10 +110,9 @@
                       text=re.compile("0 revisions need QA")))))
 
 
+@override_settings(ROOT_URLCONF='revtracker.urls')
 class ProjectViewTests(TestCase):
 
-    urls = 'revtracker.urls'
-
     def setUp(self):
         super(ProjectViewTests, self).setUp()
         self.create_user_and_log_in()
@@ -295,10 +294,9 @@
             html_matches=ProjectUpdateDeployedRevisionForm(project)))
 
 
+@override_settings(ROOT_URLCONF='revtracker.urls')
 class ProjectUpdateRevisionTests(TestCase):
 
-    urls = 'revtracker.urls'
-
     def setUp(self):
         super(ProjectUpdateRevisionTests, self).setUp()
         self.create_user_and_log_in()
@@ -335,10 +333,9 @@
         self.assertEqual(revision, project.deployed_revision)
 
 
+@override_settings(ROOT_URLCONF='revtracker.urls')
 class ProjectChangeRevisionStatusTests(TestCase):
 
-    urls = 'revtracker.urls'
-
     def setUp(self):
         super(ProjectChangeRevisionStatusTests, self).setUp()
         self.create_user_and_log_in()
@@ -374,10 +371,9 @@
         self.assertEqual(400, response.status_code)
 
 
+@override_settings(ROOT_URLCONF='revtracker.urls')
 class PersonViewTests(TestCase):
 
-    urls = 'revtracker.urls'
-
     def setUp(self):
         super(PersonViewTests, self).setUp()
         self.create_user_and_log_in()

=== modified file 'revtracker/urls.py'
--- revtracker/urls.py	2018-01-29 15:34:06 +0000
+++ revtracker/urls.py	2018-01-31 14:39:16 +0000
@@ -1,26 +1,28 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django_comments import urls as comments_urls
 
-api_v1_urls = patterns('revtracker.views',
-    url(r'^project/(?P<project_name>[\w\-]+)$', 'api_v1_project'),
-    url(r'^project/(?P<project_name>[\w\-]+)/\+set-deployed$', 'api_v1_project_set_deployed'),
-    url(r'^project/(?P<project_name>[\w\-]+)/\+revision-by-pk/(?P<pk>[\d]+)/\+change-status$', 'api_v1_project_change_revision_status'),
-    url(r'^project/(?P<project_name>[\w\-]+)/\+set-description$', 'api_v1_project_set_description', name="api_v1_project_set_description"),
-    url(r'^person/(?P<person_name>[\w\.\-]+)$', 'api_v1_person'),
-)
-
-urlpatterns = patterns('revtracker.views',
-    url(r'^$', 'index', name="index"),
-    url(r'^help$', 'help', name="help"),
-    url(r'^project/(?P<project_name>[\w\-]+)$', 'project', name="project_view"),
-    url(r'^project/(?P<project_name>[\w\-]+)/\+revision-by-pk/(?P<pk>[\d]+)/\+change-status$', 'project_change_revision_status', name="project_change_revision_status"),
-    url(r'^project/(?P<project_name>[\w\-]+)/\+revision-by-pk/(?P<pk>[\d]+)/\+set-rollback$', 'project_set_revision_rollback', name="project_set_revision_rollback"),
-    url(r'^project/(?P<project_name>[\w\-]+)/\+deployment-request/(?P<pk>[\d]+)$', 'deployment_request', name="deployment_request"),
-    url(r'^project/(?P<project_name>[\w\-]+)/deployment-checklist$', 'project_checklist', name="project_checklist"),
-    url(r'^person/(?P<person_name>[\w\.\-]+)$', 'person', name="person_view"),
+from revtracker import views
+
+
+api_v1_urls = [
+    url(r'^project/(?P<project_name>[\w\-]+)$', views.api_v1_project),
+    url(r'^project/(?P<project_name>[\w\-]+)/\+set-deployed$', views.api_v1_project_set_deployed),
+    url(r'^project/(?P<project_name>[\w\-]+)/\+revision-by-pk/(?P<pk>[\d]+)/\+change-status$', views.api_v1_project_change_revision_status),
+    url(r'^project/(?P<project_name>[\w\-]+)/\+set-description$', views.api_v1_project_set_description, name="api_v1_project_set_description"),
+    url(r'^person/(?P<person_name>[\w\.\-]+)$', views.api_v1_person),
+]
+
+urlpatterns = [
+    url(r'^$', views.index, name="index"),
+    url(r'^help$', views.help, name="help"),
+    url(r'^project/(?P<project_name>[\w\-]+)$', views.project, name="project_view"),
+    url(r'^project/(?P<project_name>[\w\-]+)/\+revision-by-pk/(?P<pk>[\d]+)/\+change-status$', views.project_change_revision_status, name="project_change_revision_status"),
+    url(r'^project/(?P<project_name>[\w\-]+)/\+revision-by-pk/(?P<pk>[\d]+)/\+set-rollback$', views.project_set_revision_rollback, name="project_set_revision_rollback"),
+    url(r'^project/(?P<project_name>[\w\-]+)/\+deployment-request/(?P<pk>[\d]+)$', views.deployment_request, name="deployment_request"),
+    url(r'^project/(?P<project_name>[\w\-]+)/deployment-checklist$', views.project_checklist, name="project_checklist"),
+    url(r'^person/(?P<person_name>[\w\.\-]+)$', views.person, name="person_view"),
     url(r'^comments/', include(comments_urls)),
-    url(r'^deployment-requests/$', 'deployment_requests', name="deployment_requests"),
+    url(r'^deployment-requests/$', views.deployment_requests, name="deployment_requests"),
 
     url(r'^api/v1/', include(api_v1_urls)),
-)
-
+]

=== modified file 'setup.py'
--- setup.py	2018-01-29 15:34:06 +0000
+++ setup.py	2018-01-31 14:39:16 +0000
@@ -7,7 +7,7 @@
     author_email="[e-mail]",
     license="AGPL3",
     install_requires=[
-        'Django>=1.8',
+        'Django==1.11.*',
         'soupmatchers==0.2',
         'testtools',
         'django-contrib-comments',
@@ -23,7 +23,6 @@
         'Markdown',
         'psycopg2',
         'django-waffle',
-        'django-devserver',
         'django-ordered-model',
         'django-pgtools',
         'werkzeug',