From de301113ecdc9918230c7b35b172449126253fce Mon Sep 17 00:00:00 2001
From: Serg Melikyan <smelikyan@mirantis.com>
Date: Fri, 11 Oct 2013 17:40:01 +0400
Subject: [PATCH] Update requirements from Global Reqs

Change-Id: Ib89e8c974f6dd2299bf4eab97a183562f0a249c9
---
 requirements.txt      | 13 ++++++-------
 setup.py              | 32 +++++++++++++++-----------------
 test-requirements.txt | 15 ++++++---------
 3 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 5ada1054..29719adb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,9 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
+pbr>=0.5.21,<1.0
 argparse
-prettytable>=0.6,<0.7
-python-keystoneclient>=0.1.2
+PrettyTable>=0.6,<0.8
+python-keystoneclient>=0.3.2
 httplib2
 iso8601>=0.1.4
-six
-Babel>=0.9.6
-pyOpenSSL
\ No newline at end of file
+six>=1.4.1
+Babel>=1.3
+pyOpenSSL
diff --git a/setup.py b/setup.py
index d71b7982..70c2b3f3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,22 @@
-#    Copyright (c) 2013 Mirantis, Inc.
+#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# 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
-import multiprocessing
 
 setuptools.setup(
-    setup_requires=[
-        'd2to1>=0.2.10,<0.3',
-        'pbr>=0.5,<0.6'
-    ],
-    d2to1=True,
-)
+    setup_requires=['pbr'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 98870ef5..4a0390db 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,15 +1,12 @@
-distribute>=0.6.24
-
-mock
-anyjson
-mox
+mock>=1.0
+anyjson>=0.3.3
+mox>=0.5.3
 nose
 nose-exclude
 nosexcover
-openstack.nose_plugin
-nosehtmloutput
+openstack.nose_plugin>=0.7
+nosehtmloutput>=0.0.3
 pep8==1.3.3
-setuptools-git>=0.4
 sphinx>=1.1.2
 unittest2
-httpretty
+httpretty>=0.6.3