Updated from global requirements

Change-Id: I40eaafadc8c2ff960d8d54c0be441b142005c346

requirements.txt

@@ -7,13 +7,13 @@
 # be installed in a specific order.
 #
 # PBR should always appear first
-pbr<2.0,>=1.6
+pbr>=1.6 # Apache-2.0
-python-magnumclient>=0.2.1
+python-magnumclient>=2.0.0 # Apache-2.0
-Babel>=1.3
+Babel>=2.3.4 # BSD
-Django>=1.8,<1.9  # BSD
+Django<1.9,>=1.8 # BSD
-django-babel>=0.3.4
+django-babel>=0.4.0 # BSD
-django_compressor>=1.4
+django-compressor>=2.0 # MIT
-django_openstack_auth>=1.4.0
+django-openstack-auth>=2.2.0 # Apache-2.0
 django-pyscss>=2.0.2 # BSD License (2 clause)
 XStatic>=1.0.0 # MIT License
 XStatic-Angular>=1.3.7 # MIT License

setup.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

test-requirements.txt

@@ -9,20 +9,20 @@
 # Hacking should appear first in case something else depends on pep8
 hacking<0.11,>=0.10.2
 #
-coverage>=3.6
+coverage>=3.6 # Apache-2.0
-django-nose>=1.2
+django-nose>=1.2 # BSD
-mock>=1.2
+mock>=1.2 # BSD
-mox3>=0.7.0
+mox3>=0.7.0 # Apache-2.0
-nodeenv>=0.9.4 # BSD License
+nodeenv>=0.9.4 # BSD License  # BSD
-nose
+nose # LGPL
-nose-exclude
+nose-exclude # LGPL
-nosehtmloutput>=0.0.3
+nosehtmloutput>=0.0.3 # Apache-2.0
-nosexcover
+nosexcover # BSD
-openstack.nose-plugin>=0.7
+openstack.nose-plugin>=0.7 # Apache-2.0
-oslosphinx>=2.5.0 # Apache-2.0
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-selenium
+selenium>=2.50.1 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
-testtools>=1.4.0
+testtools>=1.4.0 # MIT
 # This also needs xvfb library installed on your OS
 xvfbwrapper>=0.1.3 #license: MIT
 # Include horizon as test requirement