Merge "Add futurist to requirements.txt explicitly"

openstack_dashboard/dashboards/admin/instances/views.py

@@ -17,6 +17,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import futurist
+
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
@@ -38,8 +40,6 @@ from openstack_dashboard.dashboards.project.instances import views
 from openstack_dashboard.dashboards.project.instances.workflows \
     import update_instance
 
-import futurist
-
 
 # re-use console from project.instances.views to make reflection work
 def console(args, **kvargs):

openstack_dashboard/dashboards/project/instances/views.py

@@ -20,9 +20,10 @@
 Views for managing instances.
 """
 from collections import OrderedDict
-import futurist
 import logging
 
+import futurist
+
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy

requirements.txt

@@ -16,6 +16,7 @@ django-babel>=0.5.1 # BSD
 django-compressor>=2.0 # MIT
 django-openstack-auth>=3.1.0 # Apache-2.0
 django-pyscss>=2.0.2 # BSD License (2 clause)
+futurist>=0.11.0,!=0.15.0  # Apache-2.0
 iso8601>=0.1.11 # MIT
 netaddr!=0.7.16,>=0.7.13 # BSD
 oslo.concurrency>=3.8.0 # Apache-2.0