Updated from global requirements

Change-Id: Idc25bccb0147f0f00d07ad0479ba6703c8fb89b5

3 files changed, 40 insertions, 41 deletions

diff --git a/requirements.txt b/requirements.txt
index 84aee4957..8b52fcdef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,32 +7,32 @@
 # be installed in a specific order.
 #
 # PBR should always appear first
-pbr>=0.11,<2.0
+pbr<2.0,>=0.11
 # Horizon Core Requirements
 Babel>=1.3
-Django>=1.4.2,<1.8
-Pint>=0.5  # BSD
-django_compressor>=1.4
-django_openstack_auth>=1.1.7,!=1.1.8
-django-pyscss>=2.0.2  # BSD License (2 clause)
+Django<1.8,>=1.4.2
+Pint>=0.5 # BSD
+django-compressor>=1.4
+django-openstack-auth!=1.1.8,>=1.1.7
+django-pyscss>=2.0.2 # BSD License (2 clause)
 eventlet>=0.17.3
 httplib2>=0.7.5
 iso8601>=0.1.9
 kombu>=3.0.7
 netaddr>=0.7.12
-oslo.concurrency>=2.0.0         # Apache-2.0
-oslo.config>=1.11.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-oslo.policy>=0.5.0  # Apache-2.0
-oslo.serialization>=1.4.0               # Apache-2.0
-oslo.utils>=1.6.0                       # Apache-2.0
-pyScss>=1.3.4  # MIT License
+oslo.concurrency>=2.0.0 # Apache-2.0
+oslo.config>=1.11.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.policy>=0.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+pyScss>=1.3.4 # MIT License
 python-ceilometerclient>=1.0.13
 python-cinderclient>=1.2.2
 python-glanceclient>=0.18.0
 python-heatclient>=0.3.0
 python-keystoneclient>=1.6.0
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
 python-novaclient>=2.22.0
 python-saharaclient>=0.9.0
 python-swiftclient>=2.2.0
@@ -40,25 +40,25 @@ python-troveclient>=1.0.7
 pytz>=2013.6
 PyYAML>=3.1.0
 six>=1.9.0
-XStatic>=1.0.0  # MIT License
-XStatic-Angular>=1.3.7  # MIT License
-XStatic-Angular-Bootstrap>=0.11.0.2  # MIT License
-XStatic-Angular-lrdragndrop>=1.0.2.2  # MIT License
-XStatic-Bootstrap-Datepicker>=1.3.1.0  # Apache 2.0 License
-XStatic-Bootstrap-SCSS>=3  # Apache 2.0 License
-XStatic-D3>=3.1.6.2  # BSD License (3 clause)
-XStatic-Hogan>=2.0.0.2  # Apache 2.0 License
-XStatic-Font-Awesome>=4.3.0  # SIL OFL 1.1 License, MIT License
-XStatic-Jasmine>=2.1.2.0  # MIT License
-XStatic-jQuery>=1.7.2  # MIT License
-XStatic-JQuery-Migrate>=1.2.1.1  # MIT License
-XStatic-JQuery.quicksearch>=2.0.3.1  # MIT License
-XStatic-JQuery.TableSorter>=2.0.5b.0  # MIT License
-XStatic-jquery-ui>=1.10.1  # MIT License
-XStatic-JSEncrypt>=2.0.0.2  # MIT License
-XStatic-Magic-Search>=0.2.0.1  # Apache 2.0 License
-XStatic-QUnit>=1.14.0.2  # MIT License
-XStatic-Rickshaw>=1.5.0  # BSD License (prior)
-XStatic-smart-table>=1.4.5.3  # MIT License
-XStatic-Spin>=1.2.5.2  # MIT License
+XStatic>=1.0.0 # MIT License
+XStatic-Angular>=1.3.7 # MIT License
+XStatic-Angular-Bootstrap>=0.11.0.2 # MIT License
+XStatic-Angular-lrdragndrop>=1.0.2.2 # MIT License
+XStatic-Bootstrap-Datepicker>=1.3.1.0 # Apache 2.0 License
+XStatic-Bootstrap-SCSS>=3 # Apache 2.0 License
+XStatic-D3>=3.1.6.2 # BSD License (3 clause)
+XStatic-Hogan>=2.0.0.2 # Apache 2.0 License
+XStatic-Font-Awesome>=4.3.0 # SIL OFL 1.1 License, MIT License
+XStatic-Jasmine>=2.1.2.0 # MIT License
+XStatic-jQuery>=1.7.2 # MIT License
+XStatic-JQuery-Migrate>=1.2.1.1 # MIT License
+XStatic-JQuery.quicksearch>=2.0.3.1 # MIT License
+XStatic-JQuery.TableSorter>=2.0.5b.0 # MIT License
+XStatic-jquery-ui>=1.10.1 # MIT License
+XStatic-JSEncrypt>=2.0.0.2 # MIT License
+XStatic-Magic-Search>=0.2.0.1 # Apache 2.0 License
+XStatic-QUnit>=1.14.0.2 # MIT License
+XStatic-Rickshaw>=1.5.0 # BSD License (prior)
+XStatic-smart-table>=1.4.5.3 # MIT License
+XStatic-Spin>=1.2.5.2 # MIT License
 XStatic-term.js>=0.0.4 # MIT License
diff --git a/setup.py b/setup.py
index 736375744..056c16c2b 100644
--- a/setup.py
+++ b/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");
diff --git a/test-requirements.txt b/test-requirements.txt
index b69da6123..6861e83d7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@
 # be installed in a specific order.
 #
 # Hacking should appear first in case something else depends on pep8
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 #
 coverage>=3.6
 django-nose>=1.2
@@ -18,10 +18,10 @@ nose
 nose-exclude
 nosehtmloutput>=0.0.3
 nosexcover
-openstack.nose_plugin>=0.7
-oslosphinx>=2.5.0  # Apache-2.0
+openstack.nose-plugin>=0.7
+oslosphinx>=2.5.0 # Apache-2.0
 selenium
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-testtools>=0.9.36,!=1.2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+testtools>=1.4.0
 # This also needs xvfb library installed on your OS
 xvfbwrapper>=0.1.3 #license: MIT