From cf100fc804ca72b8c1e4f062c4d6bba0200c4dda Mon Sep 17 00:00:00 2001
From: adrian-turjak <adriant@catalyst.net.nz>
Date: Fri, 21 Apr 2017 15:46:58 +1200
Subject: [PATCH] Update requirements file

* Updated to reflect versions currently used
* Updated Django safely to newest LTS (1.11).
  All tests pass, and existing code has been
  maintained with deprecation notices in expectation
  of this upgrade.
* Redid the docs url because of a new version
  causing an odd 500 error and because the schema
  method wasn't being used properly.

Change-Id: I991f825941a240eea7a5e408a540bc38afdd91be
---
 requirements.txt      | 35 +++++++++++++++++++----------------
 stacktask/api/docs.py | 10 ----------
 stacktask/api/urls.py |  5 +++--
 3 files changed, 22 insertions(+), 28 deletions(-)
 delete mode 100644 stacktask/api/docs.py

diff --git a/requirements.txt b/requirements.txt
index fe403e8..6447b4a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,19 @@
-pbr==2.0.0
-Django>=1.8.9,<1.9
-decorator>=3.4.0
-djangorestframework>=3.4.1
-keystoneauth1>=2.11.0
-keystonemiddleware>=4.7.0
-python-cinderclient>=1.9.0
-python-neutronclient>=6.0.0
-python-novaclient>=6.0.0
-python-keystoneclient>=3.5.0
-six>=1.9.0
-jsonfield>=1.0.3
-django-rest-swagger>=2.0.3
-pyyaml>=3.11
-python-rtkit>=0.7.0
-mysqlclient>=1.3.7
+# pinned versions to reassess:
+Babel!=2.4.0,>=2.3.4
+
+pbr>=3.0.0
+Django>=1.11,<1.12
+decorator>=4.0.11
+djangorestframework>=3.6.2
+keystoneauth1>=2.19.0
+keystonemiddleware>=4.15.0
+python-cinderclient>=2.0.1
+python-neutronclient>=6.2.0
+python-novaclient>=8.0.0
+python-keystoneclient>=3.10.0
+six>=1.10.0
+jsonfield>=2.0.1
+django-rest-swagger>=2.1.2
+pyyaml>=3.12
+python-rtkit>=0.7.1
+mysqlclient>=1.3.10
diff --git a/stacktask/api/docs.py b/stacktask/api/docs.py
deleted file mode 100644
index 5e9b468..0000000
--- a/stacktask/api/docs.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from rest_framework.decorators import api_view, renderer_classes
-from rest_framework import response, schemas
-from rest_framework_swagger.renderers import OpenAPIRenderer, SwaggerUIRenderer
-
-
-@api_view()
-@renderer_classes([OpenAPIRenderer, SwaggerUIRenderer])
-def docs_view(request):
-    generator = schemas.SchemaGenerator(title='StackTask API')
-    return response.Response(generator.get_schema(request=request))
diff --git a/stacktask/api/urls.py b/stacktask/api/urls.py
index a5894d3..2874a6c 100644
--- a/stacktask/api/urls.py
+++ b/stacktask/api/urls.py
@@ -15,11 +15,12 @@
 from django.conf.urls import url, include
 from django.conf import settings
 
-from stacktask.api import docs
+from rest_framework_swagger.views import get_swagger_view
 
 urlpatterns = [
     url(r'^v1/', include('stacktask.api.v1.urls')),
 ]
 
 if settings.DEBUG:
-    urlpatterns.append(url(r'^docs/', docs.docs_view))
+    schema_view = get_swagger_view(title='StackTask API')
+    urlpatterns.append(url(r'^docs/', schema_view))