Updated from global requirements

Change-Id: Ifda07598f8a86dafceed142288d52eb67d2e4934

requirements.txt

@@ -1,12 +1,15 @@
-pbr>=1.6  # Apache-2.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+pbr>=1.6 # Apache-2.0
 # Horizon Core Requirements
-Django>=1.8,<1.9 # BSD
-django_compressor>=2.0 # MIT
-django_openstack_auth>=2.4.0 # Apache-2.0
+Django<1.9,>=1.8 # BSD
+django-compressor>=2.0 # MIT
+django-openstack-auth>=2.4.0 # Apache-2.0
 eventlet!=0.18.3,>=0.18.2 # MIT
 iso8601>=0.1.11 # MIT
-netaddr>=0.7.12,!=0.7.16 # BSD
-python-keystoneclient>=2.0.0,!=2.1.0 # Apache-2.0
+netaddr!=0.7.16,>=0.7.12 # BSD
+python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0
 python-solumclient>=1.2.7 # Apache-2.0
 pytz>=2013.6 # MIT
 

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

@@ -1,4 +1,7 @@
-hacking>=0.11.0,<0.12 # Apache-2.0
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+hacking<0.12,>=0.11.0 # Apache-2.0
 
 coverage>=3.6 # Apache-2.0
 discover # BSD
@@ -11,7 +14,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 unittest2 # BSD
 
-sphinx>=1.2.1,!=1.3b1,<1.3 # BSD
-oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0
+sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 sphinxcontrib-pecanwsme>=0.8 # Apache-2.0
 sphinxcontrib-httpdomain # BSD