Updated from global requirements

Change-Id: Idc25bccb0147f0f00d07ad0479ba6703c8fb89b5

requirements.txt

@@ -7,13 +7,13 @@
 # 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
+Django<1.8,>=1.4.2
 Pint>=0.5 # BSD
-django_compressor>=1.4
+django-compressor>=1.4
-django_openstack_auth>=1.1.7,!=1.1.8
+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
@@ -32,7 +32,7 @@ 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

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

@@ -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
+openstack.nose-plugin>=0.7
 oslosphinx>=2.5.0 # Apache-2.0
 selenium
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
 # This also needs xvfb library installed on your OS
 xvfbwrapper>=0.1.3 #license: MIT