Updated from global requirements

Change-Id: Ibf423f14a5c37aa298b2115bfd4936f660c6f530

diff --git a/requirements.txt b/requirements.txt
index 85d352d62c4d1ee131dffa83b7bceb1afa598188..1fcd3c23a0a2d5df555528405449e8f56d8d56a6 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,25 +1,24 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5.10,<0.6
-PyCrypto>=2.6
+pbr>=0.5.21,<1.0
+pycrypto>=2.6
 boto>=2.4.0
-eventlet>=0.12.0
+eventlet>=0.13.0
 greenlet>=0.3.2
 httplib2
 iso8601>=0.1.4
-kombu>=1.0.4
+kombu>=2.4.8
 argparse
 lxml>=2.3
 six
 sqlalchemy-migrate>=0.7.2
 python-novaclient>=2.12.0
-PasteDeploy==1.5.0
-routes==1.12.3
-SQLAlchemy>=0.7.8,<0.7.99
-WebOb==1.2.3
-python-keystoneclient>=0.2.1
+PasteDeploy>=1.5.0
+Routes>=1.12.3
+SQLAlchemy>=0.7.8,<=0.7.99
+WebOb>=1.2.3,<1.3
+python-keystoneclient>=0.3.0
 python-swiftclient>=1.2
 python-neutronclient>=2.2.3,<3
-python-ceilometerclient>=1.0.1
+python-ceilometerclient>=1.0.2
 python-cinderclient>=1.0.4
 PyYAML>=3.1.0
 oslo.config>=1.1.0

diff --git a/setup.py b/setup.py
index b3e85a7150c3bd1d740102d143577e76498f1ac7..2a0786a8b28e67a7be5b8c4834529bcc17a6ae33 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr>=0.5.21,<1.0'],
+    pbr=True)

diff --git a/test-requirements.txt b/test-requirements.txt
index 8e1f3a2e982c7e015006a853ea75675d4b89125a..dac1f7dd12350ab5ce181140f94505e4ffafb4a0 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,13 @@
 pep8==1.4.5
 pyflakes==0.7.2
 flake8==2.0
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.7
 
-coverage
+coverage>=3.6
 discover
 mock>=0.8.0
-mox==0.5.3
-testtools>=0.9.29
-testrepository>=0.0.13
-python-glanceclient
+mox>=0.5.3
+testtools>=0.9.32
+testrepository>=0.0.17
+python-glanceclient>=0.9.0
 sphinx>=1.1.2