Sync from global requirements

Change-Id: Ifc024ced64d6336329eb7c3390b2de83161ed86b

requirements.txt

@@ -1,9 +1,12 @@
 # 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>=2.0.0 # Apache-2.0
 
-Babel>=1.3
-neutron-lib>=1.1.0 # Apache-2.0
-oslo.log>=3.11.0 # Apache-2.0
-pbr>=1.8
+alembic>=0.8.10 # MIT
+neutron-lib>=1.3.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.log>=3.22.0 # Apache-2.0
+requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0
 six>=1.9.0 # MIT
+SQLAlchemy>=1.0.10 # 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");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=2.0.0'],
     pbr=True)

test-requirements.txt

@@ -1,16 +1,15 @@
 # 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.13.0,<0.14,>=0.12.0 # Apache-2.0
 
-hacking<0.13,>=0.12.0
-
-mock>=2.0
-coverage>=4.0
-python-subunit>=0.0.18
-sphinx!=1.3b1,<1.4,>=1.2.1
-oslosphinx>=4.7.0
-oslotest>=1.10.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
-testresources>=0.2.4
+coverage>=4.0 # Apache-2.0
+mock>=2.0 # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx>=1.5.1 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+testresources>=0.2.4 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD